September 2021 - Wine-devel

[PATCH 1/5] dinput8/tests: Read the HID report descriptor from the registry.
by Rémi Bernon 10 Sep '21

10 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/driver_hid.c | 268 ++------------------------------ dlls/dinput8/tests/hid.c | 250 +++++++++++++++++++++++++++++ 2 files changed, 265 insertions(+), 253 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 1fc52999c84..6bd5611c86c 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -39,6 +39,8 @@ static UNICODE_STRING control_symlink; static unsigned int got_start_device; +static char report_descriptor_buf[4096]; +static DWORD report_descriptor_len; static DWORD report_id; static DWORD polled; @@ -159,253 +161,6 @@ static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) { -#include "psh_hid_macros.h" -/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ -#define REPORT_ID_OR_USAGE_PAGE(size, id, off) SHORT_ITEM_1((id ? 8 : 0), 1, (id + off)) - const unsigned char report_descriptor[] = - { - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Application), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Logical), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_X), - USAGE(1, HID_USAGE_GENERIC_Y), - LOGICAL_MINIMUM(1, -128), - LOGICAL_MAXIMUM(1, 127), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 1), - USAGE_MAXIMUM(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_MINIMUM(1, 0x18), - USAGE_MAXIMUM(1, 0x1f), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Cnst|Var|Abs), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Cnst|Var|Abs), - /* needs to be 8 bit aligned as next has Buff */ - - USAGE_MINIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8), - USAGE_MAXIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0xf), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 8), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 8), - INPUT(2, Data|Ary|Rel|Wrap|Lin|Pref|Null|Vol|Buff), - - /* needs to be 8 bit aligned as previous has Buff */ - USAGE(1, 0x20), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - USAGE_MINIMUM(1, 0x21), - USAGE_MAXIMUM(1, 0x22), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 0), - INPUT(1, Data|Var|Abs), - USAGE(1, 0x23), - REPORT_COUNT(1, 0), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_HATSWITCH), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 4), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_Z), - LOGICAL_MINIMUM(4, 0x00000000), - LOGICAL_MAXIMUM(4, 0x3fffffff), - PHYSICAL_MINIMUM(4, 0x80000000), - PHYSICAL_MAXIMUM(4, 0x7fffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - - /* reset physical range to its default interpretation */ - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_RX), - PHYSICAL_MINIMUM(4, 0), - PHYSICAL_MAXIMUM(4, 0), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_RY), - LOGICAL_MINIMUM(4, 0x7fff), - LOGICAL_MAXIMUM(4, 0x0000), - PHYSICAL_MINIMUM(4, 0x0000), - PHYSICAL_MAXIMUM(4, 0x7fff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - INPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 9), - USAGE_MAXIMUM(1, 10), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_GREEN), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, 1), - USAGE(1, 2), - USAGE(1, 3), - USAGE(1, 4), - USAGE(1, 5), - USAGE(1, 6), - USAGE(1, 7), - USAGE(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), - USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 16), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 8), - INPUT(1, Data|Ary|Abs), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), - COLLECTION(1, Logical), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), - COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ - USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ - LOGICAL_MINIMUM(2, 0x0000), - LOGICAL_MAXIMUM(2, 0xffff), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), - COLLECTION(1, NamedArray), - USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), - USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ - USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ - LOGICAL_MINIMUM(2, 0x0000), - LOGICAL_MAXIMUM(2, 0xffff), - REPORT_COUNT(1, 2), - REPORT_SIZE(1, 16), - FEATURE(1, Data|Var|Abs|Null), - END_COLLECTION, - - USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), - USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), - UNIT(2, 0x1001), /* seconds */ - UNIT_EXPONENT(1, -3), /* 10^-3 */ - LOGICAL_MINIMUM(2, 0x8000), - LOGICAL_MAXIMUM(2, 0x7fff), - PHYSICAL_MINIMUM(4, 0x00000000), - PHYSICAL_MAXIMUM(4, 0xffffffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 2), - FEATURE(1, Data|Var|Abs), - /* reset global items */ - UNIT(1, 0), /* None */ - UNIT_EXPONENT(1, 0), - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_Z), - LOGICAL_MINIMUM(4, 0x0000), - LOGICAL_MAXIMUM(4, 0x7fff), - PHYSICAL_MINIMUM(4, 0xfff90000), - PHYSICAL_MAXIMUM(4, 0x0003ffff), - REPORT_SIZE(1, 32), - REPORT_COUNT(1, 1), - FEATURE(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 9), - USAGE_MAXIMUM(1, 10), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - FEATURE(1, Data|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_GREEN), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - OUTPUT(1, Cnst|Var|Abs), - END_COLLECTION, - - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - USAGE(1, HID_USAGE_LED_RED), - COLLECTION(1, Report), - REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), - USAGE_PAGE(1, HID_USAGE_PAGE_LED), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - OUTPUT(1, Cnst|Var|Abs), - END_COLLECTION, - END_COLLECTION, - }; -#undef REPORT_ID_OR_USAGE_PAGE -#include "pop_hid_macros.h" - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; @@ -453,7 +208,7 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) desc->bCountry = 0; desc->bNumDescriptors = 1; desc->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; - desc->DescriptorList[0].wReportLength = sizeof(report_descriptor); + desc->DescriptorList[0].wReportLength = report_descriptor_len; irp->IoStatus.Information = sizeof(*desc); } ret = STATUS_SUCCESS; @@ -462,12 +217,12 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_REPORT_DESCRIPTOR: ok( !in_size, "got input size %u\n", in_size ); - ok( out_size == sizeof(report_descriptor), "got output size %u\n", out_size ); + ok( out_size == report_descriptor_len, "got output size %u\n", out_size ); - if (out_size == sizeof(report_descriptor)) + if (out_size == report_descriptor_len) { - memcpy( irp->UserBuffer, report_descriptor, sizeof(report_descriptor) ); - irp->IoStatus.Information = sizeof(report_descriptor); + memcpy( irp->UserBuffer, report_descriptor_buf, report_descriptor_len ); + irp->IoStatus.Information = report_descriptor_len; } ret = STATUS_SUCCESS; break; @@ -677,7 +432,7 @@ static void WINAPI driver_unload( DRIVER_OBJECT *driver ) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) { static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); - char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(DWORD)]; + char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(report_descriptor_buf)]; HID_MINIDRIVER_REGISTRATION params = { .Revision = HID_REVISION, @@ -710,6 +465,13 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *registry ) memcpy( &polled, buffer + info_size, size - info_size ); params.DevicesArePolled = polled; + RtlInitUnicodeString( &name_str, L"Descriptor" ); + size = info_size + sizeof(report_descriptor_buf); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( report_descriptor_buf, buffer + info_size, size - info_size ); + report_descriptor_len = size - info_size; + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index d89974a14ab..ec2575aa9c1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2054,6 +2054,253 @@ static void test_hid_device( DWORD report_id, DWORD polled ) static void test_hid_driver( DWORD report_id, DWORD polled ) { +#include "psh_hid_macros.h" +/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ +#define REPORT_ID_OR_USAGE_PAGE(size, id, off) SHORT_ITEM_1((id ? 8 : 0), 1, (id + off)) + const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, -128), + LOGICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_MINIMUM(1, 0x18), + USAGE_MAXIMUM(1, 0x1f), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Var|Abs), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Var|Abs), + /* needs to be 8 bit aligned as next has Buff */ + + USAGE_MINIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8), + USAGE_MAXIMUM(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0xf), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 8), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(2, Data|Ary|Rel|Wrap|Lin|Pref|Null|Vol|Buff), + + /* needs to be 8 bit aligned as previous has Buff */ + USAGE(1, 0x20), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + USAGE_MINIMUM(1, 0x21), + USAGE_MAXIMUM(1, 0x22), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 0), + INPUT(1, Data|Var|Abs), + USAGE(1, 0x23), + REPORT_COUNT(1, 0), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x3fffffff), + PHYSICAL_MINIMUM(4, 0x80000000), + PHYSICAL_MAXIMUM(4, 0x7fffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + /* reset physical range to its default interpretation */ + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_RX), + PHYSICAL_MINIMUM(4, 0), + PHYSICAL_MAXIMUM(4, 0), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_RY), + LOGICAL_MINIMUM(4, 0x7fff), + LOGICAL_MAXIMUM(4, 0x0000), + PHYSICAL_MINIMUM(4, 0x0000), + PHYSICAL_MAXIMUM(4, 0x7fff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 9), + USAGE_MAXIMUM(1, 10), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_GREEN), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, 1), + USAGE(1, 2), + USAGE(1, 3), + USAGE(1, 4), + USAGE(1, 5), + USAGE(1, 6), + USAGE(1, 7), + USAGE(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8c), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8d), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8e), + USAGE(4, (HID_USAGE_PAGE_KEYBOARD<<16)|0x8f), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 16), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 8), + INPUT(1, Data|Ary|Abs), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), + COLLECTION(1, NamedArray), + USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), + USAGE(1, 3), /* HID_USAGE_HAPTICS_WAVEFORM_RUMBLE */ + USAGE(1, 4), /* HID_USAGE_HAPTICS_WAVEFORM_BUZZ */ + LOGICAL_MINIMUM(2, 0x0000), + LOGICAL_MAXIMUM(2, 0xffff), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 16), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), + COLLECTION(1, NamedArray), + USAGE_PAGE(1, HID_USAGE_PAGE_ORDINAL), + USAGE(1, 3), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_RUMBLE) */ + USAGE(1, 4), /* 0 (HID_USAGE_HAPTICS_WAVEFORM_BUZZ) */ + LOGICAL_MINIMUM(2, 0x0000), + LOGICAL_MAXIMUM(2, 0xffff), + REPORT_COUNT(1, 2), + REPORT_SIZE(1, 16), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), + UNIT(2, 0x1001), /* seconds */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(2, 0x8000), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(4, 0x00000000), + PHYSICAL_MAXIMUM(4, 0xffffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 2), + FEATURE(1, Data|Var|Abs), + /* reset global items */ + UNIT(1, 0), /* None */ + UNIT_EXPONENT(1, 0), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(4, 0x0000), + LOGICAL_MAXIMUM(4, 0x7fff), + PHYSICAL_MINIMUM(4, 0xfff90000), + PHYSICAL_MAXIMUM(4, 0x0003ffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 9), + USAGE_MAXIMUM(1, 10), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_GREEN), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 0), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + USAGE(1, HID_USAGE_LED_RED), + COLLECTION(1, Report), + REPORT_ID_OR_USAGE_PAGE(1, report_id, 1), + USAGE_PAGE(1, HID_USAGE_PAGE_LED), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + OUTPUT(1, Cnst|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE +#include "pop_hid_macros.h" + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; LSTATUS status; HKEY hkey; @@ -2072,6 +2319,9 @@ static void test_hid_driver( DWORD report_id, DWORD polled ) status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); ok( !status, "RegSetValueExW returned %#x\n", status ); + status = RegSetValueExW( hkey, L"Descriptor", 0, REG_BINARY, (void *)report_desc, sizeof(report_desc) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled ); pnp_driver_stop(); -- 2.33.0

2 7

[PATCH 00/10] Second step for Dwarf3/4 support in dbghelp
by Eric Pouech 10 Sep '21

10 Sep '21

One major change of Dwarf3/4 over Dwarf2 is that the size of some attributes (like addresses among others) is parametrized at the level of a compilation unit. Current dbghelp code stores such CU header parameters at the module's level (assuming it's the same across all CU:s of a module). This serie: - mainly changes the internal data model by attaching those parameters at the CU level (except for .eh_frame section) - it also allows to enable loading of dwarf3/4 debug info if the DBGHELP_DWARF_VERSION environment variable is set to 3 or 4. I don't recommend at this stage using this variable; it's better to delay until next serie (which shall cover the rest of the syntaxic changes in dwarf format; more series afterwards will cover more semantic changes and extensions). A+ --- Eric Pouech (10): dbghelp{dwarf}: Allow tweaking from env variable which DWARF version is to be loaded. dbghelp{dwarf}: introdicting dwarf2_cuhead_s a structure to hold compilation unit parsing info dbghelp{dwarf}: share compilation unit header information dbghelp{dwarf}: add word size parameter to parse_addr() internal function dbghelp{dwarf}: now pass dwarf2_cuhead_t for addr details to swallow_attribute dbghelp{dwarf}: now passing a parse_cuhead_t to compute_location() dbghelp{dwarf}: passing word_size as a parameter to a couple of frame related functions dbghelp{dwarf}: now using word_size from cuhead_t dbghelp{dwarf}: passing dwarf2_cuhead_t to lookuploclist() dbghelp{dwarf}: initialize module's word_size at module load time dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 167 ++++++++++++++++++++------------- dlls/dbghelp/symbol.c | 1 + 3 files changed, 103 insertions(+), 66 deletions(-)

2 12

[PATCH 1/2] ole32: Remove unused CoGetCallerTID() stub.
by Nikolay Sivov 10 Sep '21

10 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/ole2stubs.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 49130c51584..74b4e864403 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -81,12 +81,3 @@ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCallerTID [OLE32.@] - */ -HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) -{ - FIXME("stub!\n"); - return E_NOTIMPL; -} -- 2.33.0

2 3

[PATCH] uiautomationcore: Add UiaDisconnectProvider stub
by Alex Henrie 10 Sep '21

10 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51729 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/uiautomationcore/uia_main.c | 6 ++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 42014af6035..2dada95af80 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -89,3 +89,9 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) +{ + FIXME("(%p): stub\n", provider); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index c9b96ab39ef..656641c4bad 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -56,7 +56,7 @@ @ stub UiaAddEvent @ stdcall UiaClientsAreListening() #@ stub UiaDisconnectAllProviders -#@ stub UiaDisconnectProvider +@ stdcall UiaDisconnectProvider(ptr) @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind -- 2.33.0

1 0

[PATCH 1/2] winexinput.sys: Look for caps in the lower HID report descriptor.
by Rémi Bernon 10 Sep '21

10 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Fixed a leak when HidP_GetButtonCaps / HidP_GetValueCaps failed, split the patches from the other. dlls/winexinput.sys/main.c | 69 ++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..dfe747d6515 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -82,6 +82,14 @@ struct func_device WCHAR instance_id[MAX_DEVICE_ID_LEN]; + HIDP_VALUE_CAPS lx_caps; + HIDP_VALUE_CAPS ly_caps; + HIDP_VALUE_CAPS lt_caps; + HIDP_VALUE_CAPS rx_caps; + HIDP_VALUE_CAPS ry_caps; + HIDP_VALUE_CAPS rt_caps; + HIDP_DEVICE_DESC device_desc; + /* everything below requires holding the cs */ CRITICAL_SECTION cs; ULONG report_len; @@ -442,13 +450,27 @@ static NTSTATUS sync_ioctl(DEVICE_OBJECT *device, DWORD code, void *in_buf, DWOR return io.Status; } +static void check_value_caps(struct func_device *fdo, USHORT usage, HIDP_VALUE_CAPS *caps) +{ + switch (usage) + { + case HID_USAGE_GENERIC_X: fdo->lx_caps = *caps; break; + case HID_USAGE_GENERIC_Y: fdo->ly_caps = *caps; break; + case HID_USAGE_GENERIC_Z: fdo->lt_caps = *caps; break; + case HID_USAGE_GENERIC_RX: fdo->rx_caps = *caps; break; + case HID_USAGE_GENERIC_RY: fdo->ry_caps = *caps; break; + case HID_USAGE_GENERIC_RZ: fdo->rt_caps = *caps; break; + } +} + static NTSTATUS initialize_device(DEVICE_OBJECT *device) { struct func_device *fdo = fdo_from_DEVICE_OBJECT(device); - ULONG i, report_desc_len, report_count; + ULONG i, u, button_count, report_desc_len, report_count; PHIDP_REPORT_DESCRIPTOR report_desc; PHIDP_PREPARSED_DATA preparsed; - HIDP_DEVICE_DESC device_desc; + HIDP_BUTTON_CAPS *button_caps; + HIDP_VALUE_CAPS *value_caps; HIDP_REPORT_IDS *reports; HID_DESCRIPTOR hid_desc; NTSTATUS status; @@ -461,16 +483,49 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(report_desc = malloc(report_desc_len))) return STATUS_NO_MEMORY; status = sync_ioctl(fdo->bus_device, IOCTL_HID_GET_REPORT_DESCRIPTOR, NULL, 0, report_desc, report_desc_len); - if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &device_desc); + if (!status) status = HidP_GetCollectionDescription(report_desc, report_desc_len, PagedPool, &fdo->device_desc); free(report_desc); if (status != HIDP_STATUS_SUCCESS) return status; - preparsed = device_desc.CollectionDesc->PreparsedData; + preparsed = fdo->device_desc.CollectionDesc->PreparsedData; status = HidP_GetCaps(preparsed, &caps); if (status != HIDP_STATUS_SUCCESS) return status; - reports = device_desc.ReportIDs; - report_count = device_desc.ReportIDsLength; + button_count = 0; + if (!(button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps))) return STATUS_NO_MEMORY; + status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputButtonCaps; i++) + { + if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue; + if (button_caps[i].IsRange) button_count = max(button_count, button_caps[i].Range.UsageMax); + else button_count = max(button_count, button_caps[i].NotRange.Usage); + } + free(button_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (button_count < 10) WARN("only %u buttons found\n", button_count); + + if (!(value_caps = malloc(sizeof(*value_caps) * caps.NumberInputValueCaps))) return STATUS_NO_MEMORY; + status = HidP_GetValueCaps(HidP_Input, value_caps, &caps.NumberInputValueCaps, preparsed); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetValueCaps returned %#x\n", status); + else for (i = 0; i < caps.NumberInputValueCaps; i++) + { + HIDP_VALUE_CAPS *caps = value_caps + i; + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) continue; + if (!caps->IsRange) check_value_caps(fdo, caps->NotRange.Usage, caps); + else for (u = caps->Range.UsageMin; u <=caps->Range.UsageMax; u++) check_value_caps(fdo, u, value_caps + i); + } + free(value_caps); + if (status != HIDP_STATUS_SUCCESS) return status; + if (!fdo->lx_caps.UsagePage) WARN("missing lx axis\n"); + if (!fdo->ly_caps.UsagePage) WARN("missing ly axis\n"); + if (!fdo->lt_caps.UsagePage) WARN("missing lt axis\n"); + if (!fdo->rx_caps.UsagePage) WARN("missing rx axis\n"); + if (!fdo->ry_caps.UsagePage) WARN("missing ry axis\n"); + if (!fdo->rt_caps.UsagePage) WARN("missing rt axis\n"); + + reports = fdo->device_desc.ReportIDs; + report_count = fdo->device_desc.ReportIDsLength; for (i = 0; i < report_count; ++i) if (!reports[i].ReportID || reports[i].InputLength) break; if (i == report_count) i = 0; /* no input report?!, just use first ID */ @@ -478,7 +533,6 @@ static NTSTATUS initialize_device(DEVICE_OBJECT *device) if (!(fdo->report_buf = malloc(fdo->report_len))) return STATUS_NO_MEMORY; fdo->report_buf[0] = reports[i].ReportID; - HidP_FreeCollectionDescription(&device_desc); return STATUS_SUCCESS; } @@ -556,6 +610,7 @@ static NTSTATUS WINAPI fdo_pnp(DEVICE_OBJECT *device, IRP *irp) status = IoCallDriver(fdo->bus_device, irp); IoDetachDevice(fdo->bus_device); RtlDeleteCriticalSection(&fdo->cs); + HidP_FreeCollectionDescription(&fdo->device_desc); free(fdo->report_buf); IoDeleteDevice(device); return status; -- 2.33.0

1 1

[PATCH] ntdll: resolve drive symlink for mapped filename
by Matias Zuniga 10 Sep '21

10 Sep '21

Applications expect a path starting with a drive like '\Device\Harddisk1\' instead of a drive letter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51687 Signed-off-by: Matias Zuniga <matias.nicolas.zc(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 76 ++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 5 +-- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a1e35b6387..04eddf0e6f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -133,6 +133,8 @@ struct file_view } \ } while (0); +#define SYMBOLIC_LINK_QUERY 0x0001 + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -4273,34 +4275,96 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS read_nt_symlink( UNICODE_STRING *name, WCHAR *target, DWORD size ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, SYMBOLIC_LINK_QUERY, &attr ))) + { + UNICODE_STRING targetW; + targetW.Buffer = target; + targetW.MaximumLength = (size - 1) * sizeof(WCHAR); + status = NtQuerySymbolicLinkObject( handle, &targetW, NULL ); + if (!status) target[targetW.Length / sizeof(WCHAR)] = 0; + NtClose( handle ); + } + return status; +} + +static NTSTATUS follow_device_symlink( WCHAR *buffer, SIZE_T max_path_len, WCHAR *name, SIZE_T *current_path_len ) +{ + WCHAR *p = buffer; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T devname_len = 6; // e.g. \??\C: + UNICODE_STRING devname; + DWORD target_len; + + if (*current_path_len >= devname_len * sizeof(WCHAR) && name[devname_len - 1] == ':') { + devname.Buffer = name; + devname.Length = devname_len * sizeof(WCHAR); + if (!(status = read_nt_symlink( &devname, p, (max_path_len - *current_path_len) / sizeof(WCHAR) + devname_len + 1 ))) + { + target_len = lstrlenW(p); + *current_path_len -= devname_len * sizeof(WCHAR); // skip the device name + p += target_len; + + memcpy( p, name + devname_len, *current_path_len ); + *current_path_len += target_len * sizeof(WCHAR); + } + } + else memcpy( p, name, *current_path_len ); + + return status; +} + static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, MEMORY_SECTION_NAME *info, SIZE_T len, SIZE_T *ret_len ) { + SIZE_T current_path_len, max_path_len; + WCHAR *name; NTSTATUS status; if (!info) return STATUS_ACCESS_VIOLATION; + max_path_len = len - sizeof(*info) - sizeof(WCHAR); // dont count null char + if (!(name = malloc( max_path_len ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_mapping_filename ) { req->process = wine_server_obj_handle( process ); req->addr = wine_server_client_ptr( addr ); if (len > sizeof(*info) + sizeof(WCHAR)) - wine_server_set_reply( req, info + 1, len - sizeof(*info) - sizeof(WCHAR) ); + wine_server_set_reply( req, name, max_path_len ); status = wine_server_call( req ); if (!status || status == STATUS_BUFFER_OVERFLOW) { - if (ret_len) *ret_len = sizeof(*info) + reply->len + sizeof(WCHAR); - if (len < sizeof(*info)) status = STATUS_INFO_LENGTH_MISMATCH; + current_path_len = reply->len; + if (len < sizeof(*info)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!status) status = follow_device_symlink( (WCHAR *)(info + 1), max_path_len, name, &current_path_len); + + if (ret_len) *ret_len = sizeof(*info) + current_path_len + sizeof(WCHAR); if (!status) { info->SectionFileName.Buffer = (WCHAR *)(info + 1); - info->SectionFileName.Length = reply->len; - info->SectionFileName.MaximumLength = reply->len + sizeof(WCHAR); - info->SectionFileName.Buffer[reply->len / sizeof(WCHAR)] = 0; + info->SectionFileName.Length = current_path_len; + info->SectionFileName.MaximumLength = current_path_len + sizeof(WCHAR); + info->SectionFileName.Buffer[current_path_len / sizeof(WCHAR)] = 0; } } } SERVER_END_REQ; + free(name); return status; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..d6fb8e69384 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -471,7 +471,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -482,7 +481,6 @@ static void test_GetMappedFileName(void) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } @@ -490,7 +488,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -566,7 +563,7 @@ static void test_GetProcessImageFileName(void) { /* Windows returns 2*strlen-1 */ ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef); -- 2.31.1

2 1

[PATCH] winemac.drv: Allow cycling of windows with Cmd+`.
by Tim Clem 09 Sep '21

09 Sep '21

We already set up the Window menu and set the relevant bits in collectionBehavior, but windows must respond YES to -canBecomeKeyWindow in order to actually be activated by Cmd+` window cycling. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- I tested to make sure this doesn't change keyboard events, and it doesn't. Cocoa consumes Cmd+` early, so Windows apps already weren't getting any keypresses related to it. All other window focus behavior is unchanged by this patch, since the disabled and noActivate checks remain in place and take priority. dlls/winemac.drv/cocoa_window.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0926756c875..80cb2693409 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2358,7 +2358,11 @@ - (BOOL) canBecomeKeyWindow { if (causing_becomeKeyWindow == self) return YES; if (self.disabled || self.noActivate) return NO; - return [self isKeyWindow]; + if ([self isKeyWindow]) return YES; + + // If a window's collectionBehavior says it participates in cycling, + // it must return YES from this method to actually be eligible. + return ![self isExcludedFromWindowsMenu]; } - (BOOL) canBecomeMainWindow -- 2.32.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 09 Sep '21

09 Sep '21

2 1

[PATCH] po: Update Dutch translation.
by Floris Renaud 09 Sep '21

09 Sep '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 464 +++++++++++++++++++++++-------------------------------- 1 file changed, 190 insertions(+), 274 deletions(-) diff --git a/po/nl.po b/po/nl.po index ce47892aba7..d803bb95b4a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-06-04 19:40+0200\n" +"PO-Revision-Date: 2021-09-11 20:20+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10339,7 +10339,7 @@ msgstr "China Zomertijd" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+8:00) Peking, Tsjoengking, Hongkong, Urumqi" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10351,7 +10351,7 @@ msgstr "Noord-Azië Zomertijd" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Krasnojarsk" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10363,17 +10363,15 @@ msgstr "Georgië Zomertijd" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "UTC" +msgstr "(UTC+12:00 Gecoördineerde Wereldtijd+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10385,7 +10383,7 @@ msgstr "Nepal Zomertijd" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Kathmandu" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10397,7 +10395,7 @@ msgstr "Kaapverdië Zomertijd" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) Kaapverdië" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10409,7 +10407,7 @@ msgstr "Haïti Zomertijd" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haïti" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10421,7 +10419,7 @@ msgstr "Midden-Europese Zomertijd" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10433,33 +10431,27 @@ msgstr "Marokko Zomertijd" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "UTC" +msgstr "(UTC-08:00) Gecoördineerde Wereldtijd-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Atlantische Standaard Tijd" +msgstr "Altaj Standaard Tijd" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Atlantische tijd Zomertijd" +msgstr "Altaj Zomertijd" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00 Barnaoel, Gorno-Altajsk" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10471,7 +10463,7 @@ msgstr "Centraal Europa Zomertijd" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgrado, Bratislava, Boedapest, Ljubljana, Praag" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10483,7 +10475,7 @@ msgstr "Iran Zomertijd" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10494,26 +10486,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierre Zomertijd" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Saint-Pierre Standaard Tijd" +msgstr "(UTC-03:00) Saint-Pierre en Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Samoa Standaard Tijd" +msgstr "Sao Tomé Standaard Tijd" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Samoa Zomertijd" +msgstr "Sao Tomé Zomertijd" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) Sao Tomé" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10525,7 +10511,7 @@ msgstr "Namibië Zomertijd" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:366 msgid "Tonga Standard Time" @@ -10537,7 +10523,7 @@ msgstr "Tonga Zomertijd" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10549,7 +10535,7 @@ msgstr "Mountain Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10561,7 +10547,7 @@ msgstr "GMT Zomertijd" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Londen" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10573,7 +10559,7 @@ msgstr "Centraal Azië Zomertijd" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10585,7 +10571,7 @@ msgstr "Lord Howe Zomertijd" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) Lord Howe-eiland" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10597,17 +10583,15 @@ msgstr "Arabisch Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "UTC" +msgstr "(UTC+13:00) Gecoördineerde Wereldtijd+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10619,7 +10603,7 @@ msgstr "Magadan Zomertijd" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10631,23 +10615,19 @@ msgstr "Newfoundland Zomertijd" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:345 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Jordanië Standaard Tijd" +msgstr "Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:346 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Jordanië Zomertijd" +msgstr "Soedan Zomertijd" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Khartoem" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" @@ -10659,7 +10639,7 @@ msgstr "West Pacific Zomertijd" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10671,7 +10651,7 @@ msgstr "Pacific Zomertijd" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) Pacific Time (VS & Canada)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10683,7 +10663,7 @@ msgstr "Azerbeidzjan Zomertijd" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Bakoe" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10695,7 +10675,7 @@ msgstr "Magallanes Zomertijd" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10707,7 +10687,7 @@ msgstr "Samoa Zomertijd" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10719,7 +10699,7 @@ msgstr "Kaliningrad Zomertijd" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10731,7 +10711,7 @@ msgstr "Pacific Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10743,7 +10723,7 @@ msgstr "Midden-Oosten Zomertijd" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Beiroet" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" @@ -10755,7 +10735,7 @@ msgstr "Tokio Zomertijd" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Sapporo, Tokio" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10767,7 +10747,7 @@ msgstr "Line-eilanden Zomertijd" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Kiritimati-eiland" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10779,7 +10759,7 @@ msgstr "Cuba Zomertijd" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10791,7 +10771,7 @@ msgstr "Jordanië Zomertijd" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10803,31 +10783,27 @@ msgstr "CST Zomertijd" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Central Time (VS & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "Rusland tijdzone 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:414 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Tonga Standaard Tijd" +msgstr "Wolgograd Standaard Tijd" #: dlls/tzres/tzres.rc:415 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Tonga Zomertijd" +msgstr "Wolgograd Zomertijd" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Wolgograd" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10839,7 +10815,7 @@ msgstr "Azoren Zomertijd" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Azoren" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10851,17 +10827,15 @@ msgstr "Noord-Oost Azië Zomertijd" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkoetsk" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "UTC" +msgstr "(UTC-11:00) Gecoördineerde Wereldtijd-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10873,23 +10847,19 @@ msgstr "Argentinië Zomertijd" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Buenos Aires (stad)" #: dlls/tzres/tzres.rc:375 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Turkije Standaard Tijd" +msgstr "Turks- en Caicoseilanden Standaard Tijd" #: dlls/tzres/tzres.rc:376 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Turkije Zomertijd" +msgstr "Turks- en Caicoseilanden Zomertijd" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks- en Caicoseilanden" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10901,7 +10871,7 @@ msgstr "Marquesas Zomertijd" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Marquesaseilanden" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10913,17 +10883,15 @@ msgstr "Myanmar Zomertijd" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" -msgstr "UTC" +msgstr "Gecoördineerde Wereldtijd" #: dlls/tzres/tzres.rc:389 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "UTC" +msgstr "(UTC) Gecoördineerde Wereldtijd" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10935,7 +10903,7 @@ msgstr "India Zomertijd" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) Madras, Calcutta, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10947,7 +10915,7 @@ msgstr "GTB Zomertijd" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Athene, Boekarest" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" @@ -10959,23 +10927,19 @@ msgstr "Turkije Zomertijd" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Istanboel" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Arabische Standaard Tijd" +msgstr "Astrachan Standaard Tijd" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Arabische Zomertijd" +msgstr "Astrachan Zomertijd" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Astrachan, Oeljanovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -10987,7 +10951,7 @@ msgstr "Fiji Zomertijd" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -10999,23 +10963,19 @@ msgstr "Centraal Canada Zomertijd" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:441 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Yakutsk Standaard Tijd" +msgstr "Yukon Standaard Tijd" #: dlls/tzres/tzres.rc:442 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Yakutsk Zomertijd" +msgstr "Yukon Zomertijd" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" @@ -11027,7 +10987,7 @@ msgstr "Taiwan Zomertijd" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Taiwan" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" @@ -11039,7 +10999,7 @@ msgstr "West-Europa Zomertijd" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Amsterdam, Berlijn, Bern, Rome, Stockholm, Wenen" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11051,7 +11011,7 @@ msgstr "Montevideo Zomertijd" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11063,23 +11023,19 @@ msgstr "Pakistan Zomertijd" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:363 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Tokio Standaard Tijd" +msgstr "Tomsk Standaard Tijd" #: dlls/tzres/tzres.rc:364 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Tokio Zomertijd" +msgstr "Tomsk Zomertijd" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11091,7 +11047,7 @@ msgstr "Kaukasus Zomertijd" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11103,7 +11059,7 @@ msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11115,7 +11071,7 @@ msgstr "Noordcentraal-Azië Zomertijd" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11127,39 +11083,31 @@ msgstr "Oostkust Zomertijd" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Oostkust (VS & Canada)" #: dlls/tzres/tzres.rc:369 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Tasmanië Standaard Tijd" +msgstr "Transbaikal Standaard Tijd" #: dlls/tzres/tzres.rc:370 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Tasmanië Zomertijd" +msgstr "Transbaikal Zomertijd" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "West-Europa Standaard Tijd" +msgstr "Oost-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "West-Europa Zomertijd" +msgstr "Oost-Europa Zomertijd" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11171,23 +11119,19 @@ msgstr "CST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Guadalajara, Mexico-Stad, Monterrey" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Samoa Standaard Tijd" +msgstr "Saratov Standaard Tijd" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Samoa Zomertijd" +msgstr "Saratov Zomertijd" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11199,7 +11143,7 @@ msgstr "Atlantische tijd Zomertijd" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Atlantische tijd (Canada)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11211,7 +11155,7 @@ msgstr "Mountain Zomertijd" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) Mountain Tijd (VS & Canada)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" @@ -11223,35 +11167,31 @@ msgstr "VS Oost Zomertijd" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Indiana (Oost)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Alaska Standaard Tijd" +msgstr "Sachalin Standaard Tijd" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Alaska Zomertijd" +msgstr "Sachalin Zomertijd" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sachalin" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" -msgstr "Noord Korea Standaard Tijd" +msgstr "Noord-Korea Standaard Tijd" #: dlls/tzres/tzres.rc:271 msgid "North Korea Daylight Time" -msgstr "Noord Korea Zomertijd" +msgstr "Noord-Korea Zomertijd" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:354 msgid "Tasmania Standard Time" @@ -11263,7 +11203,7 @@ msgstr "Tasmanië Zomertijd" #: dlls/tzres/tzres.rc:356 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11275,17 +11215,15 @@ msgstr "Centraal-Amerika Zomertijd" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Centraal-Amerika" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "UTC" +msgstr "(UTC-02:00) Gecoördineerde Wereldtijd-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" @@ -11297,7 +11235,7 @@ msgstr "VS Mountain Zomertijd" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11309,7 +11247,7 @@ msgstr "Zuid-Afrika Zomertijd" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11321,17 +11259,15 @@ msgstr "Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "UTC" +msgstr "(UTC-09:00) Gecoördineerde Wereldtijd-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" @@ -11343,7 +11279,7 @@ msgstr "Sri Lanka Zomertijd" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11355,7 +11291,7 @@ msgstr "Afghanistan Zomertijd" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" @@ -11367,7 +11303,7 @@ msgstr "Yakutsk Zomertijd" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11379,7 +11315,7 @@ msgstr "Zuid-Amerika Oost Zomertijd" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11391,7 +11327,7 @@ msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Koeweit, Riyad" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11403,7 +11339,7 @@ msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:357 msgid "Tocantins Standard Time" @@ -11415,7 +11351,7 @@ msgstr "Tocantins Zomertijd" #: dlls/tzres/tzres.rc:359 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11427,7 +11363,7 @@ msgstr "Rusland Zomertijd" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Moskou, Sint-Petersburg" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11439,7 +11375,7 @@ msgstr "W-Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11451,43 +11387,39 @@ msgstr "Rome Zomertijd" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Brussel, Kopenhagen, Madrid, Parijs" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "Ekaterinburg Standaard Tijd" +msgstr "Jekaterinenburg Standaard Tijd" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "Ekaterinburg Zomertijd" +msgstr "Jekaterinenburg Zomertijd" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Jekaterinenburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "Rusland tijdzone 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtsjatski" #: dlls/tzres/tzres.rc:432 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "West-Azië Standaard Tijd" +msgstr "Westelijke Jordaanoever Standaard Tijd" #: dlls/tzres/tzres.rc:433 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "West-Azië Zomertijd" +msgstr "Westelijke Jordaanoever Zomertijd" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" @@ -11499,7 +11431,7 @@ msgstr "Syrië Zomertijd" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11511,7 +11443,7 @@ msgstr "Centraal-Australië Zomertijd" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11523,7 +11455,7 @@ msgstr "Greenwich Zomertijd" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" @@ -11535,23 +11467,19 @@ msgstr "Ulaanbaatar Zomertijd" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Marokko Standaard Tijd" +msgstr "Norfolk Standaard Tijd" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Marokko Zomertijd" +msgstr "Norfolk Zomertijd" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Norfolk-Eiland" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11563,7 +11491,7 @@ msgstr "Israël Zomertijd" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Jeruzalem" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11575,7 +11503,7 @@ msgstr "Bangladesh Zomertijd" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11587,7 +11515,7 @@ msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" @@ -11599,7 +11527,7 @@ msgstr "West-Azië Zomertijd" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Asjchabad, Tasjkent" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11611,7 +11539,7 @@ msgstr "Alaska Zomertijd" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11623,7 +11551,7 @@ msgstr "Paraguay Zomertijd" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11635,7 +11563,7 @@ msgstr "Datumgrens Zomertijd" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) Internationale westelijke datumgrens" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11647,7 +11575,7 @@ msgstr "Libië Zomertijd" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11659,7 +11587,7 @@ msgstr "Bahia Zomertijd" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" @@ -11671,7 +11599,7 @@ msgstr "Venezuela Zomertijd" #: dlls/tzres/tzres.rc:410 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11683,7 +11611,7 @@ msgstr "Bougainville Zomertijd" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Bougainville (eiland)" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11695,7 +11623,7 @@ msgstr "Hawaï Zomertijd" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Hawaï" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11707,39 +11635,31 @@ msgstr "Zuid-Oost-Azië Zomertijd" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Jordanië Standaard Tijd" +msgstr "Qizilorda Standaard Tijd" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Jordanië Zomertijd" +msgstr "Qizilorda Zomertijd" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Qizilorda" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Tonga Standaard Tijd" +msgstr "West-Mongolië Standaard Tijd" #: dlls/tzres/tzres.rc:427 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Tonga Zomertijd" +msgstr "West-Mongolië Zomertijd" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11751,7 +11671,7 @@ msgstr "Nieuw-Zeeland Zomertijd" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11763,23 +11683,19 @@ msgstr "Aleoeten Zomertijd" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Aleoeten" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Yakutsk Standaard Tijd" +msgstr "Omsk Standaard Tijd" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Yakutsk Zomertijd" +msgstr "Omsk Zomertijd" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11791,7 +11707,7 @@ msgstr "Centraal Brazilië Zomertijd" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11803,7 +11719,7 @@ msgstr "Wit-Rusland Zomertijd" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11815,7 +11731,7 @@ msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11827,7 +11743,7 @@ msgstr "Groenland Zomertijd" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Groenland" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11839,15 +11755,15 @@ msgstr "Paaseiland Zomertijd" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Paaseiland" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "Rusland tijdzone 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Tsjokoerdach" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11859,7 +11775,7 @@ msgstr "Egypte Zomertijd" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) Caïro" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" @@ -11871,7 +11787,7 @@ msgstr "EST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11883,7 +11799,7 @@ msgstr "Mauritius Zomertijd" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" @@ -11895,7 +11811,7 @@ msgstr "Wladiwostok Zomertijd" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Wladiwostok" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11907,7 +11823,7 @@ msgstr "Singapore Zomertijd" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11919,7 +11835,7 @@ msgstr "Korea Zomertijd" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Seoel" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11931,7 +11847,7 @@ msgstr "Chathameilanden Zomertijd" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Chathameilanden" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11943,7 +11859,7 @@ msgstr "Oost-Afrika Zomertijd" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11955,7 +11871,7 @@ msgstr "Oost-Europa Zomertijd" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -11967,7 +11883,7 @@ msgstr "Oost Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -11979,7 +11895,7 @@ msgstr "Central Pacific Zomertijd" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) Salomonseilanden, Nieuw-Caledonië" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" @@ -11991,7 +11907,7 @@ msgstr "West Centraal-Afrika Zomertijd" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) West Centraal-Afrika" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12003,7 +11919,7 @@ msgstr "Pacific Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12015,7 +11931,7 @@ msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" @@ -12027,7 +11943,7 @@ msgstr "West-Australië Zomertijd" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Perth" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -14664,15 +14580,15 @@ msgstr "Proto" #: programs/netstat/netstat.rc:32 msgid "Local Address" -msgstr "Locaal adres" +msgstr "Lokaal adres" #: programs/netstat/netstat.rc:33 msgid "Foreign Address" -msgstr "Buitenlands adres" +msgstr "Extern adres" #: programs/netstat/netstat.rc:34 msgid "State" -msgstr "Staat" +msgstr "Status" #: programs/netstat/netstat.rc:35 msgid "Interface Statistics" -- 2.33.0

1 0

[v2 PATCH] wined3d: Handle null semantics in stream output description cache.
by Nikolay Sivov 09 Sep '21

09 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2147447ee0..07bd7c65ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5620,7 +5620,9 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * if ((ret = (a->stream_idx - b->stream_idx))) return ret; - if ((ret = strcmp(a->semantic_name, b->semantic_name))) + if ((ret = (!a->semantic_name - !b->semantic_name))) + return ret; + if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; if ((ret = (a->semantic_idx - b->semantic_idx))) return ret; -- 2.33.0

2 1