August 2016 - Wine-commits - list.winehq.org

Aric Stewart : hidclass.sys: Use the PDO instance id for the HID instance id.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: f2392af888679e46f8917044e6d505a4dd80ae8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2392af888679e46f8917044e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 12 08:17:55 2016 -0500 hidclass.sys: Use the PDO instance id for the HID instance id. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 91 +++++++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 34 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5a6a0a7..6ce68e0 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -31,16 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); static const WCHAR device_enumeratorW[] = {'H','I','D',0}; +static const WCHAR separator_W[] = {'\\',0}; static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; -static const WCHAR device_instanceid_fmtW[] = {'%','s','\\', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', - '0','4','x','&','%','s','\\','%','i','&','%','s',0}; typedef struct _NATIVE_DEVICE { struct list entry; - DWORD vidpid; DEVICE_OBJECT *PDO; DEVICE_OBJECT *FDO; HID_MINIDRIVER_REGISTRATION *minidriver; @@ -110,6 +107,37 @@ static NTSTATUS PNP_SendPowerIRP(DEVICE_OBJECT *device, DEVICE_POWER_STATE power return SendDeviceIRP(device, irp); } +static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id) +{ + NTSTATUS status; + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK irp_status; + IRP *irp; + HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); + + irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); + if (irp == NULL) + return STATUS_NO_MEMORY; + + irp->UserEvent = event; + irpsp = IoGetNextIrpStackLocation(irp); + irpsp->MinorFunction = IRP_MN_QUERY_ID; + irpsp->Parameters.QueryId.IdType = type; + irpsp->CompletionRoutine = internalComplete; + irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; + + IoCallDriver(device, irp); + if (irp->IoStatus.u.Status == STATUS_PENDING) + WaitForSingleObject(event, INFINITE); + + *id = (WCHAR*)irp->IoStatus.Information; + status = irp->IoStatus.u.Status; + IoCompleteRequest(irp, IO_NO_INCREMENT ); + CloseHandle(event); + + return status; +} + NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { DEVICE_OBJECT *device = NULL; @@ -117,26 +145,28 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) minidriver *minidriver; HID_DEVICE_ATTRIBUTES attr; BASE_DEVICE_EXTENSION *ext = NULL; - WCHAR serial[256]; - WCHAR interface[256]; - DWORD index = HID_STRING_ID_ISERIALNUMBER; - NATIVE_DEVICE *tracked_device, *ptr; - INT interface_index = 1; + NATIVE_DEVICE *tracked_device; HID_DESCRIPTOR descriptor; BYTE *reportDescriptor; INT i; + WCHAR *PDO_id; + WCHAR *id_ptr; - static const WCHAR ig_fmtW[] = {'I','G','_','%','i',0}; - static const WCHAR im_fmtW[] = {'I','M','_','%','i',0}; - + status = get_device_id(PDO, BusQueryInstanceID, &PDO_id); + if (status != STATUS_SUCCESS) + { + ERR("Failed to get PDO id(%x)\n",status); + return status; + } - TRACE("PDO add device(%p)\n", PDO); + TRACE("PDO add device(%p:%s)\n", PDO, debugstr_w(PDO_id)); minidriver = find_minidriver(driver); status = HID_CreateDevice(PDO, &minidriver->minidriver, &device); if (status != STATUS_SUCCESS) { ERR("Failed to create HID object (%x)\n",status); + HeapFree(GetProcessHeap(), 0, PDO_id); return status; } @@ -148,6 +178,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Minidriver AddDevice failed (%x)\n",status); + HeapFree(GetProcessHeap(), 0, PDO_id); HID_DeleteDevice(&minidriver->minidriver, device); return status; } @@ -156,6 +187,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Minidriver IRP_MN_START_DEVICE failed (%x)\n",status); + HeapFree(GetProcessHeap(), 0, PDO_id); HID_DeleteDevice(&minidriver->minidriver, device); return status; } @@ -168,6 +200,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Minidriver failed to get Attributes(%x)\n",status); PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); + HeapFree(GetProcessHeap(), 0, PDO_id); return status; } @@ -177,14 +210,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->information.Polled = minidriver->minidriver.DevicesArePolled; tracked_device = HeapAlloc(GetProcessHeap(), 0, sizeof(*tracked_device)); - tracked_device->vidpid = MAKELONG(attr.VendorID, attr.ProductID); tracked_device->PDO = PDO; tracked_device->FDO = device; tracked_device->minidriver = &minidriver->minidriver; - - LIST_FOR_EACH_ENTRY(ptr, &tracked_devices, NATIVE_DEVICE, entry) - if (ptr->vidpid == tracked_device->vidpid) interface_index++; - list_add_tail(&tracked_devices, &tracked_device->entry); status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, device, NULL, 0, @@ -194,6 +222,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Device Descriptor(%x)\n",status); PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); + HeapFree(GetProcessHeap(), 0, PDO_id); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -205,6 +234,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("No Report Descriptor found in reply\n"); PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); + HeapFree(GetProcessHeap(), 0, PDO_id); return status; } @@ -216,6 +246,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(&minidriver->minidriver, device); HeapFree(GetProcessHeap(), 0, reportDescriptor); + HeapFree(GetProcessHeap(), 0, PDO_id); return status; } @@ -226,28 +257,20 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(&minidriver->minidriver, device); + HeapFree(GetProcessHeap(), 0, PDO_id); return STATUS_NOT_SUPPORTED; } ext->information.DescriptorSize = ext->preparseData->dwSize; - serial[0] = 0; - status = call_minidriver(IOCTL_HID_GET_STRING, device, - &index, sizeof(DWORD), serial, sizeof(serial)); - - if (serial[0] == 0) - { - static const WCHAR wZeroSerial[]= {'0','0','0','0',0}; - lstrcpyW(serial, wZeroSerial); - } + lstrcpyW(ext->instance_id, device_enumeratorW); + strcatW(ext->instance_id, separator_W); + /* Skip the original enumerator */ + id_ptr = strchrW(PDO_id, '\\'); + id_ptr++; + strcatW(ext->instance_id, id_ptr); + HeapFree(GetProcessHeap(), 0, PDO_id); - if (ext->preparseData->caps.UsagePage == HID_USAGE_PAGE_GENERIC && - (ext->preparseData->caps.Usage == HID_USAGE_GENERIC_GAMEPAD || - ext->preparseData->caps.Usage == HID_USAGE_GENERIC_JOYSTICK)) - sprintfW(interface, ig_fmtW, interface_index); - else - sprintfW(interface, im_fmtW, interface_index); - sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial); sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); HID_LinkDevice(device);

1 0

Aric Stewart : hidclass.sys: Call IoAttachDeviceToDeviceStack when creating HID device.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: ab3b9bd84db3b942ea7ce1e85ac6dd12087f2596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3b9bd84db3b942ea7ce1e85… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 12 08:18:56 2016 -0500 hidclass.sys: Call IoAttachDeviceToDeviceStack when creating HID device. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 ++ include/ddk/wdm.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index b137c9b..b90e701 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -75,6 +75,8 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT lstrcpyW(ext->device_name, dev_name); ext->link_name = NULL; + IoAttachDeviceToDeviceStack(*device, native_device); + return S_OK; } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5eda82d..68694af 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1213,6 +1213,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOI PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); +PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PLARGE_INTEGER,PKEVENT,IO_STATUS_BLOCK*); NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*);

1 0

Aric Stewart : hidclass.sys: Do not send IRP_MJ_PNP ioctls.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 3036cfef2f8afab6419fa07b78a5dc53052e1f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3036cfef2f8afab6419fa07b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 12 08:20:01 2016 -0500 hidclass.sys: Do not send IRP_MJ_PNP ioctls. That is the Plug and Play Manager's job. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 6ce68e0..c537bf6 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -75,22 +75,6 @@ static NTSTATUS SendDeviceIRP(DEVICE_OBJECT* device, IRP *irp) return status; } -static NTSTATUS PNP_SendPnPIRP(DEVICE_OBJECT *device, UCHAR minor) -{ - IO_STACK_LOCATION *irpsp; - IO_STATUS_BLOCK irp_status; - - IRP *irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, device, NULL, 0, NULL, NULL, &irp_status); - - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->MinorFunction = minor; - - irpsp->Parameters.StartDevice.AllocatedResources = NULL; - irpsp->Parameters.StartDevice.AllocatedResourcesTranslated = NULL; - - return SendDeviceIRP(device, irp); -} - static NTSTATUS PNP_SendPowerIRP(DEVICE_OBJECT *device, DEVICE_POWER_STATE power) { IO_STATUS_BLOCK irp_status; @@ -183,22 +167,12 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - status = PNP_SendPnPIRP(device, IRP_MN_START_DEVICE); - if (status != STATUS_SUCCESS) - { - ERR("Minidriver IRP_MN_START_DEVICE failed (%x)\n",status); - HeapFree(GetProcessHeap(), 0, PDO_id); - HID_DeleteDevice(&minidriver->minidriver, device); - return status; - } - status = call_minidriver(IOCTL_HID_GET_DEVICE_ATTRIBUTES, device, NULL, 0, &attr, sizeof(attr)); if (status != STATUS_SUCCESS) { ERR("Minidriver failed to get Attributes(%x)\n",status); - PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); HeapFree(GetProcessHeap(), 0, PDO_id); return status; @@ -220,7 +194,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (status != STATUS_SUCCESS) { ERR("Cannot get Device Descriptor(%x)\n",status); - PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); HeapFree(GetProcessHeap(), 0, PDO_id); return status; @@ -232,7 +205,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) if (i >= descriptor.bNumDescriptors) { ERR("No Report Descriptor found in reply\n"); - PNP_SendPnPIRP(device, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(&minidriver->minidriver, device); HeapFree(GetProcessHeap(), 0, PDO_id); return status; @@ -296,7 +268,6 @@ void PNP_CleanupPNP(DRIVER_OBJECT *driver) { list_remove(&tracked_device->entry); PNP_SendPowerIRP(tracked_device->FDO, PowerDeviceD3); - PNP_SendPnPIRP(tracked_device->FDO, IRP_MN_REMOVE_DEVICE); HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO); HeapFree(GetProcessHeap(), 0, tracked_device); }

1 0

Aric Stewart : hidclass.sys: Do not send IRP_MJ_POWER ioctls.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: b16ba45450a9e00df28652a6183fcb6e35bb4354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16ba45450a9e00df28652a61… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 12 08:20:11 2016 -0500 hidclass.sys: Do not send IRP_MJ_POWER ioctls. That is the Plug and Play Manager's job. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index c537bf6..8fd5c17 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -53,44 +53,6 @@ static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, return STATUS_MORE_PROCESSING_REQUIRED; } -static NTSTATUS SendDeviceIRP(DEVICE_OBJECT* device, IRP *irp) -{ - NTSTATUS status; - IO_STACK_LOCATION *irpsp; - HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); - - irp->UserEvent = event; - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->CompletionRoutine = internalComplete; - irpsp->Control = SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; - - IoCallDriver(device, irp); - - if (irp->IoStatus.u.Status == STATUS_PENDING) - WaitForSingleObject(event, INFINITE); - - status = irp->IoStatus.u.Status; - IoCompleteRequest(irp, IO_NO_INCREMENT ); - CloseHandle(event); - return status; -} - -static NTSTATUS PNP_SendPowerIRP(DEVICE_OBJECT *device, DEVICE_POWER_STATE power) -{ - IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; - - IRP *irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, device, NULL, 0, NULL, NULL, &irp_status); - - irpsp = IoGetNextIrpStackLocation(irp); - irpsp->MinorFunction = IRP_MN_SET_POWER; - - irpsp->Parameters.Power.Type = DevicePowerState; - irpsp->Parameters.Power.State.DeviceState = power; - - return SendDeviceIRP(device, irp); -} - static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id) { NTSTATUS status; @@ -252,7 +214,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength); HID_StartDeviceThread(device); - PNP_SendPowerIRP(device, PowerDeviceD0); return STATUS_SUCCESS; } @@ -267,7 +228,6 @@ void PNP_CleanupPNP(DRIVER_OBJECT *driver) if (tracked_device->minidriver->DriverObject == driver) { list_remove(&tracked_device->entry); - PNP_SendPowerIRP(tracked_device->FDO, PowerDeviceD3); HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO); HeapFree(GetProcessHeap(), 0, tracked_device); }

1 0

Nils Kuhnhenn : winex11.drv: Return default locale in LoadKeyboardLayout stub instead of 0.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 1def1e2f7f5352d8af0faedc8c09a8cb84e5562f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def1e2f7f5352d8af0faedc8… Author: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Date: Thu Aug 11 17:28:17 2016 +0200 winex11.drv: Return default locale in LoadKeyboardLayout stub instead of 0. Signed-off-by: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 47a9872..adb028a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1947,9 +1947,8 @@ HKL CDECL X11DRV_GetKeyboardLayout(DWORD dwThreadid) */ HKL CDECL X11DRV_LoadKeyboardLayout(LPCWSTR name, UINT flags) { - FIXME("%s, %04x: stub!\n", debugstr_w(name), flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + FIXME("%s, %04x: semi-stub! Returning default layout.\n", debugstr_w(name), flags); + return get_locale_kbd_layout(); }

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleScreenBufferInfoEx.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 95f8270bc2a9b73ee90a4abcbf4b0dd7ce1187c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f8270bc2a9b73ee90a4abcb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 17 01:35:39 2016 +0000 kernel32/tests: Add tests for GetConsoleScreenBufferInfoEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5b66d9f..826ed43 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2938,6 +2938,55 @@ static void test_SetConsoleFont(HANDLE std_output) todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); } +static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + HANDLE hmod; + BOOL (WINAPI *pGetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX csbix; + BOOL ret; + HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "GetConsoleScreenBufferInfoEx"); + if (!pGetConsoleScreenBufferInfoEx) + { + win_skip("GetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + csbix.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -3086,4 +3135,5 @@ START_TEST(console) test_GetLargestConsoleWindowSize(hConOut); test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); + test_GetConsoleScreenBufferInfoEx(hConOut); }

1 0

Hugh McMaster : kernel32: Implement GetConsoleScreenBufferInfoEx.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2bda84a410fbb0e354316313126b24085c294fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bda84a410fbb0e3543163131… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 17 01:35:53 2016 +0000 kernel32: Implement GetConsoleScreenBufferInfoEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 35 ++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/console.c | 14 +++++++------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index cc2936d..51061de 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3356,9 +3356,38 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) { - FIXME("(%p %p): stub!\n", hConsole, csbix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ret; + + if (csbix->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(get_console_output_info) + { + req->handle = console_handle_unmap(hConsole); + wine_server_set_reply(req, csbix->ColorTable, sizeof(csbix->ColorTable)); + if ((ret = !wine_server_call_err(req))) + { + csbix->dwSize.X = reply->width; + csbix->dwSize.Y = reply->height; + csbix->dwCursorPosition.X = reply->cursor_x; + csbix->dwCursorPosition.Y = reply->cursor_y; + csbix->wAttributes = reply->attr; + csbix->srWindow.Left = reply->win_left; + csbix->srWindow.Top = reply->win_top; + csbix->srWindow.Right = reply->win_right; + csbix->srWindow.Bottom = reply->win_bottom; + csbix->dwMaximumWindowSize.X = min(reply->width, reply->max_width); + csbix->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); + csbix->wPopupAttributes = reply->popup_attr; + csbix->bFullscreenSupported = FALSE; + } + } + SERVER_END_REQ; + + return ret; } BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 826ed43..24f15d4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2957,34 +2957,34 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); csbix.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } START_TEST(console)

1 0

Alexandre Julliard : ole32/tests: Make the clipboard test more strict and remove Win9x compatibility cruft.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 295061a2804f95c7517d6538f3b0704b21a1b91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=295061a2804f95c7517d6538f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 14:26:59 2016 +0900 ole32/tests: Make the clipboard test more strict and remove Win9x compatibility cruft. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 64 +++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1a8301e..004b807 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -612,9 +612,7 @@ static void test_enum_fmtetc(IDataObject *src) if(src) { hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); - ok(hr == S_FALSE || - broken(hr == S_OK && count == 5), /* win9x and winme don't enumerate duplicated cf's */ - "%d: got %08x\n", count, hr); + ok(hr == S_FALSE, "%d: got %08x\n", count, hr); IEnumFORMATETC_Release(src_enum); } @@ -795,8 +793,7 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 1, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_stm_data) || - broken(size > strlen(cmpl_stm_data)), /* win9x, winme */ + ok(size == strlen(cmpl_stm_data), "expected %d got %d\n", lstrlenA(cmpl_stm_data), size); ok(!memcmp(ptr, cmpl_stm_data, strlen(cmpl_stm_data)), "mismatch\n"); GlobalUnlock(h); @@ -812,8 +809,7 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 0, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_text_data) + 1 || - broken(size > strlen(cmpl_text_data) + 1), /* win9x, winme */ + ok(size == strlen(cmpl_text_data) + 1, "expected %d got %d\n", lstrlenA(cmpl_text_data) + 1, size); ok(!memcmp(ptr, cmpl_text_data, strlen(cmpl_text_data) + 1), "mismatch\n"); GlobalUnlock(h); @@ -830,6 +826,7 @@ static void test_set_clipboard(void) ULONG ref; LPDATAOBJECT data1, data2, data_cmpl; HGLOBAL hblob, h; + void *ptr; cf_stream = RegisterClipboardFormatA("stream format"); cf_storage = RegisterClipboardFormatA("storage format"); @@ -855,10 +852,7 @@ static void test_set_clipboard(void) CoInitialize(NULL); hr = OleSetClipboard(data1); - ok(hr == CO_E_NOTINITIALIZED || - hr == CLIPBRD_E_CANT_SET, /* win9x */ - "OleSetClipboard should have failed with " - "CO_E_NOTINITIALIZED or CLIPBRD_E_CANT_SET instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard failed with 0x%08x\n", hr); CoUninitialize(); hr = OleInitialize(NULL); @@ -890,14 +884,18 @@ static void test_set_clipboard(void) /* put a format directly onto the clipboard to show OleFlushClipboard doesn't empty the clipboard */ hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); - OpenClipboard(NULL); + ptr = GlobalLock( hblob ); + ok( ptr && ptr != hblob, "got fixed block %p / %p\n", ptr, hblob ); + GlobalUnlock( hblob ); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = SetClipboardData(cf_onemore, hblob); ok(h == hblob, "got %p\n", h); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p / %p\n", h, hblob); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); hr = OleFlushClipboard(); ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); @@ -909,12 +907,13 @@ static void test_set_clipboard(void) ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); /* format should survive the flush */ - OpenClipboard(NULL); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p\n", h); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); test_cf_dataobject(NULL); @@ -981,9 +980,7 @@ static void test_consumer_refs(void) hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); - ok(get1 == get2 || - broken(get1 != get2), /* win9x, winme & nt4 */ - "data objects differ\n"); + ok(get1 == get2, "data objects differ\n"); refs = IDataObject_Release(get2); ok(refs == (get1 == get2 ? 1 : 0), "got %d\n", refs); @@ -1359,19 +1356,14 @@ static void test_nonole_clipboard(void) hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(fmt.cfFormat == CF_UNICODETEXT || - broken(fmt.cfFormat == CF_METAFILEPICT), /* win9x and winme don't have CF_UNICODETEXT */ - "cf %04x\n", fmt.cfFormat); - if(fmt.cfFormat == CF_UNICODETEXT) - { - ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); - ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); - ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); - ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); - hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); - ok(hr == S_OK, "got %08x\n", hr); - } + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);

1 0

Alexandre Julliard : user32/tests: Add tests for clipboard global memory handles.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 0a1f9bec6d2d7e895bbc68bb7327f776df53afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1f9bec6d2d7e895bbc68bb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:55:16 2016 +0900 user32/tests: Add tests for clipboard global memory handles. The GMEM_FIXED tests are based on a patch by Rafał Harabień. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index be6c9bf..625d550 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -682,6 +682,132 @@ static void test_messages(void) DeleteCriticalSection(&clipboard_cs); } +static BOOL is_moveable( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr != handle; +} + +static BOOL is_fixed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr == handle; +} + +static BOOL is_freed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return !ptr; +} + +static UINT format_id; + +static void test_handles( HWND hwnd ) +{ + HGLOBAL h, htext, htext2; + BOOL r; + HANDLE data; + DWORD process; + BOOL is_owner = (GetWindowThreadProcessId( hwnd, &process ) && process == GetCurrentProcessId()); + + trace( "hwnd %p\n", hwnd ); + htext = create_text(); + htext2 = create_text(); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + h = SetClipboardData( CF_TEXT, htext ); + ok( h == htext, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, htext2 ); + ok( h == htext2, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* data handles are still valid */ + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + + /* and now they are freed, unless we are the owner */ + if (!is_owner) + { + todo_wine ok( is_freed( htext ), "expected freed mem %p\n", htext ); + todo_wine ok( is_freed( htext2 ), "expected freed mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_OEMTEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_UNICODETEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( format_id ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + } + else + { + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + } + + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* w2003, w2008 don't seem to free the data here */ + ok( is_freed( htext ) || broken( !is_freed( htext )), "expected freed mem %p\n", htext ); + ok( is_freed( htext2 ) || broken( !is_freed( htext2 )), "expected freed mem %p\n", htext ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + +static DWORD WINAPI test_handles_thread( void *arg ) +{ + trace( "running from different thread\n" ); + test_handles( (HWND)arg ); + return 0; +} + +static void test_data_handles(void) +{ + HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + ok( hwnd != 0, "window creation failed\n" ); + test_handles( 0 ); + test_handles( GetDesktopWindow() ); + test_handles( hwnd ); + run_thread( test_handles_thread, hwnd, __LINE__ ); + DestroyWindow( hwnd ); +} + START_TEST(clipboard) { HMODULE mod = GetModuleHandleA( "user32" ); @@ -693,4 +819,5 @@ START_TEST(clipboard) test_ClipboardOwner(); test_synthesized(); test_messages(); + test_data_handles(); }

1 0

Alexandre Julliard : winex11: Don' t crash when getting an invalid window in SelectionRequest.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 6da991c75bb4140e0922a76b5db0de3637e3f52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da991c75bb4140e0922a76b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 17:23:31 2016 +0900 winex11: Don't crash when getting an invalid window in SelectionRequest. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 5dc5e3c..9b6c749 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2298,6 +2298,11 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) return (event->error_code == BadAtom); } +static int is_window_error( Display *display, XErrorEvent *event, void *arg ) +{ + return (event->error_code == BadWindow); +} + /************************************************************************** * X11DRV_CLIPBOARD_InsertSelectionProperties * @@ -3439,6 +3444,8 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev TRACE("\n"); + X11DRV_expect_error( display, is_window_error, NULL ); + /* * We can only handle the selection request if : * The selection is PRIMARY or CLIPBOARD, AND we can successfully open the clipboard. @@ -3527,6 +3534,8 @@ END: TRACE("Sending SelectionNotify event...\n"); XSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result); } + XSync( display, False ); + if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor ); }

1 0