- wine-devel - winehq.org

Re: setupapi/tests: Try to delete pre-existing key
by Marvin 12 Sep '16

12 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=25761 Your paranoid android. === w1064 (64 bit devinst) === devinst.c:1142: Test failed: Unexpected path \\?\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb} devinst.c:1264: Test failed: Expected key to not … [View More]

1 0

Re: [PATCH v7] winebus.sys: Build initial hidraw device set
by Sebastian Lackner 12 Sep '16

12 Sep '16

On 08.09.2016 20:07, Aric Stewart wrote: > v2: style changes > v4: changes required by previous updates > v6: removed disableing busses > v7: Rebased, suggestions from Sebastian Lackner > > Includes implementation of common HID_PNP_CreateDevice > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/Makefile.in | 3 +- > dlls/winebus.sys/bus.h | 2 + > dlls/winebus.sys/bus_udev.c | 117 +++++++++++++++++++++++++++++… [View More]+++ > dlls/winebus.sys/main.c | 156 +++++++++++++++++++++++++++++++++++++++++++ > loader/wine.inf.in | 15 +++-- > 5 files changed, 288 insertions(+), 5 deletions(-) > > > > v7-0002-winebus.sys-Build-initial-hidraw-device-set.txt > > > diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in > index 99ff4d2..2d29105 100644 > --- a/dlls/winebus.sys/Makefile.in > +++ b/dlls/winebus.sys/Makefile.in > @@ -1,5 +1,6 @@ > MODULE = winebus.sys > -IMPORTS = ntoskrnl > +IMPORTS = ntoskrnl setupapi > +EXTRALIBS = $(UDEV_LIBS) It might be useful to set EXTRAINCL aswell, for example: EXTRAINCL = $(UDEV_CFLAGS) The value is also obtained using pkg-config. In my case its empty but I don't know if thats true for all systems. > EXTRADLLFLAGS = -Wb,--subsystem,native > > C_SRCS = \ > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index 3d53a46..09920dd 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -21,3 +21,5 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > > /* HID Plug and Play Bus */ > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LPVOID native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) DECLSPEC_HIDDEN; > +DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index f040e60..e6319cb 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -20,6 +20,19 @@ > > #include "config.h" > #include <stdarg.h> > +#include <unistd.h> > +#include <fcntl.h> > +#include <stdlib.h> > + > +#ifdef HAVE_SYS_IOCTL_H > +# include <sys/ioctl.h> > +#endif > + > +#ifdef HAVE_LIBUDEV_H > +# include <libudev.h> > +#endif > + > +#include <errno.h> > > #define NONAMELESSUNION > > @@ -27,6 +40,7 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winnls.h" > #include "winternl.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > @@ -39,13 +53,116 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > static DRIVER_OBJECT *udev_driver_obj = NULL; > > +#include "initguid.h" > +DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); > + > +static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; > + > +/* udev based PNP support */ > +static struct udev *udev = NULL; > + > +static void try_add_device(void *dev) The parameter should have the type "struct udev_device *". > +{ > + const char *devnode; > + int fd; > + DWORD vid=0, pid=0, uid=0, version=0; > + WCHAR serial[255] = {'0','0','0','0','0',0}; > + DEVICE_OBJECT *device = NULL; > + struct udev_device *usbdev; > + const char *subsystem; > + > + devnode = udev_device_get_devnode(dev); According to the documentation this function can also return NULL under specific circumstances: "the device node file name of the udev device, or NULL if no device node exists". > + if ((fd = open(devnode, O_RDWR)) == -1) > + { > + TRACE("Unable to open udev device %s\n",devnode); Please use debugstr_a() for tracing strings of arbitrary length. It also wouldn't hurt to promote it to a WARN() and trace an error description, for example using strerror(). > + return; > + } > + close(fd); > + > + TRACE("Got udev device %s\n", devnode); Similar to above, please use debugstr_a(). > + > + usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", > + "usb_device"); > + if (usbdev) > + { > + char *endptr; > + const char *srl = NULL; > + vid = strtol(udev_device_get_sysattr_value(usbdev,"idVendor"), &endptr, 16); > + pid = strtol(udev_device_get_sysattr_value(usbdev,"idProduct"), &endptr, 16); > + version = strtol(udev_device_get_sysattr_value(usbdev,"version"), &endptr, 10); Those calls could fail: "the content of a sys attribute file, or NULL if there is no sys attribute value.". > + srl = udev_device_get_sysattr_value(usbdev,"serial"); > + if (srl) > + MultiByteToWideChar(CP_UNIXCP, 0, srl, -1, serial, 255); > + } > + > + subsystem = udev_device_get_subsystem(dev); > + > + if (strcmp(subsystem, "hidraw") == 0) > + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, version, uid, serial, FALSE, &GUID_DEVCLASS_HIDRAW); > + else > + ERR("Device has unknown subsystem %s\n", subsystem); > + > + if (!device) > + ERR("Failed to create device\n"); > +} > + > +static void build_initial_deviceset(void *udev, const char **subsystems) The function takes a parameter "udev", but there is also a global variable with the same name. This seems a bit redundant. Also, I would suggest to remove the subsystems parameter here, and enumerate all types of devices which are supported. You can still filter them in try_add_device if required later. > +{ > + struct udev_enumerate *enumerate; > + struct udev_list_entry *udevices, *dev_list_entry; > + const char **p; > + > + enumerate = udev_enumerate_new(udev); > + p = subsystems; > + while (*p) > + { > + udev_enumerate_add_match_subsystem(enumerate, *p); > + p++; > + } > + udev_enumerate_scan_devices(enumerate); > + udevices = udev_enumerate_get_list_entry(enumerate); > + > + udev_list_entry_foreach(dev_list_entry, udevices) { > + const char *path; > + struct udev_device *dev; > + > + path = udev_list_entry_get_name(dev_list_entry); > + dev = udev_device_new_from_syspath(udev, path); > + try_add_device(dev); According to the documentation some of these udev functions can fail. It would be better to catch errors here, especially for udev_enumerate_new() and udev_device_new_from_syspath(). There are also refcounting issues, udev_device_new_from_syspath creates a new object which must be released when no longer needed (for example if try_add_device fails). > + } > + > + udev_enumerate_unref(enumerate); > +} > + > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > { > + static const WCHAR hidraw_disabledW[] = {'D','i','s','a','b','l','e',' ','h','i','d','r','a','w',0}; > + static const UNICODE_STRING hidraw_disabled = {sizeof(hidraw_disabledW) - sizeof(WCHAR), sizeof(hidraw_disabledW), (WCHAR*)hidraw_disabledW}; > + static const char *hidraw = "hidraw"; > + static const char *subsystems[2] = {0, 0}; > + > TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); > > udev_driver_obj = driver; > driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > > + if (check_bus_option(registry_path, &hidraw_disabled)) > + TRACE("UDEV hidraw devices disabled in registry\n"); > + else > + subsystems[0] = hidraw; > + > + udev = udev_new(); > + > + if (!udev) > + { > + ERR("Can't create udev\n"); > + return STATUS_UNSUCCESSFUL; > + } > + > + /* PNP Bus initialization */ > + if (subsystems[0]) > + build_initial_deviceset(udev, subsystems); > + > return STATUS_SUCCESS; > } > > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 43de25a..94f1b4b 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -18,6 +18,7 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "config.h" > #include <stdarg.h> > > #define NONAMELESSUNION > @@ -26,14 +27,143 @@ > #define WIN32_NO_STATUS > #include "windef.h" > #include "winbase.h" > +#include "winuser.h" > #include "winternl.h" > +#include "winreg.h" > +#include "setupapi.h" > +#include "cfgmgr32.h" > #include "ddk/wdm.h" > #include "wine/debug.h" > +#include "wine/unicode.h" > +#include "wine/list.h" > > #include "bus.h" > > WINE_DEFAULT_DEBUG_CHANNEL(plugplay); > > +static const WCHAR hwidfmtW[] = {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x','&','%','s','\\','%','i','&','%','s','&','%','p',0}; > +static const WCHAR im_fmtW[] = {'I','M','_','%','i',0}; > +static const WCHAR ig_fmtW[] = {'I','G','_','%','i',0}; > + > +typedef struct _pnp_device { > + struct list entry; > + > + DEVICE_OBJECT *device; > + DWORD vidpid; It would not really be necessary to store the vid/pid information twice. You can also access it using device->DeviceExtension. > +} pnp_device; > + > +typedef struct { > + LPVOID native; /* Must be the first member of the structure */ > + > + DWORD vid, pid, version, uid; > + BOOL is_gamepad; > + WCHAR serial[255]; > + WCHAR const *busidW; /* Expected to be a static constant */ > +} extension; > + > +static struct list pnp_devset = LIST_INIT(pnp_devset); Its up to you if you want to add it now, but sooner or later you will need locking for such a list when it can be accessed by multiple threads. Also, as I saw that you have to convert the list back to a linear array in some of the functions implemented in following patches. Do you think it makes sense to store it as an array from the start? (Lock would still be needed but no conversion). > + > +static void add_device(DEVICE_OBJECT *device, DWORD vidpid) > +{ > + pnp_device *pnp_dev; > + > + pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)); > + pnp_dev->device = device; > + pnp_dev->vidpid = vidpid; > + list_add_tail(&pnp_devset, &pnp_dev->entry); > +} > + > +static INT get_vidpid_index(DEVICE_OBJECT *device, DWORD vidpid) > +{ > + pnp_device *ptr; > + int index = 0; > + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, pnp_device, entry) > + { > + if (ptr->vidpid == vidpid) > + index++; > + if (ptr->device == device) > + return index; > + } > + ERR("Device not found in list\n"); > + return 0; > +} Does this work properly when elements are deleted? You might return the same index for different devices. > + > +static int get_instance_id(DEVICE_OBJECT *device, WCHAR *id) > +{ > + int idx; > + WCHAR index_string[256]; > + > + extension *ext = (extension*)device->DeviceExtension; > + > + idx = get_vidpid_index(device, MAKELONG(ext->vid,ext->pid)); > + > + if (ext->is_gamepad) > + sprintfW(index_string, ig_fmtW, idx); > + else > + sprintfW(index_string, im_fmtW, idx); > + > + return sprintfW(id, hwidfmtW, ext->busidW, ext->vid, ext->pid, index_string, ext->version, ext->serial, ext->uid); It looks like you use %p in the format string, but uid has type DWORD? > +} > + > +DEVICE_OBJECT* bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, LPVOID native, WORD vid, WORD pid, DWORD version, DWORD uid, const WCHAR *serial, BOOL is_gamepad, const GUID *class) > +{ Please note that LPVOID types should be avoided in new wine code. > + NTSTATUS status; > + DEVICE_OBJECT *device; > + static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', > + '\\','%','s','#','%','p',0}; > + static const WCHAR zero_serialW[]= {'0','0','0','0',0}; > + WCHAR dev_name[255]; > + UNICODE_STRING nameW; > + HDEVINFO devinfo; > + extension *ext; > + > + TRACE("Create HID bus device for native device %p\n", native); > + > + sprintfW(dev_name, device_name_fmtW, busidW, native); > + RtlInitUnicodeString(&nameW, dev_name); > + status = IoCreateDevice(driver, sizeof(extension), &nameW, 0, 0, FALSE, &device); > + if (status) > + { > + FIXME( "failed to create device error %x\n", status ); > + return NULL; > + } > + > + ext = (extension*)device->DeviceExtension; > + ext->native = native; At least for udev the device object has to be released. It looks like the logic is currently missing (also in your draft patches). In order to fix that it will probably be necessary to store additional information in each device object. > + ext->vid = vid; > + ext->pid = pid; > + ext->uid = uid; > + ext->is_gamepad = is_gamepad; > + ext->version = version; > + ext->busidW = busidW; > + if (serial) > + lstrcpyW(ext->serial, serial); > + else > + lstrcpyW(ext->serial, zero_serialW); > + > + add_device(device, MAKELONG(vid, pid)); > + > + devinfo = SetupDiGetClassDevsW(class, NULL, NULL, DIGCF_DEVICEINTERFACE); > + if (!devinfo) > + FIXME( "failed to get ClassDevs %x\n", GetLastError()); > + else > + { > + SP_DEVINFO_DATA Data; > + WCHAR id[MAX_DEVICE_ID_LEN]; > + > + get_instance_id(device, id); > + Data.cbSize = sizeof(Data); > + SetupDiCreateDeviceInfoW(devinfo, id, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data); > + if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL )) > + FIXME( "failed to Register Device Info %x\n", GetLastError()); > + SetupDiDestroyDeviceInfoList(devinfo); How does this correspond to similar code in hidclass.sys/device.c. Do we really need both? Why does hidclass contain a call to SetupDiCreateDeviceInterfaceW but not this version? > + } > + > + IoInvalidateDeviceRelations(device, BusRelations); > + > + return device; > +} > + > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; > @@ -59,6 +189,32 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > return status; > } > > +DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option) > +{ > + OBJECT_ATTRIBUTES attr; > + HANDLE key; > + DWORD output = 0; > + > + 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[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; > + > + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION*)buffer; > + > + if (ZwQueryValueKey(key, option, KeyValuePartialInformation, info, sizeof(buffer), &size) == STATUS_SUCCESS) > + { > + if (info->Type == REG_DWORD) > + output = *(DWORD*)info->Data; > + } > + > + ZwClose(key); > + } > + > + return output; > +} I think it would be better to add this in a later patch. Currently there is only support for one subsystem, so it would not make much sense to disable it. > + > NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) > { > static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 4e29026..a29b99f 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 > @@ -3383,3 +3387,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,"Disable hidraw",0x10001,0x00000000 It does not make sense to add registry keys for user-defined settings in wine.inf. This would have the disadvantage that they will get reset on each wine prefix update. The correct solution is to assume default settings when registry keys are not present. > > > [View Less]

2 3

Re: [v3 PATCH] d2d1: Initial implementation of DC render target
by Henri Verbeet 12 Sep '16

12 Sep '16

On 11 September 2016 at 22:49, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > v2: skip test if device creation fails > I think that's fine, but now you're leaking the device on success.

1 0

Wine slow load somewhere after 1.9.16
by Bruno Jesus 12 Sep '16

12 Sep '16

Hi all, for unknown reasons at some point since the past month I get this most of the times I try to start anything in wine: err:ntdll:RtlpWaitForCriticalSection section 0x7bcf4f84 "../../../wine/dlls/ntdll/loader.c: loader_section" wait timed out in thread 001d, blocked by 001e, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7bcf4f84 "../../../wine/dlls/ntdll/loader.c: loader_section" wait timed out in thread 001c, blocked by 001e, retrying (60 sec) These are always the … [View More]

2 2

Wine Staging release notes
by Theodore Dubois 11 Sep '16

11 Sep '16

The latest release notes on the Wine Staging website are for 1.9.11, which was in May. What’s been improved since then? Also, why aren’t the release notes for 1.9.18 up on the website? ~Theodore

2 1

Re: [v2 PATCH] d2d1: Initial implementation of DC render target
by Sebastian Lackner 11 Sep '16

11 Sep '16

On 11.09.2016 22:24, Nikolay Sivov wrote: > + ok(sizeu.width == 0.0f, "got width %u.\n", sizeu.width); > + ok(sizeu.height == 0.0f, "got height %u.\n", sizeu.height); This looks like a copy&paste error. Shouldn't those be integer values?

1 0

Re: [4/4] jscript: Simplify create_utc_string and add basic tests.
by Marvin 11 Sep '16

11 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=25750 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [3/4] jscript: Simplify date_to_string and add basic tests.
by Marvin 11 Sep '16

11 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=25749 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [2/4] jscript: Allocate string of correct size in Date toLocaleDateString method.
by Marvin 11 Sep '16

11 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=25748 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [1/4] jscript: Properly handle \0 characters in Array join method.
by Marvin 11 Sep '16

11 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=25747 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [PATCH] Moved wined3dformat <-> dxgi_format conversion functions into wined3d
by Nikolay Sivov 10 Sep '16

10 Sep '16

On 10.09.2016 1:18, Fabian Maurer wrote: > This change is a measure of code-deduplication and to make these functions reusable in other parts. > Kept in wined3d.dll instead of dxgi.dll to make sure dll-overrides of dxgi doesn't break things in other parts. > New source-file since further additions will follow. > What dxgi dll-overrides? Without private interfaces between d3d10/11 and dxgi we can't use native one anyway, can we?

2 3

Re: kernel32/tests: Don't test CloseHandle
by Marvin 10 Sep '16

10 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=25735 Your paranoid android. === w8 (32 bit console) === console.c:1497: Test failed: [13] Expected output count to be 0, got 23550478 console.c:1497: Test failed: [15] Expected output count to be 0, got 23550478 console.c:… [View More]1497: Test failed: [18] Expected output count to be 3735928559, got 23550478 console.c:1741: Test failed: [13] Expected output count to be 0, got 23550478 console.c:1741: Test failed: [15] Expected output count to be 0, got 23550478 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 23550478 === w864 (32 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 2507489323 console.c:1497: Test failed: [15] Expected output count to be 0, got 2507489323 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 2507489323 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 2507489323 console.c:1741: Test failed: [15] Expected output count to be 0, got 2507489323 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 2507489323 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [13] Expected output count to be 0, got 80193794 console.c:1497: Test failed: [15] Expected output count to be 0, got 80193794 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 80193794 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [13] Expected output count to be 0, got 80193794 console.c:1741: Test failed: [15] Expected output count to be 0, got 80193794 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 80193794 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2619: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2625: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2632: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2639: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1322: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1497: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1497: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1741: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2200: Test failed: [7] Expected count to be 0, got 1 console.c:2266: Test failed: [7] Expected count to be 0, got 1 console.c:2332: Test failed: [7] Expected count to be 0, got 1 [View Less]

1 0

Re: kernel32/tests: Don't test function directly when reporting GetLastError()
by Marvin 10 Sep '16

10 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=25734 Your paranoid android. === w8 (32 bit console) === console.c:1498: Test failed: [13] Expected output count to be 0, got 2480191978 console.c:1498: Test failed: [15] Expected output count to be 0, got 2480191978 console.… [View More]c:1498: Test failed: [18] Expected output count to be 3735928559, got 2480191978 console.c:1742: Test failed: [13] Expected output count to be 0, got 2480191978 console.c:1742: Test failed: [15] Expected output count to be 0, got 2480191978 console.c:1742: Test failed: [18] Expected output count to be 3735928559, got 2480191978 === w864 (32 bit console) === console.c:2620: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2626: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2633: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2640: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1323: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1498: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [13] Expected output count to be 0, got 3813979195 console.c:1498: Test failed: [15] Expected output count to be 0, got 3813979195 console.c:1498: Test failed: [18] Expected output count to be 3735928559, got 3813979195 console.c:1742: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [13] Expected output count to be 0, got 3813979195 console.c:1742: Test failed: [15] Expected output count to be 0, got 3813979195 console.c:1742: Test failed: [18] Expected output count to be 3735928559, got 3813979195 console.c:2201: Test failed: [7] Expected count to be 0, got 1 console.c:2267: Test failed: [7] Expected count to be 0, got 1 console.c:2333: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2620: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2626: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2633: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2640: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1323: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1498: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [13] Expected output count to be 0, got 1998939738 console.c:1498: Test failed: [15] Expected output count to be 0, got 1998939738 console.c:1498: Test failed: [18] Expected output count to be 3735928559, got 1998939738 console.c:1742: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [13] Expected output count to be 0, got 1998939738 console.c:1742: Test failed: [15] Expected output count to be 0, got 1998939738 console.c:1742: Test failed: [18] Expected output count to be 3735928559, got 1998939738 console.c:2201: Test failed: [7] Expected count to be 0, got 1 console.c:2267: Test failed: [7] Expected count to be 0, got 1 console.c:2333: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2620: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2626: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2633: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2640: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1323: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1498: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2201: Test failed: [7] Expected count to be 0, got 1 console.c:2267: Test failed: [7] Expected count to be 0, got 1 console.c:2333: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2620: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2626: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2633: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2640: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1323: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1498: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1498: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1742: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2201: Test failed: [7] Expected count to be 0, got 1 console.c:2267: Test failed: [7] Expected count to be 0, got 1 console.c:2333: Test failed: [7] Expected count to be 0, got 1 [View Less]

1 0

Re: [resend PATCH] d2d1: Initial implementation of DC render target
by Alexandre Julliard 09 Sep '16

09 Sep '16

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > Resending so bot can pick it up this time. > > dlls/d2d1/Makefile.in | 3 +- > dlls/d2d1/d2d1_private.h | 16 + > dlls/d2d1/dc_render_target.c | 875 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d2d1/factory.c | 50 ++- > dlls/d2d1/render_target.c | 36 ++ > dlls/d2d1/tests/d2d1.c | 11 +- > … [View More]

2 1

Re: [PATCH 2/2] mscoree: There can be only one QI implementation i a COM object!
by Vincent Povirk 09 Sep '16

09 Sep '16

These look like 2 separate COM objects to me. They have different IUnknown pointers and a different set of implemented interfaces. Is there a reason to link them? On Thu, Sep 8, 2016 at 2:25 PM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/mscoree/config.c | 29 +++++++++-------------------- > 1 file changed, 9 insertions(+), 20 deletions(-) > > diff --git a/dlls/mscoree/config.c b/dlls/… [View More]

2 3

Re: Alexandre Julliard : winex11: Remove support for synthesizing clipboard formats.
by Ken Thomases 09 Sep '16

09 Sep '16

On Sep 7, 2016, at 10:48 AM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: 761d244970dd189b1a639121e668a5089fd0112d > URL: http://source.winehq.org/git/wine.git/?a=commit;h=761d244970dd189b1a639121e… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Wed Sep 7 11:35:14 2016 +0900 > > winex11: Remove support for synthesizing clipboard formats. > > Signed-off-by: Alexandre … [View More]

3 6

Re: [1/3] jscript: Properly handle \0 characters in String to{Lower,Upper}Case methods.
by Sebastian Lackner 09 Sep '16

09 Sep '16

On 09.09.2016 12:03, Jacek Caban wrote: > On 08.09.2016 23:52, Sebastian Lackner wrote: >> diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js >> index c7f2bcd..e7b55fc 100644 >> --- a/dlls/jscript/tests/api.js >> +++ b/dlls/jscript/tests/api.js >> @@ -661,6 +661,8 @@ tmp = "tEsT".toLowerCase(); >> ok(tmp === "test", "''.toLowerCase() = " + tmp); >> tmp = "tEsT".toLowerCase(3); >> ok(tmp === "test", "''.toLowerCase(3) = " + … [View More]

1 0

Re: [PATCH] ws2_32/tests: Add more SIO_ADDRESS_LIST_CHANGE tests
by Marvin 09 Sep '16

09 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=25719 Your paranoid android. === w7pro64 (32 bit sock) === sock.c:7766: Test failed: bytesReturned isn't supposed to be 1 sock.c:7790: Test failed: GetOverlappedResult failed, error 0

1 0

Re: [3/3] jscript: Allocate string of correct size in Date toTimeString method.
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=25702 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [2/3] jscript: Properly handle \0 characters in String indexOf method.
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=25701 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: [1/3] jscript: Properly handle \0 characters in String to{Lower, Upper}Case methods.
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=25700 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no … [View More]

1 0

Re: shlwapi: Use debugstr_w() in TRACE() message.
by Nikolay Sivov 08 Sep '16

08 Sep '16

On 08.09.2016 23:51, Andrey Gusev wrote: > - TRACE("(%p, 0x%08x, %p, %p, %p, %p, %p, 0x%08x)\n", hUSKey, dwIndex, > - pszValueName, pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); > + TRACE("(%p, 0x%08x, %s, %p, %p, %p, %p, 0x%08x)\n", hUSKey, dwIndex, > + debugstr_w(pszValueName), pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); This is wrong, it's an out parameter.

1 0

Re: [PATCH] bcrypt/tests: Show that BCryptGetFipsAlgorithmMode checks a registry key
by Sebastian Lackner 08 Sep '16

08 Sep '16

On 08.09.2016 22:11, Bruno Jesus wrote: > + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey)) > + { Why do you open the key when you don't use it? > + if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, > + RRF_RT_REG_DWORD, NULL, &enabled, &count)) enabled has the type BOOLEAN and a size of 1 byte. Did you want to pass "value" instead? > + { > + expected = !!enabled; > + } &… [View More]

1 0

Re: [PATCH] bcrypt/tests: Add more BCryptGetFipsAlgorithmMode tests
by Sebastian Lackner 08 Sep '16

08 Sep '16

On 08.09.2016 13:53, Bruno Jesus wrote: > From: Kai Blaschke <kai.blaschke(a)kb-dev.net> > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> > --- > dlls/bcrypt/tests/Makefile.in | 2 +- > dlls/bcrypt/tests/bcrypt.c | 49 ++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 49 insertions(+), 2 deletions(-) > > diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in > index 0f130b1..1bf7d2c 100644 > --- a/dlls/bcrypt/… [View More]tests/Makefile.in > +++ b/dlls/bcrypt/tests/Makefile.in > @@ -1,5 +1,5 @@ > TESTDLL = bcrypt.dll > -IMPORTS = bcrypt user32 > +IMPORTS = bcrypt user32 advapi32 > > C_SRCS = \ > bcrypt.c > diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c > index 9bd2cea..d16735c 100644 > --- a/dlls/bcrypt/tests/bcrypt.c > +++ b/dlls/bcrypt/tests/bcrypt.c > @@ -61,14 +61,61 @@ static void test_BCryptGenRandom(void) > > static void test_BCryptGetFipsAlgorithmMode(void) > { > - NTSTATUS ret; > + static const WCHAR policyKeyVistaW[] = { > + 'S','y','s','t','e','m','\\', > + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', > + 'C','o','n','t','r','o','l','\\', > + 'L','s','a','\\', > + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; > + static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; > + static const WCHAR policyKeyXPW[] = { > + 'S','y','s','t','e','m','\\', > + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', > + 'C','o','n','t','r','o','l','\\', > + 'L','s','a',0}; > + static const WCHAR policyValueXPW[] = { > + 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; > + HKEY hkey; > + BOOLEAN expected; > + BOOLEAN result; > BOOLEAN enabled; > + DWORD value, count = sizeof(value); > + NTSTATUS ret; > > ret = BCryptGetFipsAlgorithmMode(&enabled); > ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); > > ret = BCryptGetFipsAlgorithmMode(NULL); > ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); > + > + expected = FALSE; > + > + if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey)) > + { > + if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyVistaW, policyValueVistaW, > + RRF_RT_REG_DWORD, NULL, &enabled, &count)) > + { > + expected = !!enabled; > + } > + RegCloseKey(hkey); > + } > + else if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey)) > + { > + if (!RegGetValueW(HKEY_LOCAL_MACHINE, policyKeyXPW, policyValueXPW, > + RRF_RT_REG_DWORD, NULL, &enabled, &count)) > + { > + expected = !!enabled; > + } > + RegCloseKey(hkey); > + } > + > + ret = BCryptGetFipsAlgorithmMode(&result); > + ok(!ret, "expected status STATUS_SUCCESS(0), got 0x%08X\n", ret); > + ok(result == expected, "expected result %d, got %d\n", expected, result); > + > + ret = BCryptGetFipsAlgorithmMode(NULL); > + ok(ret == STATUS_INVALID_PARAMETER, > + "expected status STATUS_INVALID_PARAMETER(0xC000000D), got 0x%08X\n", ret); Is it intentional that you test everything twice? It would be sufficient to add the "result == expected" check to the existing testcase above. > } > > static void format_hash(const UCHAR *bytes, ULONG size, char *buf) > [View Less]

2 1

Re: user32/tests: Fix incorrect usage of broken() function. (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=25693 Your paranoid android. === w864 (32 bit msg) === msg.c:13939: Test failed: WM_NCRBUTTONDOWN on caption: 3: the msg sequence is not complete: expected 007b - actual 0000 === w1064 (32 bit msg) === msg.c:13939: Test … [View More]

1 0

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);… [View More]

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: … [View More]

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/… [View More]

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 … [View More]

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 08 Sep '16

08 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 +++++++++++++++++++++++++++++++++++++++ … [View More]> 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 > > > [View Less]

3 5

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

08 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 … [View More]

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

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=25644 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues.
by Sebastian Lackner 07 Sep '16

07 Sep '16

On 07.09.2016 12:57, Sebastian Lackner wrote: > On 07.09.2016 10:50, Sebastian Lackner wrote: >> From: Sebastian Lackner <sebastian(a)fds-team.de> >> >> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> >> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> >> >> v3: Fixed another false compiler warning in String_concat (missed during >> previous review). >> --- >> >> dlls/jscript/array.c | 6 +++--- … [View More]

2 1

Re: winmm/tests: Pass the full size of MIDIHDR to midiOutPrepareHeader().
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=25634 Your paranoid android. === w1064 (32 bit midi) === midi.c:290: Test failed: midiOutOpen(dev=0) rc=MMSYSERR_ERROR midi.c:489: Test failed: midiStreamOpen(dev=-2) rc=MMSYSERR_ERROR midi.c:290: Test failed: midiOutOpen(… [View More]

2 1

Re: [PATCH v3 06/20] configure: Add support for udev
by Sebastian Lackner 07 Sep '16

07 Sep '16

On 02.09.2016 14:16, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > configure | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > configure.ac | 14 +++++++ > include/config.h.in | 6 +++ > 3 files changed, 137 insertions(+) > > > > v3-0006-configure-Add-support-for-udev.txt > > > diff --git a/configure b/configure > index 9808e11..3904a8b 100755 > --- a/configure > +++ … [View More]b/configure > @@ -652,6 +652,8 @@ FONTCONFIG_CFLAGS > CUPS_CFLAGS > CAPI20_LIBS > CAPI20_CFLAGS > +UDEV_LIBS > +UDEV_CFLAGS > OSS4_CFLAGS > ALSA_LIBS > GSTREAMER_LIBS > @@ -1589,6 +1591,8 @@ GSTREAMER_CFLAGS > GSTREAMER_LIBS > CAPI20_CFLAGS > CAPI20_LIBS > +UDEV_LIBS > +UDEV_CFLAGS > FONTCONFIG_CFLAGS > FONTCONFIG_LIBS > JPEG_CFLAGS > @@ -2273,6 +2277,7 @@ Optional Packages: > --without-sane do not use SANE (scanner support) > --without-tiff do not use TIFF > --without-v4l do not use v4l1 (v4l support) > + --without-udev do not use udev > --without-xcomposite do not use the Xcomposite extension > --without-xcursor do not use the Xcursor extension > --without-xinerama do not use Xinerama (multi-monitor support) > @@ -2342,6 +2347,8 @@ Some influential environment variables: > CAPI20_CFLAGS > C compiler flags for capi20, overriding pkg-config > CAPI20_LIBS Linker flags for capi20, overriding pkg-config > + UDEV_CFLAGS C compiler flags for udev, overriding pkg-config > + UDEV_LIBS Linker flags for udev, overriding pkg-config > FONTCONFIG_CFLAGS > C compiler flags for fontconfig, overriding pkg-config > FONTCONFIG_LIBS > @@ -3543,6 +3550,12 @@ if test "${with_tiff+set}" = set; then : > fi > > > +# Check whether --with-udev was given. > +if test "${with_udev+set}" = set; then : > + withval=$with_udev; > +fi > + > + > # Check whether --with-v4l was given. > if test "${with_v4l+set}" = set; then : > withval=$with_v4l; > @@ -12899,6 +12912,108 @@ esac > enable_wineoss_drv=${enable_wineoss_drv:-no} > fi > > +if test "x$with_udev" != "xno" > +then > + if ${UDEV_CFLAGS:+false} :; then : > + if ${PKG_CONFIG+:} false; then : > + UDEV_CFLAGS=`$PKG_CONFIG --cflags udev 2>/dev/null` > +fi > +fi > + > +if ${UDEV_LIBS:+false} :; then : > + if ${PKG_CONFIG+:} false; then : > + UDEV_LIBS=`$PKG_CONFIG --libs udev 2>/dev/null` > +fi > +fi > + > + > +$as_echo "$as_me:${as_lineno-$LINENO}: udev cflags: $UDEV_CFLAGS" >&5 > +$as_echo "$as_me:${as_lineno-$LINENO}: udev libs: $UDEV_LIBS" >&5 > +ac_save_CPPFLAGS=$CPPFLAGS > +CPPFLAGS="$CPPFLAGS $UDEV_CFLAGS" > +for ac_header in libudev.h > +do : > + ac_fn_c_check_header_mongrel "$LINENO" "libudev.h" "ac_cv_header_libudev_h" "$ac_includes_default" > +if test "x$ac_cv_header_libudev_h" = xyes; then : > + cat >>confdefs.h <<_ACEOF > +#define HAVE_LIBUDEV_H 1 > +_ACEOF > + > +fi > + > +done > + > + if test "$ac_cv_header_libudev_h" = "yes" -a "$ac_cv_header_libudev_h" = "yes" > + then > + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ludev" >&5 > +$as_echo_n "checking for -ludev... " >&6; } > +if ${ac_cv_lib_soname_udev+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + ac_check_soname_save_LIBS=$LIBS > +LIBS="-ludev $LIBS" > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > +/* end confdefs.h. */ > + > +/* Override any GCC internal prototype to avoid an error. > + Use char because int might match the return type of a GCC > + builtin and then its argument prototype would still apply. */ > +#ifdef __cplusplus > +extern "C" > +#endif > +char udev_new (); > +int > +main () > +{ > +return udev_new (); > + ; > + return 0; > +} > +_ACEOF > +if ac_fn_c_try_link "$LINENO"; then : > + case "$LIBEXT" in > + dll) ac_cv_lib_soname_udev=`$ac_cv_path_LDD conftest.exe | grep "udev" | sed -e "s/dll.*/dll/"';2,$d'` ;; > + dylib) ac_cv_lib_soname_udev=`$OTOOL -L conftest$ac_exeext | grep "libudev\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libudev\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; > + *) ac_cv_lib_soname_udev=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libudev\\.$LIBEXT" | sed -e "s/^.*\\[\$libudev\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` > + if ${ac_cv_lib_soname_udev:+false} :; then : > + ac_cv_lib_soname_udev=`$LDD conftest$ac_exeext | grep "libudev\\.$LIBEXT" | sed -e "s/^.*$libudev\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` > +fi ;; > + esac > +fi > +rm -f core conftest.err conftest.$ac_objext \ > + conftest$ac_exeext conftest.$ac_ext > + LIBS=$ac_check_soname_save_LIBS > +fi > +if ${ac_cv_lib_soname_udev:+false} :; then : > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 > +$as_echo "not found" >&6; } > + > +else > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_udev" >&5 > +$as_echo "$ac_cv_lib_soname_udev" >&6; } > + > +cat >>confdefs.h <<_ACEOF > +#define SONAME_LIBUDEV "$ac_cv_lib_soname_udev" > +_ACEOF > + > + UDEV_LIBS="-ludev" > + > +fi > + fi > +CPPFLAGS=$ac_save_CPPFLAGS > +test -z "$UDEV_CFLAGS" || UDEV_CFLAGS=`echo " $UDEV_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` > +test -z "$UDEV_LIBS" || UDEV_LIBS=`echo " $UDEV_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` > + > +fi > +if test "x$ac_cv_lib_soname_udev" = "x"; then : > + case "x$with_udev" in > + x) as_fn_append wine_notices "|libudev ${notice_platform}development files not found, hidraw HID will not be supported." ;; > + xno) ;; > + *) as_fn_error $? "libudev ${notice_platform}development files not found, hidraw HID will not be supported. > +This is an error since --with-udev was requested." "$LINENO" 5 ;; > +esac > +fi > + > if test "x$with_capi" != "xno" > then > if ${CAPI20_CFLAGS:+false} :; then : > @@ -17349,6 +17464,8 @@ ALSA_LIBS = $ALSA_LIBS > OSS4_CFLAGS = $OSS4_CFLAGS > CAPI20_CFLAGS = $CAPI20_CFLAGS > CAPI20_LIBS = $CAPI20_LIBS > +UDEV_CFLAGS = $UDEV_CFLAGS > +UDEV_LIBS = $UDEV_LIBS > CUPS_CFLAGS = $CUPS_CFLAGS > FONTCONFIG_CFLAGS = $FONTCONFIG_CFLAGS > FONTCONFIG_LIBS = $FONTCONFIG_LIBS > diff --git a/configure.ac b/configure.ac > index f02ab98..524777d 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -103,6 +103,7 @@ AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data co > > AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) > AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) > +AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev])) This list is sorted alphabetically. > > AC_CANONICAL_HOST > > @@ -1519,6 +1520,19 @@ WINE_NOTICE_WITH(oss,[test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes] > [OSS sound system found but too old (OSSv4 needed), OSS won't be supported.], > [enable_wineoss_drv]) > > +dnl **** Check for libudev**** There is a space missing before the "****". > +if test "x$with_udev" != "xno" > +then > + WINE_PACKAGE_FLAGS(UDEV,[udev],,,, > + [AC_CHECK_HEADERS([libudev.h]) > + if test "$ac_cv_header_libudev_h" = "yes" -a "$ac_cv_header_libudev_h" = "yes" > + then > + WINE_CHECK_SONAME(udev,udev_new,AC_SUBST(UDEV_LIBS,"-ludev"),,[$UDEV_LIBS]) Do we want to link directly against udev or load it at runtime (wine_dlopen)? For direct linking it would be better to use AC_CHECK_LIB to match the existing configure.ac code (the only exception I've found is OpenAL). For loading at runtime there is no need to define UDEV_LIBS. > + fi]) > +fi > +WINE_NOTICE_WITH(udev,[test "x$ac_cv_lib_soname_udev" = "x"], > + [libudev ${notice_platform}development files not found, hidraw HID not supported.]) > + > dnl **** Check for capi4linux **** > if test "x$with_capi" != "xno" > then > diff --git a/include/config.h.in b/include/config.h.in > index 382beb6..b9f9f19 100644 > --- a/include/config.h.in > +++ b/include/config.h.in > @@ -378,6 +378,9 @@ > /* Define to 1 if you have the <libproc.h> header file. */ > #undef HAVE_LIBPROC_H > > +/* Define to 1 if you have the <libudev.h> header file. */ > +#undef HAVE_LIBUDEV_H > + > /* Define to 1 if you have the <libunwind.h> header file. */ > #undef HAVE_LIBUNWIND_H > > @@ -1466,6 +1469,9 @@ > /* Define to the soname of the libXxf86vm library. */ > #undef SONAME_LIBXXF86VM > > +/* Define to the soname of the libudev library. */ > +#undef SONAME_LIBUDEV > + > /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ > #undef STAT_MACROS_BROKEN > > > > [View Less]

1 0

Re: [PATCH v4 3/20] ntoskrnl.exe: Implement loading plug and play devices
by Sebastian Lackner 07 Sep '16

07 Sep '16

On 04.09.2016 03:12, Aric Stewart wrote: > + WCHAR buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_SERVICE_NAME * sizeof(WCHAR)]; I just noticed that the buffer size is wrong here. It should be something like: char buffer[FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data[MAX_SERVICE_NAME * sizeof(WCHAR)] )]; After this change I am basically fine, but the function is not really used before patch [9/20] in your series. To make sure all pieces work together as expected I would prefer … [View More]

1 0

Re: jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues.
by Jacek Caban 07 Sep '16

07 Sep '16

Hi Sebastian, The patch looks mostly good, but I get a compiler warning (a false one, but still): In file included from jsval.h:22:0, from jscript.h:377, from array.c:25: array.c: In function ‘array_join’: jsstr.h:109:7: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized] if(!--str->ref) ^ array.c:243:25: note: ‘ret’ was declared here jsstr_t **str_tab, *ret; ^ Thanks, Jacek

2 1

Re: [1/2] jscript: Return NULL if jsstr_substr fails.
by Jacek Caban 07 Sep '16

07 Sep '16

Hi Sebastian, I took a deeper look at this. It seems that we have at least two more jsstr_alloc_buf callers to fix (jsstr_concat and JSGlobal_decodeURIComponent). All those seem to be mistakes caused by wrong choice of function signature, requiring not intuitive error handling. I'd prefer to change the root of those problems, making the function: jsstr_t *jsstr_alloc_buf(unsigned,WCHAR**) This should avoid similar mistakes in the future. This will be much larger patch than you originally … [View More]

2 3

Re: [PATCH 1/6] ddraw/tests: Add position tests for D3DPROCESSVERTICES_TRANSFORM.
by Henri Verbeet 07 Sep '16

07 Sep '16

On 3 September 2016 at 21:42, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > + color = get_surface_color(rt, 18, 18); > + ok(compare_color(color, 0x00000000, 1), "Got unexpected color %#x\n", color); > + color = get_surface_color(rt, 22, 18); > + ok(compare_color(color, 0x00000000, 1), "Got unexpected color %#x\n", color); > + color = get_surface_color(rt, 18, 22); > + ok(compare_color(color, 0x00000000, 1), "Got unexpected color %#x\n", color); ...… [View More]

2 2

Re: [PATCH] ws2_32/tests: Add non-interactive SIO_ADDRESS_LIST_CHANGE tests
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=25617 Your paranoid android. === w7pro64 (64 bit sock) === sock.c:7753: Test failed: bytesReturned isn't supposed to be 1 sock.c:7799: Test failed: Waiting for timeout failed with 0 + errno 997

2 1

Re: [v2 PATCH] ws2_32: accept addrlen32 parameter is optional
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=25613 Your paranoid android. === w7pro64 (64 bit sock) === sock.c:7765: Test failed: bytesReturned isn't supposed to be 1 sock.c:7811: Test failed: Waiting for timeout failed with 0 + errno 997

1 0

Re: [PATCH] ws2_32: accept addrlelen32 parameter is optional
by Bruno Jesus 07 Sep '16

07 Sep '16

On Tue, Sep 6, 2016 at 10:38 PM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/ws2_32/socket.c | 2 +- > dlls/ws2_32/tests/sock.c | 9 +++++++++ > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c > index 79ccfc2..38fa62f 100644 > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > … [View More]

1 0

Re: setupapi/tests: Also check for ERROR_CALL_NOT_IMPLEMENTED at the second call to SetupDiCreateDeviceInfoListExW
by Marvin 06 Sep '16

06 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=25601 Your paranoid android. === w1064 (64 bit devinst) === devinst.c:1137: Test failed: Unexpected path \\?\root#legacy_bogus#0001#{6a55b5a4-3f65-11db-b704-0011955c2bdb} devinst.c:1259: Test failed: Expected key to not … [View More]

1 0

Re: [PATCH 2/2] user32/tests: On Win 8 and later, moving a window off-screen doesn't crop its update region.
by Marvin 06 Sep '16

06 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=25560 Your paranoid android. === w864 (32 bit msg) === msg.c:13939: Test failed: WM_NCRBUTTONDOWN on caption: 3: the msg sequence is not complete: expected 007b - actual 0000 === w1064 (32 bit msg) === msg.c:7444: Test … [View More]

3 2

Re: [PATCH v3 07/20] winebus.sys: Add Linux udev bus
by Thomas Faber 06 Sep '16

06 Sep '16

> +NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > +{ > + NTSTATUS rc = STATUS_NOT_SUPPORTED; You generally want to initialize this with irp->IoStatus.Status. For requests the bus driver doesn't support, it needs to return whatever the drivers higher up the stack decided. E.g. IRP_MN_QUERY_DEVICE_RELATIONS might be handled by a bus driver FDO above, in which case it will likely set the status to success -- and lower-level drivers need to propagate this … [View More]

1 0

Re: [PATCH v3 03/20] ntoskrnl.exe: Implement loading plug and play devices
by Thomas Faber 06 Sep '16

06 Sep '16

> @@ -2791,10 +2794,188 @@ done: > } > > > +static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) > +{ > + SetEvent( irp->UserEvent ); > + return STATUS_MORE_PROCESSING_REQUIRED; > +} > + > + > +static NTSTATUS send_device_irp( DEVICE_OBJECT *device, IRP *irp, ULONG_PTR *info ) > +{ > + NTSTATUS status; > + IO_STACK_LOCATION *irpsp; > + HANDLE event = CreateEventA( NULL, FALSE, FALSE, … [View More]NULL ); > + > + irp->UserEvent = event; > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->CompletionRoutine = internal_complete; > + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; You probably want a call on cancel too? > + IoCallDriver( device, irp ); > + > + if (irp->IoStatus.u.Status == STATUS_PENDING) > + WaitForSingleObject( event, INFINITE ); STATUS_PENDING is returned from the dispatch routine, it doesn't make sense in irp->IoStatus. (Between your call to IoCallDriver and your completion routine firing, somebody else owns the IRP, meaning you're not allowed to touch it.) > + status = irp->IoStatus.u.Status; > + if (info) > + *info = irp->IoStatus.Information; > + IoCompleteRequest( irp, IO_NO_INCREMENT ); > + CloseHandle( event ); > + return status; > +} > + > + > +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ) > +{ > + IO_STACK_LOCATION *irpsp; > + IO_STATUS_BLOCK irp_status; > + IRP *irp; > + > + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status ))) > + return STATUS_NO_MEMORY; > + > + irpsp = IoGetNextIrpStackLocation( irp ); > + irpsp->MinorFunction = IRP_MN_QUERY_ID; > + irpsp->Parameters.QueryId.IdType = type; You should initialize irp->IoStatus.Status to STATUS_NOT_SUPPORTED, drivers depend on this (they're supposed to leave it untouched for requests they don't support). > + return send_device_irp( device, irp, (ULONG_PTR *)id ); > +} > + > + > +static BOOL get_driver_for_id( const WCHAR *id, WCHAR *driver ) > +{ > + static const WCHAR serviceW[] = {'S','e','r','v','i','c','e',0}; > + static const UNICODE_STRING service_str = { sizeof(serviceW) - sizeof(WCHAR), sizeof(serviceW), (WCHAR *)serviceW }; > + static const WCHAR critical_fmtW[] = > + {'\\','R','e','g','i','s','t','r','y', > + '\\','M','a','c','h','i','n','e', > + '\\','S','y','s','t','e','m', > + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', > + '\\','C','o','n','t','r','o','l', > + '\\','C','r','i','t','i','c','a','l','D','e','v','i','c','e','D','a','t','a','b','a','s','e', > + '\\','%','s',0}; > + WCHAR buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + MAX_SERVICE_NAME * sizeof(WCHAR)]; > + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; > + OBJECT_ATTRIBUTES attr; > + UNICODE_STRING key; > + NTSTATUS status; > + HANDLE hkey; > + WCHAR *keyW; > + DWORD len; > + > + if (!(keyW = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(critical_fmtW) + strlenW(id) * sizeof(WCHAR) ))) > + return STATUS_NO_MEMORY; > + > + sprintfW( keyW, critical_fmtW, id ); > + RtlInitUnicodeString( &key, keyW ); > + InitializeObjectAttributes( &attr, &key, OBJ_CASE_INSENSITIVE, NULL, NULL ); This should have OBJ_KERNEL_HANDLE in native, not sure if that is, or ever will be, relevant for Wine. > + status = ZwOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); > + RtlFreeUnicodeString( &key ); > + if (status != STATUS_SUCCESS) > + { > + WARN_(plugplay)( "failed to open critical device database\n" ); > + return FALSE; > + } > + > + status = ZwQueryValueKey( hkey, &service_str, KeyValuePartialInformation, > + info, sizeof(buffer) - sizeof(WCHAR), &len ); > + ZwClose( hkey ); > + if (status != STATUS_SUCCESS || info->Type != REG_SZ) > + { > + TRACE_(plugplay)( "no driver found for %s\n", debugstr_w(id) ); > + return FALSE; > + } > + > + memcpy( driver, info->Data, info->DataLength ); > + driver[ info->DataLength / sizeof(WCHAR) ] = 0; > + TRACE_(plugplay)( "found driver %s for %s\n", debugstr_w(driver), debugstr_w(id) ); > + return TRUE; > +} > + > + > +static void handle_bus_relations( DEVICE_OBJECT *device ) > +{ > + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > + WCHAR buffer[MAX_SERVICE_NAME + sizeof(servicesW)/sizeof(WCHAR)]; > + WCHAR driver[MAX_SERVICE_NAME] = {0}; > + DRIVER_OBJECT *driver_obj; > + UNICODE_STRING string; > + WCHAR *ids, *ptr; > + NTSTATUS status; > + > + TRACE_(plugplay)( "(%p)\n", device ); > + > + /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, > + * but we dont have to, We have the DEVICE_OBJECT of the new device > + * so we can simply handle the process here */ > + > + status = get_device_id( device, BusQueryCompatibleIDs, &ids ); PNP (and power, and generally most) IRPs should be sent to the top of the device stack. That generally means you want to throw an IoGetAttachedDeviceReference call in before sending an IRP. > + if (status != ERROR_SUCCESS || !ids) STATUS_SUCCESS? > + { > + ERR_(plugplay)( "Failed to get device IDs\n" ); > + return; > + } > + > + for (ptr = ids; *ptr; ptr += strlenW(ptr) + 1) > + { > + if (get_driver_for_id( ptr, driver )) > + break; > + } > + RtlFreeHeap( GetProcessHeap(), 0, ids ); > + > + if (!driver[0]) > + { > + ERR_(plugplay)( "No matching driver found for device\n" ); > + return; > + } > + > + strcpyW( buffer, servicesW ); > + strcatW( buffer, driver ); > + RtlInitUnicodeString( &string, buffer ); > + if (ZwLoadDriver( &string ) != STATUS_SUCCESS) > + { > + ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); > + return; > + } > + > + strcpyW( buffer, driverW ); > + strcatW( buffer, driver ); > + RtlInitUnicodeString( &string, buffer ); > + if (ObReferenceObjectByName( &string, OBJ_CASE_INSENSITIVE, NULL, > + 0, NULL, KernelMode, NULL, (void **)&driver_obj ) != STATUS_SUCCESS) > + { > + ERR_(plugplay)( "Failed to locate loaded driver %s\n", debugstr_w(driver) ); > + return; > + } > + > + if (driver_obj->DriverExtension->AddDevice) > + status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); > + else > + status = STATUS_NOT_IMPLEMENTED; > + > + ObDereferenceObject( driver_obj ); > + > + if (status != STATUS_SUCCESS) > + ERR_(plugplay)( "AddDevice failed for driver %s\n", debugstr_w(driver) ); > +} > + > + > /*********************************************************************** > * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) > */ > void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) > { > - FIXME( "(%p, %i): stub\n", device_object, type ); > + TRACE( "(%p, %i)\n", device_object, type ); > + > + switch (type) > + { > + case BusRelations: > + handle_bus_relations( device_object ); > + break; > + default: > + FIXME( "unhandled relation %i\n", type ); > + break; > + } > } > > [View Less]

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel