September 2016 - Wine-devel

Re: [PATCH] d2d1: Initial implementation of DC render target
by Marvin 08 Sep '16

08 Sep '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25684 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: jscript/tests: Fix incorrect usage of broken() function.
by Jacek Caban 08 Sep '16

08 Sep '16

Hi Sebastian, On 9/8/16 11:13 AM, Sebastian Lackner wrote: > diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c > index f949b9d..fb647a5 100644 > --- a/dlls/jscript/tests/jscript.c > +++ b/dlls/jscript/tests/jscript.c > @@ -659,7 +659,7 @@ static void test_aggregation(void) > > hres = CoCreateInstance(&CLSID_JScript, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, > &IID_IUnknown, (void**)&unk); > - ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, > + ok(hres == CLASS_E_NOAGGREGATION || broken(hres == E_INVALIDARG) /* win2k */, If it's really broken only on win2k, I'd rather remove it. Thanks, Jacek

1 0

Re: user32/tests: Fix incorrect usage of broken() function.
by Marvin 08 Sep '16

08 Sep '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25673 Your paranoid android. === w8 (32 bit msg) === msg.c:15529: Test failed: wrong error 31 === w864 (32 bit msg) === msg.c:15529: Test failed: wrong error 31 === w1064 (32 bit msg) === msg.c:13939: Test failed: WM_NCRBUTTONDOWN on caption: 3: the msg sequence is not complete: expected 007b - actual 0000 msg.c:15529: Test failed: wrong error 31 === w864 (64 bit msg) === msg.c:15529: Test failed: wrong error 31 === w1064 (64 bit msg) === msg.c:13939: Test failed: WM_NCRBUTTONDOWN on caption: 3: the msg sequence is not complete: expected 007b - actual 0000 msg.c:15529: Test failed: wrong error 31

2 1

Re: shell32/tests: Fix incorrect usage of broken() function.
by Nikolay Sivov 08 Sep '16

08 Sep '16

On 08.09.2016 12:23, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/shell32/tests/shelldispatch.c | 2 +- > dlls/shell32/tests/shfldr_special.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c > index 9a47c67..70146cb 100644 > --- a/dlls/shell32/tests/shelldispatch.c > +++ b/dlls/shell32/tests/shelldispatch.c > @@ -346,7 +346,7 @@ static void test_items(void) > ok(r == S_OK, "Folder::Items failed: %08x\n", r); > ok(!!items, "items is null\n"); > r = FolderItems_QueryInterface(items, &IID_FolderItems2, (void**)&items2); > - ok(r == S_OK || broken(E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); > + ok(r == S_OK || broken(r == E_NOINTERFACE) /* xp and later */, "FolderItems::QueryInterface failed: %08x\n", r); Does it really fail anywhere? I don't see that on test results page. > ok(!!items2 || broken(!items2) /* xp and later */, "items2 is null\n"); > r = FolderItems_QueryInterface(items, &IID_FolderItems3, (void**)&items3); > ok(r == S_OK, "FolderItems::QueryInterface failed: %08x\n", r); > diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c > index 6d61220..dd4cc04 100644 > --- a/dlls/shell32/tests/shfldr_special.c > +++ b/dlls/shell32/tests/shfldr_special.c > @@ -166,7 +166,7 @@ if (0) > > details.str.u.pOleStr = NULL; > hr = IShellFolder2_GetDetailsOf(folder, NULL, 0, &details); > - ok(hr == S_OK || broken(E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); > + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* W2K */, "got 0x%08x\n", hr); > if (SHELL_OsIsUnicode()) SHFree(details.str.u.pOleStr); Win2K case could as well be removed. > > /* test every column if method is implemented */ >

2 2

Re: [PATCH 2/2] dxgi: Added partial implementation of GetDC()/ReleaseDC()
by Henri Verbeet 08 Sep '16

08 Sep '16

On 7 September 2016 at 20:50, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/d3d11/tests/d3d11.c | 6 +++--- > dlls/dxgi/dxgi_private.h | 1 + > dlls/dxgi/surface.c | 32 ++++++++++++++++++++++++++++---- > 3 files changed, 32 insertions(+), 7 deletions(-) > This causes test failures: ../../../tools/runtest -q -P wine -T ../../.. -M d3d10_1.dll -p d3d10_1_test.exe.so d3d10_1 && touch d3d10_1.ok d3d10_1.c:723: Test succeeded inside todo block: Failed to get DC, hr 0. d3d10_1.c:732: Test succeeded inside todo block: Failed to release DC, hr 0.

1 0

Re: [2/3] vcomp: Implement _vcomp_reduction_r4 and add tests.
by Henri Verbeet 08 Sep '16

08 Sep '16

On 8 September 2016 at 08:21, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Yes, there are really bool_and and bool_or reduction operations for float/double. > I decided to explicitly write down the comparison with 0.0 in this case because > it otherwise looks like a mistake. According to my tests all values != 0.0 are > seen as true (without any small epsilon to avoid rounding errors... well). > I'd expect it to just look at the bit pattern, but just for laughs, what about -0.0f?

2 1

Re: vcomp: Implement _vcomp_reduction_r4 and add tests. (v2)
by Marvin 08 Sep '16

08 Sep '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25672 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH v4 7/20] winebus.sys: Add Linux udev bus
by Sebastian Lackner 07 Sep '16

07 Sep '16

On 06.09.2016 17:14, Aric Stewart wrote: > v2: Style changes > v4: Updated with corrections from Thomas Faber > > Includes a common function to check if a bus is enabled and a base common > HID IRP_MJ_PNP handler > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/Makefile.in | 5 ++- > dlls/winebus.sys/bus.h | 24 +++++++++++ > dlls/winebus.sys/bus_hid_common.c | 89 +++++++++++++++++++++++++++++++++++++++ > dlls/winebus.sys/bus_udev.c | 78 ++++++++++++++++++++++++++++++++++ > dlls/winebus.sys/main.c | 8 +++- > loader/wine.inf.in | 15 +++++-- > 6 files changed, 213 insertions(+), 6 deletions(-) > create mode 100644 dlls/winebus.sys/bus.h > create mode 100644 dlls/winebus.sys/bus_hid_common.c > create mode 100644 dlls/winebus.sys/bus_udev.c > > > > v4-0008-winebus.sys-Add-Linux-udev-bus.txt > > > diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in > index c3e31cc..7e4e97f 100644 > --- a/dlls/winebus.sys/Makefile.in > +++ b/dlls/winebus.sys/Makefile.in > @@ -1,5 +1,8 @@ > MODULE = winebus.sys > +IMPORTS = ntoskrnl > EXTRADLLFLAGS = -Wb,--subsystem,native > > C_SRCS = \ > - main.c > + main.c \ > + bus_hid_common.c \ > + bus_udev.c \ > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > new file mode 100644 > index 0000000..a6f08b2 > --- /dev/null > +++ b/dlls/winebus.sys/bus.h > @@ -0,0 +1,24 @@ > +/* > + * Copyright 2016 Aric Stewart > + * > + * 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 > + */ > + > +/* Busses */ > +NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; > + > +/* HID Plug and Play Bus */ > +NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > +DWORD check_bus_disabled(UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_hid_common.c b/dlls/winebus.sys/bus_hid_common.c > new file mode 100644 > index 0000000..c98a0dd > --- /dev/null > +++ b/dlls/winebus.sys/bus_hid_common.c It looks like main.c remains almost completely empty after your series. What about adding all common helper functions there? > @@ -0,0 +1,89 @@ > +/* plug and play Bus like functionality for HID busses > + * > + * Copyright 2016 CodeWeavers, Aric Stewart > + * > + * 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 NONAMELESSUNION > +#include <stdarg.h> > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > +#include "windef.h" > +#include "winbase.h" > +#include "winuser.h" > +#include "winternl.h" > +#include "winioctl.h" > +#include "ddk/wdm.h" > +#include "winreg.h" > +#include "setupapi.h" Some of the headers are not really required yet. I would suggest to move them to the patches where they are actually needed. > +#include "regstr.h" > +#include "cfgmgr32.h" > +#include "wine/debug.h" > +#include "wine/unicode.h" > +#include "wine/list.h" > + > +#include "bus.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > + > +NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > +{ > + NTSTATUS rc = irp->IoStatus.u.Status; > + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); > + > + switch(irpsp->MinorFunction) > + { > + case IRP_MN_QUERY_DEVICE_RELATIONS: > + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); > + break; > + case IRP_MN_QUERY_ID: > + { > + TRACE("IRP_MN_QUERY_ID\n"); > + break; > + } > + case IRP_MN_QUERY_CAPABILITIES: > + TRACE("IRP_MN_QUERY_CAPABILITIES\n"); > + break; > + } > + IoCompleteRequest( irp, IO_NO_INCREMENT ); > + return rc; > +} > + > +DWORD check_bus_disabled(UNICODE_STRING *registry_path) > +{ > + OBJECT_ATTRIBUTES attr; > + HANDLE key; > + DWORD disabled = 0; > + static const WCHAR disabledW[] = {'D','i','s','a','b','l','e','d',0}; > + static const UNICODE_STRING disabled_str = {sizeof(disabledW) - sizeof(WCHAR), sizeof(disabledW), (WCHAR*)disabledW}; > + > + InitializeObjectAttributes(&attr, registry_path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); > + if (ZwOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) > + { > + DWORD size; > + char buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD)]; Not a critical issue, but the buffer size will be one byte too big. For a correct size computation you will have to use something like: char buffer[FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD] )]; > + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION*)buffer; > + > + if (ZwQueryValueKey(key, &disabled_str, KeyValuePartialInformation, info, sizeof(buffer), &size) == STATUS_SUCCESS) > + { Please also check the info->Type here. > + disabled = *(DWORD*)info->Data; > + } > + > + ZwClose(key); > + } > + > + return disabled; > +} > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > new file mode 100644 > index 0000000..101bdeb > --- /dev/null > +++ b/dlls/winebus.sys/bus_udev.c > @@ -0,0 +1,78 @@ > +/* Plug and Play support for hid devices found through udev > + * > + * Copyright 2016 CodeWeavers, Aric Stewart > + * > + * 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> > + > +#ifdef HAVE_SYS_IOCTL_H > +# include <sys/ioctl.h> > +#endif > + > +#include <errno.h> > + > +#define NONAMELESSUNION > + > +#include "ntstatus.h" > +#define WIN32_NO_STATUS > +#include "windef.h" > +#include "winbase.h" > +#include "winternl.h" > +#include "winioctl.h" > +#include "ddk/wdm.h" > +#include "winnls.h" > +#include "wine/debug.h" > +#include "bus.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > +#ifdef SONAME_LIBUDEV > + > +static DRIVER_OBJECT *udev_driver_obj = NULL; > + > +static VOID WINAPI unload(DRIVER_OBJECT *driver) > +{ > + TRACE("Linux udev Driver Unload\n"); > +} > + > +NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > +{ > + TRACE("Linux udev Driver Init\n"); > + > + udev_driver_obj = driver; > + driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > + driver->DriverUnload = unload; > + > + if (check_bus_disabled(registry_path)) > + { > + TRACE("UDEV plug and play bus disabled in registry\n"); > + return STATUS_SUCCESS; Wouldn't it be better to return an error such that IoCreateDriver() fails? > + } > + > + return STATUS_SUCCESS; > +} > + > +#else > + > +NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > +{ > + TRACE("Dummy Linux udev Driver Init\n"); > + return STATUS_SUCCESS; Similar to above, wouldn't it be better to return an error? > +} > + > +#endif /* SONAME_LIBUDEV */ > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index d495cd9..4690baf 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -28,11 +28,17 @@ > #include "ddk/wdm.h" > #include "wine/debug.h" > > +#include "bus.h" > + > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) > { > - TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); > + static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; > + static UNICODE_STRING udev = {sizeof(udevW) - sizeof(WCHAR), sizeof(udevW), (WCHAR*)udevW}; > + > + TRACE( "Wine Platform Bus(%p, %s)\n", driver, debugstr_w(path->Buffer) ); > + IoCreateDriver(&udev, udev_driver_init); > > return STATUS_SUCCESS; > } > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 85dbef1..b595693 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -48,7 +48,8 @@ AddReg=\ > SessionMgr,\ > Tapi,\ > Timezones,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.NT] > RegisterDlls=RegisterDllsSection > @@ -73,7 +74,8 @@ AddReg=\ > Tapi,\ > Timezones,\ > VersionInfo,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.ntamd64] > RegisterDlls=RegisterDllsSection > @@ -100,7 +102,8 @@ AddReg=\ > Tapi,\ > Timezones,\ > VersionInfo.ntamd64,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [Wow64Install] > RegisterDlls=RegisterDllsSection > @@ -115,7 +118,8 @@ AddReg=\ > Misc,\ > Tapi,\ > VersionInfo.ntamd64,\ > - LicenseInformation > + LicenseInformation,\ > + PlatformBus > > [DefaultInstall.Services] > AddService=BITS,0,BITSService > @@ -3397,3 +3401,6 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x1 > HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 > HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 > HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001 > + > +[PlatformBus] > +HKLM,System\CurrentControlSet\Services\UDEV,"Disabled",0x10001,0x00000000 > > >

3 5

Re: [2/3] user32: Add missing calls to GlobalUnlock in render_synthesized_dib.
by Alexandre Julliard 07 Sep '16

07 Sep '16

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > These seem to be missing, or are they left out intentionally? Other render_*() > functions properly unlock the clipboard data. It's not intentional, I just missed them while moving code around. In practice it doesn't matter because the lock count is not used for anything meaningful, but it's still better to keep them paired. Thanks for catching this! -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Do not include terminating \0 in result returned by Date_toLocale{Date, Time}String.
by Marvin 07 Sep '16

07 Sep '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=25645 Your paranoid android. === build (build) === Patch failed to apply

1 0