- wine-devel - winehq.org

[PATCH 7/7] gdi32: Factor out get_icm_profile.
by Jacek Caban 09 Sep '21

09 Sep '21

And move it to dc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I don't think there is a way to get that information directly from ntgdi. On Windows, ICM profiles are stored in registry for each display (printers seem to use a different config). There seems to be a way to match DCs with monotors and then it should be possible to use it. It does not fit well into our gdi32, so I suggest to extent ntgdi interface, at least for now. dlls/gdi32/dc.c | 17 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/icm.c | 32 ++++---------------------------- 3 files changed, 23 insertions(+), 28 deletions(-)

2 1

[PATCH 6/7] gdi32: Use GetICMProfile driver entry point for EnumICMProfilesW.
by Jacek Caban 09 Sep '21

09 Sep '21

When display ICM is not explicitly configured on Windows, GetICMProfile returns the default profile, but EnumICMProfiles does not enumerate anything. For non-default configuration, EnumICMProfiles returns configured profiles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- My main motivation is to replace EnumICMProfiles driver entry point with something more ntgdi-friendly. It's currently implemented only for X11 driver and it just enumerates a registry key. ACAICT, we never set this key, so in practice, it never enumerates anything (unless used configured it himself in registries). This patch makes it much closed to Windows, except for support for multiple profiles (which we generally don't have). dlls/gdi32/dibdrv/dc.c | 2 -- dlls/gdi32/driver.c | 8 +---- dlls/gdi32/emfdrv.c | 1 - dlls/gdi32/font.c | 1 - dlls/gdi32/icm.c | 15 ++++++---- dlls/gdi32/path.c | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/gdi.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/graphics.c | 58 ++----------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 5 ++-- 14 files changed, 15 insertions(+), 84 deletions(-)

2 1

[PATCH 5/7] gdi32: Support NULL prev_value in NtGdiGetAndSetDCDword.
by Jacek Caban 09 Sep '21

09 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

2 1

[PATCH 3/7] gdi32: Use EMR_PLGBLT to record PlgBlt.
by Jacek Caban 09 Sep '21

09 Sep '21

And use NtGdiPlgBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 23 ++++----- dlls/gdi32/emfdc.c | 103 +++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdidc.c | 16 ++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 13 deletions(-)

2 1

[PATCH 2/7] gdi32: Use EMR_MASKBLT to record MaskBlt.
by Jacek Caban 09 Sep '21

09 Sep '21

And use NtGdiMaskBlt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 29 ++++++------ dlls/gdi32/emfdc.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 17 +++++++ include/ntgdi.h | 3 ++ 5 files changed, 134 insertions(+), 14 deletions(-)

2 1

[PATCH 1/7] gdi32: Factor out get_bitmap_info.
by Jacek Caban 09 Sep '21

09 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 152 +++++++++++++++++++++++++-------------------- 1 file changed, 84 insertions(+), 68 deletions(-)

2 1

[PATCH v2 4/7] gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs.
by Jacek Caban 09 Sep '21

09 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Don't create the actual file (debugging leftover). dlls/gdi32/tests/metafile.c | 188 ++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)

2 1

[PATCH] dbghelp: Get rid of useless while loop.
by Akihiro Sagawa 09 Sep '21

09 Sep '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 09 Sep '21

09 Sep '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 428 +++++++++++++++++++------------------------------------ 1 file changed, 144 insertions(+), 284 deletions(-)

1 0

[PATCH 4/7] gdi32/test: Add tests for recording MaskBlt and PlgBlt in EMFs.
by Jacek Caban 09 Sep '21

09 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 188 ++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)

1 0

[PATCH v2] msxml3: Fix crash with property xmlns without prefix.
by Bernhard Übelacker 09 Sep '21

09 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50475 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- Changes since v1: - Move test into existing function test_namespaces_as_attributes. --- dlls/msxml3/element.c | 5 ++++- dlls/msxml3/tests/domdoc.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1a523798328..c11d28b066c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1832,7 +1832,10 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (!xmlns) return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + if (ns->prefix) + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + else + curr = xmlNewProp(NULL, xmlns->prefix, ns->href); if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 063f9433a77..361f8341ca3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13403,6 +13403,15 @@ static void test_namespaces_as_attributes(void) { "" }, /* namespaceURI */ { "nshref" }, /* text */ }, + /* xmlns without prefix */ + { + "<a xmlns=\"nshref\" />", 1, + { "xmlns" }, /* nodeName */ + { NULL }, /* prefix */ + { "xmlns" }, /* baseName */ + { NULL }, /* namespaceURI */ + { "nshref" }, /* text */ + }, /* no properties or namespaces */ { "<a />", 0, @@ -13439,6 +13448,18 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); ok(SUCCEEDED(hr), "Failed to select a node, hr %#x.\n", hr); + if (!node) + { + IXMLDOMNodeList *node_list; + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + ok(hr == S_OK, "Failed to get_childNodes, hr %#x.\n", hr); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node); + ok(hr == S_OK, "Failed to get_item, hr %#x.\n", hr); + + IXMLDOMNodeList_Release(node_list); + } + hr = IXMLDOMNode_get_attributes(node, &map); ok(SUCCEEDED(hr), "Failed to get attributes, hr %#x.\n", hr); -- 2.30.2

2 1

[PATCH] msvcrt: Avoid null pointer access exceptions.
by Haidong Yu 09 Sep '21

09 Sep '21

2 1

[PATCH] dinput8/tests: Move HID driver tests from ntoskrnl.exe.
by Rémi Bernon 09 Sep '21

09 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 213562-213566 I'd like to add a good number of HID joystick tests, in order to finish and fix its implementation, using the HID test driver in order to simulate arbitrary device characteristics and behavior. It's probably going to be quite verbose (right now I end up at 7k LoC), so I don't think it'll be nice to have them in ntoskrnl.exe. Because dinput is going to be the main consumer of HID, it kind of makes sense to test the HID stack as part of its tests. For the implementation to be correct, it will need to use undocumented internal HID structs, for which I've also got tests to add here. dlls/dinput8/tests/Makefile.in | 12 +- dlls/dinput8/tests/dinput.c | 4 +- .../tests/driver_hid.c | 507 ++-- dlls/dinput8/tests/driver_hid.h | 451 ++++ .../tests/driver_hid.spec | 0 dlls/dinput8/tests/hid.c | 2121 +++++++++++++++++ dlls/dinput8/tests/pop_hid_macros.h | 83 + dlls/dinput8/tests/psh_hid_macros.h | 85 + dlls/ntoskrnl.exe/tests/Makefile.in | 4 - dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1594 ------------- 10 files changed, 3004 insertions(+), 1857 deletions(-) rename dlls/{ntoskrnl.exe => dinput8}/tests/driver_hid.c (54%) create mode 100644 dlls/dinput8/tests/driver_hid.h rename dlls/{ntoskrnl.exe => dinput8}/tests/driver_hid.spec (100%) create mode 100644 dlls/dinput8/tests/hid.c create mode 100644 dlls/dinput8/tests/pop_hid_macros.h create mode 100644 dlls/dinput8/tests/psh_hid_macros.h diff --git a/dlls/dinput8/tests/Makefile.in b/dlls/dinput8/tests/Makefile.in index 5e93ddc868d..579cf3d2f4b 100644 --- a/dlls/dinput8/tests/Makefile.in +++ b/dlls/dinput8/tests/Makefile.in @@ -1,6 +1,12 @@ TESTDLL = dinput8.dll -IMPORTS = dinput8 ole32 user32 advapi32 +IMPORTS = dinput8 ole32 user32 hid advapi32 uuid crypt32 newdev setupapi wintrust -C_SRCS = \ +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass +driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native + +SOURCES = \ device.c \ - dinput.c + dinput.c \ + driver_hid.c \ + driver_hid.spec \ + hid.c diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index de9e6e4cea1..3e2e4fbb371 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -19,8 +19,10 @@ #define DIRECTINPUT_VERSION 0x0800 #define COBJMACROS -#include <initguid.h> #include <windows.h> +#include <objidl.h> + +#include <initguid.h> #include <dinput.h> #include <dinputd.h> diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c similarity index 54% rename from dlls/ntoskrnl.exe/tests/driver_hid.c rename to dlls/dinput8/tests/driver_hid.c index ed0767877ac..1fc52999c84 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -34,8 +34,7 @@ #include "wine/list.h" -#include "driver.h" -#include "utils.h" +#include "driver_hid.h" static UNICODE_STRING control_symlink; @@ -49,43 +48,43 @@ struct irp_queue LIST_ENTRY list; }; -static IRP *irp_queue_pop(struct irp_queue *queue) +static IRP *irp_queue_pop( struct irp_queue *queue ) { KIRQL irql; IRP *irp; - KeAcquireSpinLock(&queue->lock, &irql); - if (IsListEmpty(&queue->list)) irp = NULL; - else irp = CONTAINING_RECORD(RemoveHeadList(&queue->list), IRP, Tail.Overlay.ListEntry); - KeReleaseSpinLock(&queue->lock, irql); + KeAcquireSpinLock( &queue->lock, &irql ); + if (IsListEmpty( &queue->list )) irp = NULL; + else irp = CONTAINING_RECORD( RemoveHeadList( &queue->list ), IRP, Tail.Overlay.ListEntry ); + KeReleaseSpinLock( &queue->lock, irql ); return irp; } -static void irp_queue_push(struct irp_queue *queue, IRP *irp) +static void irp_queue_push( struct irp_queue *queue, IRP *irp ) { KIRQL irql; - KeAcquireSpinLock(&queue->lock, &irql); - InsertTailList(&queue->list, &irp->Tail.Overlay.ListEntry); - KeReleaseSpinLock(&queue->lock, irql); + KeAcquireSpinLock( &queue->lock, &irql ); + InsertTailList( &queue->list, &irp->Tail.Overlay.ListEntry ); + KeReleaseSpinLock( &queue->lock, irql ); } -static void irp_queue_clear(struct irp_queue *queue) +static void irp_queue_clear( struct irp_queue *queue ) { IRP *irp; - while ((irp = irp_queue_pop(queue))) + while ((irp = irp_queue_pop( queue ))) { irp->IoStatus.Status = STATUS_DELETE_PENDING; - IoCompleteRequest(irp, IO_NO_INCREMENT); + IoCompleteRequest( irp, IO_NO_INCREMENT ); } } -static void irp_queue_init(struct irp_queue *queue) +static void irp_queue_init( struct irp_queue *queue ) { - KeInitializeSpinLock(&queue->lock); - InitializeListHead(&queue->list); + KeInitializeSpinLock( &queue->lock ); + InitializeListHead( &queue->list ); } struct hid_device @@ -95,71 +94,70 @@ struct hid_device struct irp_queue irp_queue; }; -static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) { - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; KIRQL irql; - if (winetest_debug > 1) trace("pnp %#x\n", stack->MinorFunction); + if (winetest_debug > 1) trace( "pnp %#x\n", stack->MinorFunction ); switch (stack->MinorFunction) { - case IRP_MN_START_DEVICE: - ++got_start_device; - impl->removed = FALSE; - KeInitializeSpinLock(&impl->lock); - irp_queue_init(&impl->irp_queue); - IoSetDeviceInterfaceState(&control_symlink, TRUE); - irp->IoStatus.Status = STATUS_SUCCESS; - break; - - case IRP_MN_SURPRISE_REMOVAL: - case IRP_MN_QUERY_REMOVE_DEVICE: - KeAcquireSpinLock(&impl->lock, &irql); - impl->removed = TRUE; - KeReleaseSpinLock(&impl->lock, irql); - irp_queue_clear(&impl->irp_queue); - irp->IoStatus.Status = STATUS_SUCCESS; - break; - - case IRP_MN_CANCEL_REMOVE_DEVICE: - KeAcquireSpinLock(&impl->lock, &irql); - impl->removed = FALSE; - KeReleaseSpinLock(&impl->lock, irql); - irp->IoStatus.Status = STATUS_SUCCESS; - break; - - case IRP_MN_STOP_DEVICE: - irp->IoStatus.Status = STATUS_SUCCESS; - break; - - case IRP_MN_REMOVE_DEVICE: - irp_queue_clear(&impl->irp_queue); - IoSetDeviceInterfaceState(&control_symlink, FALSE); - irp->IoStatus.Status = STATUS_SUCCESS; - break; + case IRP_MN_START_DEVICE: + ++got_start_device; + impl->removed = FALSE; + KeInitializeSpinLock( &impl->lock ); + irp_queue_init( &impl->irp_queue ); + IoSetDeviceInterfaceState( &control_symlink, TRUE ); + irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_QUERY_REMOVE_DEVICE: + KeAcquireSpinLock( &impl->lock, &irql ); + impl->removed = TRUE; + KeReleaseSpinLock( &impl->lock, irql ); + irp_queue_clear( &impl->irp_queue ); + irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case IRP_MN_CANCEL_REMOVE_DEVICE: + KeAcquireSpinLock( &impl->lock, &irql ); + impl->removed = FALSE; + KeReleaseSpinLock( &impl->lock, irql ); + irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case IRP_MN_STOP_DEVICE: + irp->IoStatus.Status = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + irp_queue_clear( &impl->irp_queue ); + IoSetDeviceInterfaceState( &control_symlink, FALSE ); + irp->IoStatus.Status = STATUS_SUCCESS; + break; } - IoSkipCurrentIrpStackLocation(irp); - return IoCallDriver(ext->NextDeviceObject, irp); + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( ext->NextDeviceObject, irp ); } - -static NTSTATUS WINAPI driver_power(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_power( DEVICE_OBJECT *device, IRP *irp ) { HID_DEVICE_EXTENSION *ext = device->DeviceExtension; /* We do not expect power IRPs as part of normal operation. */ - ok(0, "unexpected call\n"); + ok( 0, "unexpected call\n" ); - PoStartNextPowerIrp(irp); - IoSkipCurrentIrpStackLocation(irp); - return PoCallDriver(ext->NextDeviceObject, irp); + PoStartNextPowerIrp( irp ); + IoSkipCurrentIrpStackLocation( irp ); + return PoCallDriver( ext->NextDeviceObject, irp ); } -static NTSTATUS WINAPI driver_internal_ioctl(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 */ @@ -408,7 +406,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) #undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; @@ -419,264 +417,264 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) BOOL removed; KIRQL irql; - if (winetest_debug > 1) trace("ioctl %#x\n", code); + if (winetest_debug > 1) trace( "ioctl %#x\n", code ); - ok(got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n"); + ok( got_start_device, "expected IRP_MN_START_DEVICE before any ioctls\n" ); irp->IoStatus.Information = 0; - KeAcquireSpinLock(&impl->lock, &irql); + KeAcquireSpinLock( &impl->lock, &irql ); removed = impl->removed; - KeReleaseSpinLock(&impl->lock, irql); + KeReleaseSpinLock( &impl->lock, irql ); if (removed) { irp->IoStatus.Status = STATUS_DELETE_PENDING; - IoCompleteRequest(irp, IO_NO_INCREMENT); + IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_DELETE_PENDING; } switch (code) { - case IOCTL_HID_GET_DEVICE_DESCRIPTOR: - { - HID_DESCRIPTOR *desc = irp->UserBuffer; - - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == sizeof(*desc), "got output size %u\n", out_size); - - if (out_size == sizeof(*desc)) - { - ok(!desc->bLength, "got size %u\n", desc->bLength); - - desc->bLength = sizeof(*desc); - desc->bDescriptorType = HID_HID_DESCRIPTOR_TYPE; - desc->bcdHID = HID_REVISION; - desc->bCountry = 0; - desc->bNumDescriptors = 1; - desc->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; - desc->DescriptorList[0].wReportLength = sizeof(report_descriptor); - irp->IoStatus.Information = sizeof(*desc); - } - ret = STATUS_SUCCESS; - break; - } - - 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); + case IOCTL_HID_GET_DEVICE_DESCRIPTOR: + { + HID_DESCRIPTOR *desc = irp->UserBuffer; - if (out_size == sizeof(report_descriptor)) - { - memcpy(irp->UserBuffer, report_descriptor, sizeof(report_descriptor)); - irp->IoStatus.Information = sizeof(report_descriptor); - } - ret = STATUS_SUCCESS; - break; + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == sizeof(*desc), "got output size %u\n", out_size ); - case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + if (out_size == sizeof(*desc)) { - HID_DEVICE_ATTRIBUTES *attr = irp->UserBuffer; - - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == sizeof(*attr), "got output size %u\n", out_size); - - if (out_size == sizeof(*attr)) - { - ok(!attr->Size, "got size %u\n", attr->Size); - - attr->Size = sizeof(*attr); - attr->VendorID = 0x1209; - attr->ProductID = 0x0001; - attr->VersionNumber = 0xface; - irp->IoStatus.Information = sizeof(*attr); - } - ret = STATUS_SUCCESS; - break; + ok( !desc->bLength, "got size %u\n", desc->bLength ); + + desc->bLength = sizeof(*desc); + desc->bDescriptorType = HID_HID_DESCRIPTOR_TYPE; + desc->bcdHID = HID_REVISION; + desc->bCountry = 0; + desc->bNumDescriptors = 1; + desc->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; + desc->DescriptorList[0].wReportLength = sizeof(report_descriptor); + irp->IoStatus.Information = sizeof(*desc); } + ret = STATUS_SUCCESS; + break; + } - case IOCTL_HID_READ_REPORT: + 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 ); + + if (out_size == sizeof(report_descriptor)) { - ULONG expected_size = 25; - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == expected_size, "got output size %u\n", out_size); - - if (polled) - { - memset(irp->UserBuffer, 0xa5, expected_size); - if (report_id) ((char *)irp->UserBuffer)[0] = report_id; - ((char *)irp->UserBuffer)[1] = seq++; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - } - else - { - IoMarkIrpPending(irp); - irp_queue_push(&impl->irp_queue, irp); - ret = STATUS_PENDING; - } - break; + memcpy( irp->UserBuffer, report_descriptor, sizeof(report_descriptor) ); + irp->IoStatus.Information = sizeof(report_descriptor); } + ret = STATUS_SUCCESS; + break; - case IOCTL_HID_WRITE_REPORT: - { - HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 2; + case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + { + HID_DEVICE_ATTRIBUTES *attr = irp->UserBuffer; - ok(in_size == sizeof(*packet), "got input size %u\n", in_size); - ok(!out_size, "got output size %u\n", out_size); - ok(packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen); + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == sizeof(*attr), "got output size %u\n", out_size ); - if (report_id) - ok(packet->reportBuffer[0] == report_id, "got report id %x\n", packet->reportBuffer[0]); - else - ok(packet->reportBuffer[0] == 0xcd, "got first byte %x\n", packet->reportBuffer[0]); + if (out_size == sizeof(*attr)) + { + ok( !attr->Size, "got size %u\n", attr->Size ); - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - break; + attr->Size = sizeof(*attr); + attr->VendorID = 0x1209; + attr->ProductID = 0x0001; + attr->VersionNumber = 0xface; + irp->IoStatus.Information = sizeof(*attr); } + ret = STATUS_SUCCESS; + break; + } + + case IOCTL_HID_READ_REPORT: + { + ULONG expected_size = 25; + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == expected_size, "got output size %u\n", out_size ); - case IOCTL_HID_GET_INPUT_REPORT: + if (polled) { - HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 23; - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == sizeof(*packet), "got output size %u\n", out_size); - - ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); - ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); - - memset(packet->reportBuffer, 0xa5, 3); - if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - ((char *)packet->reportBuffer)[1] = seq++; + memset( irp->UserBuffer, 0xa5, expected_size ); + if (report_id) ((char *)irp->UserBuffer)[0] = report_id; + ((char *)irp->UserBuffer)[1] = seq++; irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; - break; } - - case IOCTL_HID_SET_OUTPUT_REPORT: + else { - HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 2; - ok(in_size == sizeof(*packet), "got input size %u\n", in_size); - ok(!out_size, "got output size %u\n", out_size); + IoMarkIrpPending( irp ); + irp_queue_push( &impl->irp_queue, irp ); + ret = STATUS_PENDING; + } + break; + } - ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); - ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); + case IOCTL_HID_WRITE_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 2; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - break; - } + ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); + ok( !out_size, "got output size %u\n", out_size ); + ok( packet->reportBufferLen >= expected_size, "got report size %u\n", packet->reportBufferLen ); - case IOCTL_HID_GET_FEATURE: - { - HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 17; - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == sizeof(*packet), "got output size %u\n", out_size); + if (report_id) + ok( packet->reportBuffer[0] == report_id, "got report id %x\n", packet->reportBuffer[0] ); + else ok( packet->reportBuffer[0] == 0xcd, "got first byte %x\n", packet->reportBuffer[0] ); - ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); - ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } - memset(packet->reportBuffer, 0xa5, 3); - if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - break; - } + case IOCTL_HID_GET_INPUT_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 23; + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); + + ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); + ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); + + memset( packet->reportBuffer, 0xa5, 3 ); + if (report_id) ((char *)packet->reportBuffer)[0] = report_id; + ((char *)packet->reportBuffer)[1] = seq++; + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } - case IOCTL_HID_SET_FEATURE: - { - HID_XFER_PACKET *packet = irp->UserBuffer; - ULONG expected_size = 17; - ok(in_size == sizeof(*packet), "got input size %u\n", in_size); - ok(!out_size, "got output size %u\n", out_size); + case IOCTL_HID_SET_OUTPUT_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 2; + ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); + ok( !out_size, "got output size %u\n", out_size ); + + ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); + ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); + + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } - ok(packet->reportId == report_id, "got id %u\n", packet->reportId); - ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); - ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); + case IOCTL_HID_GET_FEATURE: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 17; + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); + + ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); + ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); + + memset( packet->reportBuffer, 0xa5, 3 ); + if (report_id) ((char *)packet->reportBuffer)[0] = report_id; + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; - break; - } + case IOCTL_HID_SET_FEATURE: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 17; + ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); + ok( !out_size, "got output size %u\n", out_size ); + + ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); + ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); + + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } - case IOCTL_HID_GET_STRING: - ok(!in_size, "got input size %u\n", in_size); - ok(out_size == 128, "got output size %u\n", out_size); + case IOCTL_HID_GET_STRING: + ok( !in_size, "got input size %u\n", in_size ); + ok( out_size == 128, "got output size %u\n", out_size ); - memcpy(irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test")); - irp->IoStatus.Information = sizeof(L"Wine Test"); - ret = STATUS_SUCCESS; - break; + memcpy( irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test") ); + irp->IoStatus.Information = sizeof(L"Wine Test"); + ret = STATUS_SUCCESS; + break; - default: - ok(0, "unexpected ioctl %#x\n", code); - ret = STATUS_NOT_IMPLEMENTED; + default: + ok( 0, "unexpected ioctl %#x\n", code ); + ret = STATUS_NOT_IMPLEMENTED; } if (ret != STATUS_PENDING) { irp->IoStatus.Status = ret; - IoCompleteRequest(irp, IO_NO_INCREMENT); + IoCompleteRequest( irp, IO_NO_INCREMENT ); } return ret; } -static NTSTATUS WINAPI driver_ioctl(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { HID_DEVICE_EXTENSION *ext = device->DeviceExtension; - ok(0, "unexpected call\n"); - IoSkipCurrentIrpStackLocation(irp); - return IoCallDriver(ext->NextDeviceObject, irp); + ok( 0, "unexpected call\n" ); + IoSkipCurrentIrpStackLocation( irp ); + return IoCallDriver( ext->NextDeviceObject, irp ); } -static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *fdo) +static NTSTATUS WINAPI driver_add_device( DRIVER_OBJECT *driver, DEVICE_OBJECT *fdo ) { HID_DEVICE_EXTENSION *ext = fdo->DeviceExtension; NTSTATUS ret; /* We should be given the FDO, not the PDO. */ - ok(!!ext->PhysicalDeviceObject, "expected non-NULL pdo\n"); - ok(ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", - ext->PhysicalDeviceObject, ext->NextDeviceObject); - todo_wine ok(ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n"); + ok( !!ext->PhysicalDeviceObject, "expected non-NULL pdo\n" ); + ok( ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", + ext->PhysicalDeviceObject, ext->NextDeviceObject ); + todo_wine + ok( ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n" ); - ret = IoRegisterDeviceInterface(ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink); - ok(!ret, "got %#x\n", ret); + ret = IoRegisterDeviceInterface( ext->PhysicalDeviceObject, &control_class, NULL, &control_symlink ); + ok( !ret, "got %#x\n", ret ); fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } -static NTSTATUS WINAPI driver_create(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_create( DEVICE_OBJECT *device, IRP *irp ) { - ok(0, "unexpected call\n"); + ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); + IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; } -static NTSTATUS WINAPI driver_close(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_close( DEVICE_OBJECT *device, IRP *irp ) { - ok(0, "unexpected call\n"); + ok( 0, "unexpected call\n" ); irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); + IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; } -static void WINAPI driver_unload(DRIVER_OBJECT *driver) +static void WINAPI driver_unload( DRIVER_OBJECT *driver ) { winetest_cleanup(); } -NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) +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)]; @@ -693,24 +691,23 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) HANDLE hkey; DWORD size; - if ((ret = winetest_init())) - return ret; + if ((ret = winetest_init())) return ret; - InitializeObjectAttributes(&attr, registry, 0, NULL, NULL); - ret = ZwOpenKey(&hkey, KEY_ALL_ACCESS, &attr); - ok(!ret, "ZwOpenKey returned %#x\n", ret); + InitializeObjectAttributes( &attr, registry, 0, NULL, NULL ); + ret = ZwOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); + ok( !ret, "ZwOpenKey returned %#x\n", ret ); - RtlInitUnicodeString(&name_str, L"ReportID"); + RtlInitUnicodeString( &name_str, L"ReportID" ); size = info_size + sizeof(report_id); - ret = ZwQueryValueKey(hkey, &name_str, KeyValuePartialInformation, buffer, size, &size); - ok(!ret, "ZwQueryValueKey returned %#x\n", ret); - memcpy(&report_id, buffer + info_size, size - info_size); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( &report_id, buffer + info_size, size - info_size ); - RtlInitUnicodeString(&name_str, L"PolledMode"); + RtlInitUnicodeString( &name_str, L"PolledMode" ); size = info_size + sizeof(polled); - ret = ZwQueryValueKey(hkey, &name_str, KeyValuePartialInformation, buffer, size, &size); - ok(!ret, "ZwQueryValueKey returned %#x\n", ret); - memcpy(&polled, buffer + info_size, size - info_size); + ret = ZwQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, size, &size ); + ok( !ret, "ZwQueryValueKey returned %#x\n", ret ); + memcpy( &polled, buffer + info_size, size - info_size ); params.DevicesArePolled = polled; driver->DriverExtension->AddDevice = driver_add_device; @@ -722,8 +719,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) driver->MajorFunction[IRP_MJ_CREATE] = driver_create; driver->MajorFunction[IRP_MJ_CLOSE] = driver_close; - ret = HidRegisterMinidriver(&params); - ok(!ret, "got %#x\n", ret); + ret = HidRegisterMinidriver( &params ); + ok( !ret, "got %#x\n", ret ); return STATUS_SUCCESS; } diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h new file mode 100644 index 00000000000..8fad343157d --- /dev/null +++ b/dlls/dinput8/tests/driver_hid.h @@ -0,0 +1,451 @@ +/* + * ntoskrnl.exe testing framework + * + * Copyright 2015 Sebastian Lackner + * Copyright 2015 Michael Müller + * Copyright 2015 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DRIVER_HID_H +#define __WINE_DRIVER_HID_H + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" + +#include "ddk/wdm.h" + +#include "initguid.h" + +DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); + +/* kernel/user shared data */ +struct winetest_shared_data +{ + int running_under_wine; + int winetest_report_success; + int winetest_debug; + int failures; + int todo_failures; +}; + +#ifndef __WINE_WINE_TEST_H + +#if !defined( __WINE_USE_MSVCRT ) || defined( __MINGW32__ ) +#define __WINE_PRINTF_ATTR( fmt, args ) __attribute__((format( printf, fmt, args ))) +#else +#define __WINE_PRINTF_ATTR( fmt, args ) +#endif + +static HANDLE okfile; +static LONG successes; +static LONG failures; +static LONG skipped; +static LONG todo_successes; +static LONG todo_failures; +static LONG muted_traces; +static LONG muted_skipped; +static LONG muted_todo_successes; + +static int running_under_wine; +static int winetest_debug; +static int winetest_report_success; + +/* silence todos and skips above this threshold */ +static int winetest_mute_threshold = 42; + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char *current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static inline struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock( &tls_data_lock, &irql ); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock( &tls_data_lock, irql ); + + return data; +} + +static inline void winetest_set_location( const char *file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file = strrchr( file, '/' ); + if (data->current_file == NULL) data->current_file = strrchr( file, '\\' ); + if (data->current_file == NULL) data->current_file = file; + else data->current_file++; + data->current_line = line; +} + +static inline void kvprintf( const char *format, __ms_va_list ap ) +{ + struct tls_data *data = get_tls_data(); + IO_STATUS_BLOCK io; + int len = vsnprintf( data->strings, sizeof(data->strings), format, ap ); + ZwWriteFile( okfile, NULL, NULL, NULL, &io, data->strings, len, NULL, NULL ); +} + +static inline void WINAPIV kprintf( const char *format, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV kprintf( const char *format, ... ) +{ + __ms_va_list valist; + + __ms_va_start( valist, format ); + kvprintf( format, valist ); + __ms_va_end( valist ); +} + +static inline void WINAPIV winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV winetest_printf( const char *msg, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __ms_va_start( valist, msg ); + kvprintf( msg, valist ); + __ms_va_end( valist ); +} + +static inline NTSTATUS winetest_init(void) +{ + const struct winetest_shared_data *data; + SIZE_T size = sizeof(*data); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + void *addr = NULL; + HANDLE section; + NTSTATUS ret; + + KeInitializeSpinLock( &tls_data_lock ); + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest_dinput_section" ); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes( &attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL ); + if ((ret = ZwOpenSection( &section, SECTION_MAP_READ, &attr ))) return ret; + + if ((ret = ZwMapViewOfSection( section, NtCurrentProcess(), &addr, 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READONLY ))) + { + ZwClose( section ); + return ret; + } + data = addr; + running_under_wine = data->running_under_wine; + winetest_debug = data->winetest_debug; + winetest_report_success = data->winetest_report_success; + + ZwUnmapViewOfSection( NtCurrentProcess(), addr ); + ZwClose( section ); + + RtlInitUnicodeString( &string, L"\\??\\C:\\windows\\winetest_dinput_okfile" ); + return ZwOpenFile( &okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); +} + +#define winetest_cleanup() winetest_cleanup_( __FILE__ ) +static inline void winetest_cleanup_( const char *file ) +{ + char test_name[MAX_PATH], *tmp; + struct winetest_shared_data *data; + SIZE_T size = sizeof(*data); + const char *source_file; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + void *addr = NULL; + HANDLE section; + + source_file = strrchr( file, '/' ); + if (!source_file) source_file = strrchr( file, '\\' ); + if (!source_file) source_file = file; + else source_file++; + + strcpy( test_name, source_file ); + if ((tmp = strrchr( test_name, '.' ))) *tmp = 0; + + if (winetest_debug) + { + kprintf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + (DWORD)(DWORD_PTR)PsGetCurrentProcessId(), test_name, + successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, + (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + } + + RtlInitUnicodeString( &string, L"\\BaseNamedObjects\\winetest_dinput_section" ); + /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ + InitializeObjectAttributes( &attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL ); + + if (!ZwOpenSection( &section, SECTION_MAP_READ | SECTION_MAP_WRITE, &attr )) + { + if (!ZwMapViewOfSection( section, NtCurrentProcess(), &addr, 0, 0, NULL, &size, ViewUnmap, 0, PAGE_READWRITE )) + { + data = addr; + + InterlockedExchangeAdd( &data->failures, failures ); + InterlockedExchangeAdd( &data->todo_failures, todo_failures ); + + ZwUnmapViewOfSection( NtCurrentProcess(), addr ); + } + ZwClose( section ); + } + + ZwClose( okfile ); +} + +static inline void winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) kprintf( "%s: ", data->context[i] ); +} + +static inline LONG winetest_add_line(void) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement( line_counters + index ) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + + return count; +} + +static inline int winetest_vok( int condition, const char *msg, __ms_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) + { + if (condition) + { + winetest_print_context( "Test succeeded inside todo block: " ); + kvprintf( msg, args ); + InterlockedIncrement( &todo_failures ); + return 0; + } + else + { + if (!winetest_debug || winetest_add_line() < winetest_mute_threshold) + { + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf( msg, args ); + } + InterlockedIncrement( &todo_successes ); + } + else InterlockedIncrement( &muted_todo_successes ); + return 1; + } + } + else + { + if (!condition) + { + winetest_print_context( "Test failed: " ); + kvprintf( msg, args ); + InterlockedIncrement( &failures ); + return 0; + } + else + { + if (winetest_report_success) winetest_printf( "Test succeeded\n" ); + InterlockedIncrement( &successes ); + return 1; + } + } +} + +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) __WINE_PRINTF_ATTR( 2, 3 ); +static inline void WINAPIV winetest_ok( int condition, const char *msg, ... ) +{ + __ms_va_list args; + __ms_va_start( args, msg ); + winetest_vok( condition, msg, args ); + __ms_va_end( args ); +} + +static inline void winetest_vskip( const char *msg, __ms_va_list args ) +{ + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf( msg, args ); + InterlockedIncrement( &skipped ); + } + else InterlockedIncrement( &muted_skipped ); +} + +static inline void WINAPIV winetest_skip( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV winetest_skip( const char *msg, ... ) +{ + __ms_va_list args; + __ms_va_start( args, msg ); + winetest_vskip( msg, args ); + __ms_va_end( args ); +} + +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV winetest_win_skip( const char *msg, ... ) +{ + __ms_va_list args; + __ms_va_start( args, msg ); + if (running_under_wine) winetest_vskip( msg, args ); + else winetest_vok( 0, msg, args ); + __ms_va_end( args ); +} + +static inline void WINAPIV winetest_trace( const char *msg, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV winetest_trace( const char *msg, ... ) +{ + __ms_va_list args; + + if (!winetest_debug) return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __ms_va_start( args, msg ); + kvprintf( msg, args ); + __ms_va_end( args ); + } + else InterlockedIncrement( &muted_traces ); +} + +static inline void winetest_start_todo( int is_todo ) +{ + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop = 1; +} + +static inline int winetest_loop_todo(void) +{ + struct tls_data *data = get_tls_data(); + int do_loop = data->todo_do_loop; + data->todo_do_loop = 0; + return do_loop; +} + +static inline void winetest_end_todo(void) +{ + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; +} + +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) __WINE_PRINTF_ATTR( 1, 2 ); +static inline void WINAPIV winetest_push_context( const char *fmt, ... ) +{ + struct tls_data *data = get_tls_data(); + __ms_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __ms_va_start( valist, fmt ); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __ms_va_end( valist ); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; +} + +static inline void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) --data->context_count; +} + +static inline int broken( int condition ) +{ + return !running_under_wine && condition; +} + +#ifdef WINETEST_NO_LINE_NUMBERS +# define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process +#else +# define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions +# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_wait_child_process +#endif + +#define ok ok_(__FILE__, __LINE__) +#define skip skip_(__FILE__, __LINE__) +#define trace trace_(__FILE__, __LINE__) +#define win_skip win_skip_(__FILE__, __LINE__) + +#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_if(running_under_wine) +#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) + +#endif /* __WINE_WINE_TEST_H */ + +#endif /* __WINE_DRIVER_HID_H */ diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.spec b/dlls/dinput8/tests/driver_hid.spec similarity index 100% rename from dlls/ntoskrnl.exe/tests/driver_hid.spec rename to dlls/dinput8/tests/driver_hid.spec diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c new file mode 100644 index 00000000000..d89974a14ab --- /dev/null +++ b/dlls/dinput8/tests/hid.c @@ -0,0 +1,2121 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stddef.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winioctl.h" +#include "winternl.h" +#include "wincrypt.h" +#include "winreg.h" +#include "winsvc.h" +#include "winuser.h" +#include "winnls.h" + +#include "mscat.h" +#include "mssip.h" +#include "ntsecapi.h" +#include "setupapi.h" +#include "cfgmgr32.h" +#include "newdev.h" + +#include "objbase.h" + +#include "initguid.h" +#include "ddk/wdm.h" +#include "ddk/hidclass.h" +#include "ddk/hidsdi.h" +#include "ddk/hidpi.h" +#include "ddk/hidport.h" + +#include "wine/test.h" +#include "wine/mssign.h" + +#include "driver_hid.h" + +static struct winetest_shared_data *test_data; +static HANDLE okfile; + +static HRESULT (WINAPI *pSignerSign)( SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, + SIGNER_SIGNATURE_INFO *signature, SIGNER_PROVIDER_INFO *provider, + const WCHAR *timestamp, CRYPT_ATTRIBUTES *attr, void *sip_data ); + +static const WCHAR container_name[] = L"wine_testsign"; + +static const CERT_CONTEXT *testsign_sign( const WCHAR *filename ) +{ + BYTE encoded_name[100], encoded_key_id[200], public_key_info_buffer[1000]; + BYTE hash_buffer[16], cert_buffer[1000], provider_nameA[100], serial[16]; + CERT_PUBLIC_KEY_INFO *public_key_info = (CERT_PUBLIC_KEY_INFO *)public_key_info_buffer; + SIGNER_SIGNATURE_INFO signature = {sizeof(SIGNER_SIGNATURE_INFO)}; + SIGNER_CERT_STORE_INFO store = {sizeof(SIGNER_CERT_STORE_INFO)}; + SIGNER_ATTR_AUTHCODE authcode = {sizeof(SIGNER_ATTR_AUTHCODE)}; + SIGNER_SUBJECT_INFO subject = {sizeof(SIGNER_SUBJECT_INFO)}; + SIGNER_FILE_INFO file = {sizeof(SIGNER_FILE_INFO)}; + SIGNER_CERT signer = {sizeof(SIGNER_CERT)}; + CRYPT_KEY_PROV_INFO provider_info = {0}; + CRYPT_ALGORITHM_IDENTIFIER algid = {0}; + CERT_AUTHORITY_KEY_ID_INFO key_info; + HCERTSTORE root_store, pub_store; + CERT_INFO cert_info = {0}; + WCHAR provider_nameW[100]; + const CERT_CONTEXT *cert; + CERT_EXTENSION extension; + DWORD size, index = 0; + HCRYPTPROV provider; + HCRYPTKEY key; + HRESULT hr; + BOOL ret; + + ret = CryptAcquireContextW( &provider, container_name, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET ); + if (!ret && GetLastError() == NTE_EXISTS) + { + ret = CryptAcquireContextW( &provider, container_name, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET ); + ok( ret, "Failed to delete container, error %#x\n", GetLastError() ); + ret = CryptAcquireContextW( &provider, container_name, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET ); + } + ok( ret, "Failed to create container, error %#x\n", GetLastError() ); + + ret = CryptGenKey( provider, AT_SIGNATURE, CRYPT_EXPORTABLE, &key ); + ok( ret, "Failed to create key, error %#x\n", GetLastError() ); + ret = CryptDestroyKey( key ); + ok( ret, "Failed to destroy key, error %#x\n", GetLastError() ); + ret = CryptGetUserKey( provider, AT_SIGNATURE, &key ); + ok( ret, "Failed to get user key, error %#x\n", GetLastError() ); + ret = CryptDestroyKey( key ); + ok( ret, "Failed to destroy key, error %#x\n", GetLastError() ); + + size = sizeof(encoded_name); + ret = CertStrToNameW( X509_ASN_ENCODING, L"CN=winetest_cert", CERT_X500_NAME_STR, NULL, + encoded_name, &size, NULL ); + ok( ret, "Failed to convert name, error %#x\n", GetLastError() ); + key_info.CertIssuer.cbData = size; + key_info.CertIssuer.pbData = encoded_name; + + size = sizeof(public_key_info_buffer); + ret = CryptExportPublicKeyInfo( provider, AT_SIGNATURE, X509_ASN_ENCODING, public_key_info, &size ); + ok( ret, "Failed to export public key, error %#x\n", GetLastError() ); + cert_info.SubjectPublicKeyInfo = *public_key_info; + + size = sizeof(hash_buffer); + ret = CryptHashPublicKeyInfo( provider, CALG_MD5, 0, X509_ASN_ENCODING, public_key_info, hash_buffer, &size ); + ok( ret, "Failed to hash public key, error %#x\n", GetLastError() ); + + key_info.KeyId.cbData = size; + key_info.KeyId.pbData = hash_buffer; + + RtlGenRandom( serial, sizeof(serial) ); + key_info.CertSerialNumber.cbData = sizeof(serial); + key_info.CertSerialNumber.pbData = serial; + + size = sizeof(encoded_key_id); + ret = CryptEncodeObject( X509_ASN_ENCODING, X509_AUTHORITY_KEY_ID, &key_info, encoded_key_id, &size ); + ok( ret, "Failed to convert name, error %#x\n", GetLastError() ); + + extension.pszObjId = (char *)szOID_AUTHORITY_KEY_IDENTIFIER; + extension.fCritical = TRUE; + extension.Value.cbData = size; + extension.Value.pbData = encoded_key_id; + + cert_info.dwVersion = CERT_V3; + cert_info.SerialNumber = key_info.CertSerialNumber; + cert_info.SignatureAlgorithm.pszObjId = (char *)szOID_RSA_SHA1RSA; + cert_info.Issuer = key_info.CertIssuer; + GetSystemTimeAsFileTime( &cert_info.NotBefore ); + GetSystemTimeAsFileTime( &cert_info.NotAfter ); + cert_info.NotAfter.dwHighDateTime += 1; + cert_info.Subject = key_info.CertIssuer; + cert_info.cExtension = 1; + cert_info.rgExtension = &extension; + algid.pszObjId = (char *)szOID_RSA_SHA1RSA; + size = sizeof(cert_buffer); + ret = CryptSignAndEncodeCertificate( provider, AT_SIGNATURE, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, + &cert_info, &algid, NULL, cert_buffer, &size ); + ok( ret, "Failed to create certificate, error %#x\n", GetLastError() ); + + cert = CertCreateCertificateContext( X509_ASN_ENCODING, cert_buffer, size ); + ok( !!cert, "Failed to create context, error %#x\n", GetLastError() ); + + size = sizeof(provider_nameA); + ret = CryptGetProvParam( provider, PP_NAME, provider_nameA, &size, 0 ); + ok( ret, "Failed to get prov param, error %#x\n", GetLastError() ); + MultiByteToWideChar( CP_ACP, 0, (char *)provider_nameA, -1, provider_nameW, ARRAY_SIZE(provider_nameW) ); + + provider_info.pwszContainerName = (WCHAR *)container_name; + provider_info.pwszProvName = provider_nameW; + provider_info.dwProvType = PROV_RSA_FULL; + provider_info.dwKeySpec = AT_SIGNATURE; + ret = CertSetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &provider_info ); + ok( ret, "Failed to set provider info, error %#x\n", GetLastError() ); + + ret = CryptReleaseContext( provider, 0 ); + ok( ret, "failed to release context, error %u\n", GetLastError() ); + + root_store = CertOpenStore( CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, L"root" ); + if (!root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip( "Failed to open root store.\n" ); + ret = CertFreeCertificateContext( cert ); + ok( ret, "Failed to free certificate, error %u\n", GetLastError() ); + return NULL; + } + ok( !!root_store, "Failed to open store, error %u\n", GetLastError() ); + ret = CertAddCertificateContextToStore( root_store, cert, CERT_STORE_ADD_ALWAYS, NULL ); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip( "Failed to add self-signed certificate to store.\n" ); + ret = CertFreeCertificateContext( cert ); + ok( ret, "Failed to free certificate, error %u\n", GetLastError() ); + ret = CertCloseStore( root_store, CERT_CLOSE_STORE_CHECK_FLAG ); + ok( ret, "Failed to close store, error %u\n", GetLastError() ); + return NULL; + } + ok( ret, "Failed to add certificate, error %u\n", GetLastError() ); + ret = CertCloseStore( root_store, CERT_CLOSE_STORE_CHECK_FLAG ); + ok( ret, "Failed to close store, error %u\n", GetLastError() ); + + pub_store = CertOpenStore( CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_LOCAL_MACHINE, L"trustedpublisher" ); + ok( !!pub_store, "Failed to open store, error %u\n", GetLastError() ); + ret = CertAddCertificateContextToStore( pub_store, cert, CERT_STORE_ADD_ALWAYS, NULL ); + ok( ret, "Failed to add certificate, error %u\n", GetLastError() ); + ret = CertCloseStore( pub_store, CERT_CLOSE_STORE_CHECK_FLAG ); + ok( ret, "Failed to close store, error %u\n", GetLastError() ); + + subject.dwSubjectChoice = 1; + subject.pdwIndex = &index; + subject.pSignerFileInfo = &file; + file.pwszFileName = (WCHAR *)filename; + signer.dwCertChoice = 2; + signer.pCertStoreInfo = &store; + store.pSigningCert = cert; + store.dwCertPolicy = 0; + signature.algidHash = CALG_SHA_256; + signature.dwAttrChoice = SIGNER_AUTHCODE_ATTR; + signature.pAttrAuthcode = &authcode; + authcode.pwszName = L""; + authcode.pwszInfo = L""; + hr = pSignerSign( &subject, &signer, &signature, NULL, NULL, NULL, NULL ); + todo_wine + ok( hr == S_OK || broken( hr == NTE_BAD_ALGID ) /* < 7 */, "Failed to sign, hr %#x\n", hr ); + + return cert; +} + +static void testsign_cleanup( const CERT_CONTEXT *cert ) +{ + HCERTSTORE root_store, pub_store; + const CERT_CONTEXT *store_cert; + HCRYPTPROV provider; + BOOL ret; + + root_store = CertOpenStore( CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, L"root" ); + ok( !!root_store, "Failed to open store, error %u\n", GetLastError() ); + store_cert = CertFindCertificateInStore( root_store, X509_ASN_ENCODING, 0, CERT_FIND_EXISTING, cert, NULL ); + ok( !!store_cert, "Failed to find root certificate, error %u\n", GetLastError() ); + ret = CertDeleteCertificateFromStore( store_cert ); + ok( ret, "Failed to remove certificate, error %u\n", GetLastError() ); + ret = CertCloseStore( root_store, CERT_CLOSE_STORE_CHECK_FLAG ); + ok( ret, "Failed to close store, error %u\n", GetLastError() ); + + pub_store = CertOpenStore( CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0, 0, + CERT_SYSTEM_STORE_LOCAL_MACHINE, L"trustedpublisher" ); + ok( !!pub_store, "Failed to open store, error %u\n", GetLastError() ); + store_cert = CertFindCertificateInStore( pub_store, X509_ASN_ENCODING, 0, CERT_FIND_EXISTING, cert, NULL ); + ok( !!store_cert, "Failed to find publisher certificate, error %u\n", GetLastError() ); + ret = CertDeleteCertificateFromStore( store_cert ); + ok( ret, "Failed to remove certificate, error %u\n", GetLastError() ); + ret = CertCloseStore( pub_store, CERT_CLOSE_STORE_CHECK_FLAG ); + ok( ret, "Failed to close store, error %u\n", GetLastError() ); + + ret = CertFreeCertificateContext( cert ); + ok( ret, "Failed to free certificate, error %u\n", GetLastError() ); + + ret = CryptAcquireContextW( &provider, container_name, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET ); + ok( ret, "Failed to delete container, error %#x\n", GetLastError() ); +} + +static void load_resource( const WCHAR *name, WCHAR *filename ) +{ + static WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW( ARRAY_SIZE(path), path ); + GetTempFileNameW( path, name, 0, filename ); + + file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "failed to create %s, error %u\n", debugstr_w(filename), GetLastError() ); + + res = FindResourceW( NULL, name, L"TESTDLL" ); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleW( NULL ), res ) ); + WriteFile( file, ptr, SizeofResource( GetModuleHandleW( NULL ), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleW( NULL ), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +#ifdef __i386__ +#define EXT "x86" +#elif defined(__x86_64__) +#define EXT "amd64" +#elif defined(__arm__) +#define EXT "arm" +#elif defined(__aarch64__) +#define EXT "arm64" +#else +#define EXT +#endif + +static const char inf_text[] = + "[Version]\n" + "Signature=$Chicago$\n" + "ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318}\n" + "CatalogFile=winetest.cat\n" + "DriverVer=09/21/2006,6.0.5736.1\n" + + "[Manufacturer]\n" + "Wine=mfg_section,NT" EXT "\n" + + "[mfg_section.NT" EXT "]\n" + "Wine test root driver=device_section,test_hardware_id\n" + + "[device_section.NT" EXT "]\n" + "CopyFiles=file_section\n" + + "[device_section.NT" EXT ".Services]\n" + "AddService=winetest,0x2,svc_section\n" + + "[file_section]\n" + "winetest.sys\n" + + "[SourceDisksFiles]\n" + "winetest.sys=1\n" + + "[SourceDisksNames]\n" + "1=,winetest.sys\n" + + "[DestinationDirs]\n" + "DefaultDestDir=12\n" + + "[svc_section]\n" + "ServiceBinary=%12%\\winetest.sys\n" + "ServiceType=1\n" + "StartType=3\n" + "ErrorControl=1\n" + "LoadOrderGroup=Extended Base\n" + "DisplayName=\"winetest bus driver\"\n" + "; they don't sleep anymore, on the beach\n"; + +static void add_file_to_catalog( HANDLE catalog, const WCHAR *file ) +{ + SIP_SUBJECTINFO subject_info = {sizeof(SIP_SUBJECTINFO)}; + SIP_INDIRECT_DATA *indirect_data; + const WCHAR *filepart = file; + CRYPTCATMEMBER *member; + WCHAR hash_buffer[100]; + GUID subject_guid; + unsigned int i; + DWORD size; + BOOL ret; + + ret = CryptSIPRetrieveSubjectGuidForCatalogFile( file, NULL, &subject_guid ); + todo_wine + ok( ret, "Failed to get subject guid, error %u\n", GetLastError() ); + + size = 0; + subject_info.pgSubjectType = &subject_guid; + subject_info.pwsFileName = file; + subject_info.DigestAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + subject_info.dwFlags = SPC_INC_PE_RESOURCES_FLAG | SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG | + SPC_EXC_PE_PAGE_HASHES_FLAG | 0x10000; + ret = CryptSIPCreateIndirectData( &subject_info, &size, NULL ); + todo_wine + ok( ret, "Failed to get indirect data size, error %u\n", GetLastError() ); + + indirect_data = malloc( size ); + ret = CryptSIPCreateIndirectData( &subject_info, &size, indirect_data ); + todo_wine + ok( ret, "Failed to get indirect data, error %u\n", GetLastError() ); + if (ret) + { + memset( hash_buffer, 0, sizeof(hash_buffer) ); + for (i = 0; i < indirect_data->Digest.cbData; ++i) + swprintf( &hash_buffer[i * 2], 2, L"%02X", indirect_data->Digest.pbData[i] ); + + member = CryptCATPutMemberInfo( catalog, (WCHAR *)file, hash_buffer, &subject_guid, + 0, size, (BYTE *)indirect_data ); + ok( !!member, "Failed to write member, error %u\n", GetLastError() ); + + if (wcsrchr( file, '\\' )) filepart = wcsrchr( file, '\\' ) + 1; + + ret = !!CryptCATPutAttrInfo( catalog, member, (WCHAR *)L"File", + CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, + (wcslen( filepart ) + 1) * 2, (BYTE *)filepart ); + ok( ret, "Failed to write attr, error %u\n", GetLastError() ); + + ret = !!CryptCATPutAttrInfo( catalog, member, (WCHAR *)L"OSAttr", + CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, + sizeof(L"2:6.0"), (BYTE *)L"2:6.0" ); + ok( ret, "Failed to write attr, error %u\n", GetLastError() ); + } +} + +static void unload_driver( SC_HANDLE service ) +{ + SERVICE_STATUS status; + + ControlService( service, SERVICE_CONTROL_STOP, &status ); + while (status.dwCurrentState == SERVICE_STOP_PENDING) + { + BOOL ret; + Sleep( 100 ); + ret = QueryServiceStatus( service, &status ); + ok( ret, "QueryServiceStatus failed: %u\n", GetLastError() ); + } + ok( status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState ); + + DeleteService( service ); + CloseServiceHandle( service ); +} + +static void pnp_driver_stop(void) +{ + SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; + WCHAR path[MAX_PATH], dest[MAX_PATH], *filepart; + SC_HANDLE manager, service; + char buffer[512]; + HDEVINFO set; + HANDLE file; + DWORD size; + BOOL ret; + + set = SetupDiCreateDeviceInfoList( NULL, NULL ); + ok( set != INVALID_HANDLE_VALUE, "failed to create device list, error %u\n", GetLastError() ); + + ret = SetupDiOpenDeviceInfoW( set, L"root\\winetest\\0", NULL, 0, &device ); + if (!ret && GetLastError() == ERROR_NO_SUCH_DEVINST) + { + ret = SetupDiDestroyDeviceInfoList( set ); + ok( ret, "failed to destroy set, error %u\n", GetLastError() ); + return; + } + ok( ret, "failed to open device, error %u\n", GetLastError() ); + + ret = SetupDiCallClassInstaller( DIF_REMOVE, set, &device ); + ok( ret, "failed to remove device, error %u\n", GetLastError() ); + + file = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( file == INVALID_HANDLE_VALUE, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + + ret = SetupDiDestroyDeviceInfoList( set ); + ok( ret, "failed to destroy set, error %u\n", GetLastError() ); + + /* Windows stops the service but does not delete it. */ + manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); + ok( !!manager, "failed to open service manager, error %u\n", GetLastError() ); + + service = OpenServiceW( manager, L"winetest", SERVICE_STOP | DELETE ); + if (service) unload_driver( service ); + else ok( GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, "got error %u\n", GetLastError() ); + + CloseServiceHandle( manager ); + + SetFilePointer( okfile, 0, NULL, FILE_BEGIN ); + do + { + ReadFile( okfile, buffer, sizeof(buffer), &size, NULL ); + printf( "%.*s", size, buffer ); + } while (size == sizeof(buffer)); + SetFilePointer( okfile, 0, NULL, FILE_BEGIN ); + SetEndOfFile( okfile ); + + winetest_add_failures( InterlockedExchange( &test_data->failures, 0 ) ); + winetest_add_failures( InterlockedExchange( &test_data->todo_failures, 0 ) ); + + GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); + ret = SetupCopyOEMInfW( path, NULL, 0, 0, dest, ARRAY_SIZE(dest), NULL, &filepart ); + ok( ret, "Failed to copy INF, error %u\n", GetLastError() ); + ret = SetupUninstallOEMInfW( filepart, 0, NULL ); + ok( ret, "Failed to uninstall INF, error %u\n", GetLastError() ); + + ret = DeleteFileW( L"winetest.cat" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + ret = DeleteFileW( L"winetest.inf" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + ret = DeleteFileW( L"winetest.sys" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ + ret = DeleteFileW( L"C:/windows/system32/drivers/winetest.sys" ); + ok( ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %u\n", GetLastError() ); +} + +static BOOL pnp_driver_start( const WCHAR *resource ) +{ + static const WCHAR hardware_id[] = L"test_hardware_id\0"; + SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; + WCHAR path[MAX_PATH], filename[MAX_PATH]; + SC_HANDLE manager, service; + const CERT_CONTEXT *cert; + BOOL ret, need_reboot; + HANDLE catalog; + HDEVINFO set; + FILE *f; + + load_resource( resource, filename ); + ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); + ok( ret, "failed to move file, error %u\n", GetLastError() ); + + f = fopen( "winetest.inf", "w" ); + ok( !!f, "failed to open winetest.inf: %s\n", strerror( errno ) ); + fputs( inf_text, f ); + fclose( f ); + + /* Create the catalog file. */ + + catalog = CryptCATOpen( (WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0 ); + ok( catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %u\n", GetLastError() ); + + add_file_to_catalog( catalog, L"winetest.sys" ); + add_file_to_catalog( catalog, L"winetest.inf" ); + + ret = CryptCATPersistStore( catalog ); + todo_wine + ok( ret, "Failed to write catalog, error %u\n", GetLastError() ); + + ret = CryptCATClose( catalog ); + ok( ret, "Failed to close catalog, error %u\n", GetLastError() ); + + if (!(cert = testsign_sign( L"winetest.cat" ))) + { + ret = DeleteFileW( L"winetest.cat" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + ret = DeleteFileW( L"winetest.inf" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + ret = DeleteFileW( L"winetest.sys" ); + ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + return FALSE; + } + + /* Install the driver. */ + + set = SetupDiCreateDeviceInfoList( NULL, NULL ); + ok( set != INVALID_HANDLE_VALUE, "failed to create device list, error %u\n", GetLastError() ); + + ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); + ok( ret, "failed to create device, error %#x\n", GetLastError() ); + + ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)hardware_id, + sizeof(hardware_id) ); + ok( ret, "failed to create set hardware ID, error %u\n", GetLastError() ); + + ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); + ok( ret, "failed to register device, error %u\n", GetLastError() ); + + ret = SetupDiDestroyDeviceInfoList( set ); + ok( ret, "failed to destroy set, error %u\n", GetLastError() ); + + GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); + + ret = UpdateDriverForPlugAndPlayDevicesW( NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot ); + ok( ret, "failed to install device, error %u\n", GetLastError() ); + ok( !need_reboot, "expected no reboot necessary\n" ); + + testsign_cleanup( cert ); + + /* Check that the service is created and started. */ + manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); + ok( !!manager, "failed to open service manager, error %u\n", GetLastError() ); + + service = OpenServiceW( manager, L"winetest", SERVICE_START ); + ok( !!service, "failed to open service, error %u\n", GetLastError() ); + + ret = StartServiceW( service, 0, NULL ); + ok( !ret, "service didn't start automatically\n" ); + if (!ret && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + /* If Secure Boot is enabled or the machine is 64-bit, it will reject an unsigned driver. */ + ok( GetLastError() == ERROR_DRIVER_BLOCKED || GetLastError() == ERROR_INVALID_IMAGE_HASH, + "unexpected error %u\n", GetLastError() ); + win_skip( "Failed to start service; probably your machine doesn't accept unsigned drivers.\n" ); + } + + CloseServiceHandle( service ); + CloseServiceHandle( manager ); + return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; +} + +#define check_member_( file, line, val, exp, fmt, member ) \ + ok_( file, line )((val).member == (exp).member, "got " #member " " fmt ", expected " fmt "\n", \ + (val).member, (exp).member) +#define check_member( val, exp, fmt, member ) \ + check_member_( __FILE__, __LINE__, val, exp, fmt, member ) + +#define check_hidp_caps( a, b ) check_hidp_caps_( __LINE__, a, b ) +static inline void check_hidp_caps_( int line, HIDP_CAPS *caps, const HIDP_CAPS *exp ) +{ + check_member_( __FILE__, line, *caps, *exp, "%04x", Usage ); + check_member_( __FILE__, line, *caps, *exp, "%04x", UsagePage ); + check_member_( __FILE__, line, *caps, *exp, "%d", InputReportByteLength ); + check_member_( __FILE__, line, *caps, *exp, "%d", OutputReportByteLength ); + check_member_( __FILE__, line, *caps, *exp, "%d", FeatureReportByteLength ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberLinkCollectionNodes ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberInputButtonCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberInputValueCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberInputDataIndices ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberOutputButtonCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberOutputValueCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberOutputDataIndices ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberFeatureButtonCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberFeatureValueCaps ); + check_member_( __FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices ); +} + +#define check_hidp_link_collection_node( a, b ) check_hidp_link_collection_node_( __LINE__, a, b ) +static inline void check_hidp_link_collection_node_( int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp ) +{ + check_member_( __FILE__, line, *node, *exp, "%04x", LinkUsage ); + check_member_( __FILE__, line, *node, *exp, "%04x", LinkUsagePage ); + check_member_( __FILE__, line, *node, *exp, "%d", Parent ); + check_member_( __FILE__, line, *node, *exp, "%d", NumberOfChildren ); + check_member_( __FILE__, line, *node, *exp, "%d", NextSibling ); + check_member_( __FILE__, line, *node, *exp, "%d", FirstChild ); + check_member_( __FILE__, line, *node, *exp, "%d", CollectionType ); + check_member_( __FILE__, line, *node, *exp, "%d", IsAlias ); +} + +#define check_hidp_button_caps( a, b ) check_hidp_button_caps_( __LINE__, a, b ) +static inline void check_hidp_button_caps_( int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp ) +{ + check_member_( __FILE__, line, *caps, *exp, "%04x", UsagePage ); + check_member_( __FILE__, line, *caps, *exp, "%d", ReportID ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsAlias ); + check_member_( __FILE__, line, *caps, *exp, "%d", BitField ); + check_member_( __FILE__, line, *caps, *exp, "%d", LinkCollection ); + check_member_( __FILE__, line, *caps, *exp, "%04x", LinkUsage ); + check_member_( __FILE__, line, *caps, *exp, "%04x", LinkUsagePage ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsStringRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsDesignatorRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsAbsolute ); + + if (!caps->IsRange && !exp->IsRange) + { + check_member_( __FILE__, line, *caps, *exp, "%04x", NotRange.Usage ); + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.DataIndex ); + } + else if (caps->IsRange && exp->IsRange) + { + check_member_( __FILE__, line, *caps, *exp, "%04x", Range.UsageMin ); + check_member_( __FILE__, line, *caps, *exp, "%04x", Range.UsageMax ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DataIndexMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DataIndexMax ); + } + + if (!caps->IsRange && !exp->IsRange) + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.StringIndex ); + else if (caps->IsStringRange && exp->IsStringRange) + { + check_member_( __FILE__, line, *caps, *exp, "%d", Range.StringMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.StringMax ); + } + + if (!caps->IsDesignatorRange && !exp->IsDesignatorRange) + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.DesignatorIndex ); + else if (caps->IsDesignatorRange && exp->IsDesignatorRange) + { + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DesignatorMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DesignatorMax ); + } +} + +#define check_hidp_value_caps( a, b ) check_hidp_value_caps_( __LINE__, a, b ) +static inline void check_hidp_value_caps_( int line, HIDP_VALUE_CAPS *caps, const HIDP_VALUE_CAPS *exp ) +{ + check_member_( __FILE__, line, *caps, *exp, "%04x", UsagePage ); + check_member_( __FILE__, line, *caps, *exp, "%d", ReportID ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsAlias ); + check_member_( __FILE__, line, *caps, *exp, "%d", BitField ); + check_member_( __FILE__, line, *caps, *exp, "%d", LinkCollection ); + check_member_( __FILE__, line, *caps, *exp, "%d", LinkUsage ); + check_member_( __FILE__, line, *caps, *exp, "%d", LinkUsagePage ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsStringRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsDesignatorRange ); + check_member_( __FILE__, line, *caps, *exp, "%d", IsAbsolute ); + + check_member_( __FILE__, line, *caps, *exp, "%d", HasNull ); + check_member_( __FILE__, line, *caps, *exp, "%d", BitSize ); + check_member_( __FILE__, line, *caps, *exp, "%d", ReportCount ); + check_member_( __FILE__, line, *caps, *exp, "%d", UnitsExp ); + check_member_( __FILE__, line, *caps, *exp, "%d", Units ); + check_member_( __FILE__, line, *caps, *exp, "%d", LogicalMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", LogicalMax ); + check_member_( __FILE__, line, *caps, *exp, "%d", PhysicalMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", PhysicalMax ); + + if (!caps->IsRange && !exp->IsRange) + { + check_member_( __FILE__, line, *caps, *exp, "%04x", NotRange.Usage ); + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.DataIndex ); + } + else if (caps->IsRange && exp->IsRange) + { + check_member_( __FILE__, line, *caps, *exp, "%04x", Range.UsageMin ); + check_member_( __FILE__, line, *caps, *exp, "%04x", Range.UsageMax ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DataIndexMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DataIndexMax ); + } + + if (!caps->IsRange && !exp->IsRange) + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.StringIndex ); + else if (caps->IsStringRange && exp->IsStringRange) + { + check_member_( __FILE__, line, *caps, *exp, "%d", Range.StringMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.StringMax ); + } + + if (!caps->IsDesignatorRange && !exp->IsDesignatorRange) + check_member_( __FILE__, line, *caps, *exp, "%d", NotRange.DesignatorIndex ); + else if (caps->IsDesignatorRange && exp->IsDesignatorRange) + { + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DesignatorMin ); + check_member_( __FILE__, line, *caps, *exp, "%d", Range.DesignatorMax ); + } +} + +static BOOL sync_ioctl( HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len ) +{ + OVERLAPPED ovl = {0}; + DWORD out_len = ret_len ? *ret_len : 0; + BOOL ret; + + ovl.hEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); + ret = DeviceIoControl( file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl ); + if (!ret && GetLastError() == ERROR_IO_PENDING) + ret = GetOverlappedResult( file, &ovl, &out_len, TRUE ); + CloseHandle( ovl.hEvent ); + + if (ret_len) *ret_len = out_len; + return ret; +} + +static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polled ) +{ + const HIDP_CAPS expect_hidp_caps[] = + { + /* without report id */ + { + .Usage = HID_USAGE_GENERIC_JOYSTICK, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = 26, + .OutputReportByteLength = 3, + .FeatureReportByteLength = 22, + .NumberLinkCollectionNodes = 10, + .NumberInputButtonCaps = 17, + .NumberInputValueCaps = 7, + .NumberInputDataIndices = 47, + .NumberFeatureButtonCaps = 1, + .NumberFeatureValueCaps = 6, + .NumberFeatureDataIndices = 8, + }, + /* with report id */ + { + .Usage = HID_USAGE_GENERIC_JOYSTICK, + .UsagePage = HID_USAGE_PAGE_GENERIC, + .InputReportByteLength = 25, + .OutputReportByteLength = 2, + .FeatureReportByteLength = 21, + .NumberLinkCollectionNodes = 10, + .NumberInputButtonCaps = 17, + .NumberInputValueCaps = 7, + .NumberInputDataIndices = 47, + .NumberFeatureButtonCaps = 1, + .NumberFeatureValueCaps = 6, + .NumberFeatureDataIndices = 8, + }, + }; + const HIDP_BUTTON_CAPS expect_button_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsRange = TRUE, + .IsAbsolute = TRUE, + .Range.UsageMin = 1, + .Range.UsageMax = 8, + .Range.DataIndexMin = 2, + .Range.DataIndexMax = 9, + }, + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, + .BitField = 3, + .LinkCollection = 1, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .IsRange = TRUE, + .IsAbsolute = TRUE, + .Range.UsageMin = 0x18, + .Range.UsageMax = 0x1f, + .Range.DataIndexMin = 10, + .Range.DataIndexMax = 17, + }, + { + .UsagePage = HID_USAGE_PAGE_KEYBOARD, + .ReportID = report_id, + .BitField = 0x1fc, + .LinkCollection = 1, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .IsRange = TRUE, + .IsAbsolute = FALSE, + .Range.UsageMin = 0x8, + .Range.UsageMax = 0xf, + .Range.DataIndexMin = 18, + .Range.DataIndexMax = 25, + }, + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, + .BitField = 2, + .LinkCollection = 1, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .IsRange = FALSE, + .IsAbsolute = TRUE, + .NotRange.Usage = 0x20, + .NotRange.Reserved1 = 0x20, + .NotRange.DataIndex = 26, + .NotRange.Reserved4 = 26, + }, + }; + const HIDP_VALUE_CAPS expect_value_caps[] = + { + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 8, + .ReportCount = 1, + .LogicalMin = -128, + .LogicalMax = 127, + .NotRange.Usage = HID_USAGE_GENERIC_Y, + .NotRange.Reserved1 = HID_USAGE_GENERIC_Y, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 8, + .ReportCount = 1, + .LogicalMin = -128, + .LogicalMax = 127, + .NotRange.Usage = HID_USAGE_GENERIC_X, + .NotRange.Reserved1 = HID_USAGE_GENERIC_X, + .NotRange.DataIndex = 1, + .NotRange.Reserved4 = 1, + }, + { + .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .ReportCount = 1, + .LogicalMax = 1, + .IsRange = TRUE, + .Range.UsageMin = 0x21, + .Range.UsageMax = 0x22, + .Range.DataIndexMin = 27, + .Range.DataIndexMax = 28, + }, + { + .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, + .BitField = 2, + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, + .IsAbsolute = TRUE, + .BitSize = 4, + .ReportCount = 2, + .LogicalMin = 1, + .LogicalMax = 8, + .NotRange.Usage = HID_USAGE_GENERIC_HATSWITCH, + .NotRange.Reserved1 = HID_USAGE_GENERIC_HATSWITCH, + .NotRange.DataIndex = 29, + .NotRange.Reserved4 = 29, + }, + }; + static const HIDP_LINK_COLLECTION_NODE expect_collections[] = + { + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 1, + .NumberOfChildren = 7, + .FirstChild = 9, + }, + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 2, + }, + }; + static const HIDP_DATA expect_data[] = + { + { .DataIndex = 0, }, + { .DataIndex = 1, }, + { .DataIndex = 5, .RawValue = 1, }, + { .DataIndex = 7, .RawValue = 1, }, + { .DataIndex = 19, .RawValue = 1, }, + { .DataIndex = 21, .RawValue = 1, }, + { .DataIndex = 30, }, + { .DataIndex = 31, }, + { .DataIndex = 32, .RawValue = 0xfeedcafe, }, + { .DataIndex = 37, .RawValue = 1, }, + { .DataIndex = 39, .RawValue = 1, }, + }; + + OVERLAPPED overlapped = {0}, overlapped2 = {0}; + HIDP_LINK_COLLECTION_NODE collections[16]; + PHIDP_PREPARSED_DATA preparsed_data; + USAGE_AND_PAGE usage_and_pages[16]; + HIDP_BUTTON_CAPS button_caps[32]; + HIDP_VALUE_CAPS value_caps[16]; + char buffer[200], report[200]; + DWORD collection_count; + DWORD waveform_list; + HIDP_DATA data[64]; + USAGE usages[16]; + NTSTATUS status; + HIDP_CAPS caps; + unsigned int i; + USHORT count; + ULONG value; + BOOL ret; + + ret = HidD_GetPreparsedData( file, &preparsed_data ); + ok( ret, "HidD_GetPreparsedData failed with error %u\n", GetLastError() ); + + memset( buffer, 0, sizeof(buffer) ); + status = HidP_GetCaps( (PHIDP_PREPARSED_DATA)buffer, &caps ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetCaps returned %#x\n", status ); + status = HidP_GetCaps( preparsed_data, &caps ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status ); + check_hidp_caps( &caps, &expect_hidp_caps[report_id] ); + + collection_count = 0; + status = HidP_GetLinkCollectionNodes( collections, &collection_count, preparsed_data ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status ); + ok( collection_count == caps.NumberLinkCollectionNodes, + "got %d collection nodes, expected %d\n", collection_count, caps.NumberLinkCollectionNodes ); + collection_count = ARRAY_SIZE(collections); + status = HidP_GetLinkCollectionNodes( collections, &collection_count, (PHIDP_PREPARSED_DATA)buffer ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetLinkCollectionNodes returned %#x\n", status ); + status = HidP_GetLinkCollectionNodes( collections, &collection_count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status ); + ok( collection_count == caps.NumberLinkCollectionNodes, + "got %d collection nodes, expected %d\n", collection_count, caps.NumberLinkCollectionNodes ); + + for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) + { + winetest_push_context( "collections[%d]", i ); + check_hidp_link_collection_node( &collections[i], &expect_collections[i] ); + winetest_pop_context(); + } + + count = ARRAY_SIZE(button_caps); + status = HidP_GetButtonCaps( HidP_Output, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetButtonCaps returned %#x\n", status ); + status = HidP_GetButtonCaps( HidP_Feature + 1, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetButtonCaps returned %#x\n", status ); + count = 0; + status = HidP_GetButtonCaps( HidP_Input, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetButtonCaps returned %#x\n", status ); + ok( count == caps.NumberInputButtonCaps, "HidP_GetButtonCaps returned count %d, expected %d\n", + count, caps.NumberInputButtonCaps ); + count = ARRAY_SIZE(button_caps); + status = HidP_GetButtonCaps( HidP_Input, button_caps, &count, (PHIDP_PREPARSED_DATA)buffer ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetButtonCaps returned %#x\n", status ); + memset( button_caps, 0, sizeof(button_caps) ); + status = HidP_GetButtonCaps( HidP_Input, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetButtonCaps returned %#x\n", status ); + ok( count == caps.NumberInputButtonCaps, "HidP_GetButtonCaps returned count %d, expected %d\n", + count, caps.NumberInputButtonCaps ); + + for (i = 0; i < ARRAY_SIZE(expect_button_caps); ++i) + { + winetest_push_context( "button_caps[%d]", i ); + check_hidp_button_caps( &button_caps[i], &expect_button_caps[i] ); + winetest_pop_context(); + } + + count = ARRAY_SIZE(button_caps) - 1; + status = HidP_GetSpecificButtonCaps( HidP_Output, 0, 0, 0, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + status = HidP_GetSpecificButtonCaps( HidP_Feature + 1, 0, 0, 0, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + count = 0; + status = HidP_GetSpecificButtonCaps( HidP_Input, 0, 0, 0, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == caps.NumberInputButtonCaps, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", + count, caps.NumberInputButtonCaps ); + count = ARRAY_SIZE(button_caps) - 1; + status = HidP_GetSpecificButtonCaps( HidP_Input, 0, 0, 0, button_caps, &count, (PHIDP_PREPARSED_DATA)buffer ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + + status = HidP_GetSpecificButtonCaps( HidP_Input, 0, 0, 0, button_caps + 1, &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == caps.NumberInputButtonCaps, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", + count, caps.NumberInputButtonCaps ); + check_hidp_button_caps( &button_caps[1], &button_caps[0] ); + + status = HidP_GetSpecificButtonCaps( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, 5, button_caps + 1, + &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == 1, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 1 ); + check_hidp_button_caps( &button_caps[1], &button_caps[0] ); + + count = 0xbeef; + status = HidP_GetSpecificButtonCaps( HidP_Input, 0xfffe, 0, 0, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0 ); + count = 0xbeef; + status = HidP_GetSpecificButtonCaps( HidP_Input, 0, 0xfffe, 0, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0 ); + count = 0xbeef; + status = HidP_GetSpecificButtonCaps( HidP_Input, 0, 0, 0xfffe, button_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0 ); + + count = ARRAY_SIZE(value_caps); + status = HidP_GetValueCaps( HidP_Output, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetValueCaps returned %#x\n", status ); + status = HidP_GetValueCaps( HidP_Feature + 1, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetValueCaps returned %#x\n", status ); + count = 0; + status = HidP_GetValueCaps( HidP_Input, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetValueCaps returned %#x\n", status ); + ok( count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", + count, caps.NumberInputValueCaps ); + count = ARRAY_SIZE(value_caps); + status = HidP_GetValueCaps( HidP_Input, value_caps, &count, (PHIDP_PREPARSED_DATA)buffer ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetValueCaps returned %#x\n", status ); + status = HidP_GetValueCaps( HidP_Input, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetValueCaps returned %#x\n", status ); + ok( count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", + count, caps.NumberInputValueCaps ); + + for (i = 0; i < ARRAY_SIZE(expect_value_caps); ++i) + { + winetest_push_context( "value_caps[%d]", i ); + check_hidp_value_caps( &value_caps[i], &expect_value_caps[i] ); + winetest_pop_context(); + } + + count = ARRAY_SIZE(value_caps) - 4; + status = HidP_GetSpecificValueCaps( HidP_Output, 0, 0, 0, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status ); + status = HidP_GetSpecificValueCaps( HidP_Feature + 1, 0, 0, 0, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificValueCaps returned %#x\n", status ); + count = 0; + status = HidP_GetSpecificValueCaps( HidP_Input, 0, 0, 0, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", + count, caps.NumberInputValueCaps ); + count = ARRAY_SIZE(value_caps) - 4; + status = HidP_GetSpecificValueCaps( HidP_Input, 0, 0, 0, value_caps + 4, &count, (PHIDP_PREPARSED_DATA)buffer ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetSpecificValueCaps returned %#x\n", status ); + + status = HidP_GetSpecificValueCaps( HidP_Input, 0, 0, 0, value_caps + 4, &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", + count, caps.NumberInputValueCaps ); + check_hidp_value_caps( &value_caps[4], &value_caps[0] ); + check_hidp_value_caps( &value_caps[5], &value_caps[1] ); + check_hidp_value_caps( &value_caps[6], &value_caps[2] ); + check_hidp_value_caps( &value_caps[7], &value_caps[3] ); + + count = 1; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + value_caps + 4, &count, preparsed_data ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == 1, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 1 ); + check_hidp_value_caps( &value_caps[4], &value_caps[3] ); + + count = 0xdead; + status = HidP_GetSpecificValueCaps( HidP_Input, 0xfffe, 0, 0, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0 ); + count = 0xdead; + status = HidP_GetSpecificValueCaps( HidP_Input, 0, 0xfffe, 0, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0 ); + count = 0xdead; + status = HidP_GetSpecificValueCaps( HidP_Input, 0, 0, 0xfffe, value_caps, &count, preparsed_data ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status ); + ok( count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0 ); + + status = HidP_InitializeReportForID( HidP_Input, 0, (PHIDP_PREPARSED_DATA)buffer, report, sizeof(report) ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_InitializeReportForID returned %#x\n", status ); + status = HidP_InitializeReportForID( HidP_Feature + 1, 0, preparsed_data, report, sizeof(report) ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_InitializeReportForID returned %#x\n", status ); + status = HidP_InitializeReportForID( HidP_Input, 0, preparsed_data, report, sizeof(report) ); + ok( status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status ); + status = HidP_InitializeReportForID( HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1 ); + ok( status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status ); + status = HidP_InitializeReportForID( HidP_Input, 1 - report_id, preparsed_data, report, + caps.InputReportByteLength ); + ok( status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0, caps.InputReportByteLength ); + buffer[0] = report_id; + ok( !memcmp( buffer, report, sizeof(buffer) ), "unexpected report data\n" ); + + status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, + sizeof(buffer), preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status ); + memset( buffer, 0xcd, sizeof(buffer) ); + status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + buffer, 0, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status ); + status = HidP_SetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + buffer, 8, preparsed_data, report, caps.InputReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status ); + + status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, + sizeof(buffer), preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_GetUsageValueArray returned %#x\n", status ); + memset( buffer, 0xcd, sizeof(buffer) ); + status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + buffer, 0, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsageValueArray returned %#x\n", status ); + status = HidP_GetUsageValueArray( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, + buffer, 8, preparsed_data, report, caps.InputReportByteLength ); + todo_wine + ok( status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_GetUsageValueArray returned %#x\n", status ); + + value = -128; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0x80, "got value %x, expected %#x\n", value, 0x80 ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == -128, "got value %x, expected %#x\n", value, -128 ); + + value = 127; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 127, "got value %x, expected %#x\n", value, 127 ); + + value = 0; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + + value = 0x7fffffff; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + value = 0xdeadbeef; + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff ); + + value = 0x3fffffff; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff ); + + value = 0; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0x80000000, "got value %x, expected %#x\n", value, 0x80000000 ); + + value = 0; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + + value = 0xfeedcafe; + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, + (LONG *)&value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + status = HidP_SetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, + 0, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + + value = HidP_MaxUsageListLength( HidP_Feature + 1, 0, preparsed_data ); + ok( value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0 ); + value = HidP_MaxUsageListLength( HidP_Input, 0, preparsed_data ); + ok( value == 50, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 50 ); + value = HidP_MaxUsageListLength( HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data ); + ok( value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", + value, 32 ); + value = HidP_MaxUsageListLength( HidP_Input, HID_USAGE_PAGE_LED, preparsed_data ); + ok( value == 8, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED) returned %d, expected %d\n", + value, 8 ); + value = HidP_MaxUsageListLength( HidP_Feature, HID_USAGE_PAGE_BUTTON, preparsed_data ); + ok( value == 8, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", + value, 8 ); + value = HidP_MaxUsageListLength( HidP_Feature, HID_USAGE_PAGE_LED, preparsed_data ); + ok( value == 0, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED) returned %d, expected %d\n", + value, 0 ); + + usages[0] = 0xff; + value = 1; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsages returned %#x\n", status ); + usages[1] = 2; + usages[2] = 0xff; + value = 3; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsages returned %#x\n", status ); + usages[0] = 4; + usages[1] = 6; + value = 2; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status ); + usages[0] = 4; + usages[1] = 6; + value = 2; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_LED, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status ); + + value = ARRAY_SIZE(usages); + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status ); + ok( value == 0, "got usage count %d, expected %d\n", value, 2 ); + + usages[0] = 0x9; + usages[1] = 0xb; + usages[2] = 0xa; + value = 3; + ok( report[6] == 0, "got report[6] %x expected 0\n", report[6] ); + ok( report[7] == 0, "got report[7] %x expected 0\n", report[7] ); + memcpy( buffer, report, caps.InputReportByteLength ); + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status ); + buffer[6] = 2; + buffer[7] = 4; + ok( !memcmp( buffer, report, caps.InputReportByteLength ), "unexpected report data\n" ); + + status = HidP_SetUsageValue( HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, preparsed_data, report, + caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status ); + + value = 0xdeadbeef; + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_LED, 0, 6, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status ); + ok( value == 0xdeadbeef, "got value %x, expected %#x\n", value, 0xdeadbeef ); + + value = 1; + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsages returned %#x\n", status ); + ok( value == 2, "got usage count %d, expected %d\n", value, 2 ); + value = ARRAY_SIZE(usages); + memset( usages, 0xcd, sizeof(usages) ); + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status ); + ok( value == 2, "got usage count %d, expected %d\n", value, 2 ); + ok( usages[0] == 4, "got usages[0] %x, expected %x\n", usages[0], 4 ); + ok( usages[1] == 6, "got usages[1] %x, expected %x\n", usages[1], 6 ); + + value = ARRAY_SIZE(usages); + memset( usages, 0xcd, sizeof(usages) ); + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_LED, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status ); + ok( value == 2, "got usage count %d, expected %d\n", value, 2 ); + ok( usages[0] == 6, "got usages[0] %x, expected %x\n", usages[0], 6 ); + ok( usages[1] == 4, "got usages[1] %x, expected %x\n", usages[1], 4 ); + + value = ARRAY_SIZE(usage_and_pages); + memset( usage_and_pages, 0xcd, sizeof(usage_and_pages) ); + status = HidP_GetUsagesEx( HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, + caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status ); + ok( value == 6, "got usage count %d, expected %d\n", value, 4 ); + ok( usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", + usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON ); + ok( usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", + usage_and_pages[1].UsagePage, HID_USAGE_PAGE_BUTTON ); + ok( usage_and_pages[2].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[2] UsagePage %x, expected %x\n", + usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD ); + ok( usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", + usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD ); + ok( usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", + usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED ); + ok( usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", + usage_and_pages[5].UsagePage, HID_USAGE_PAGE_LED ); + ok( usage_and_pages[0].Usage == 4, "got usage_and_pages[0] Usage %x, expected %x\n", + usage_and_pages[0].Usage, 4 ); + ok( usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", + usage_and_pages[1].Usage, 6 ); + ok( usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", + usage_and_pages[2].Usage, 9 ); + ok( usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", + usage_and_pages[3].Usage, 11 ); + ok( usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", + usage_and_pages[4].Usage, 6 ); + ok( usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", + usage_and_pages[5].Usage, 4 ); + + value = HidP_MaxDataListLength( HidP_Feature + 1, preparsed_data ); + ok( value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0 ); + value = HidP_MaxDataListLength( HidP_Input, preparsed_data ); + ok( value == 58, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 58 ); + value = HidP_MaxDataListLength( HidP_Output, preparsed_data ); + ok( value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0 ); + value = HidP_MaxDataListLength( HidP_Feature, preparsed_data ); + ok( value == 14, "HidP_MaxDataListLength(HidP_Feature) returned %d, expected %d\n", value, 14 ); + + value = 1; + status = HidP_GetData( HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status ); + ok( value == 11, "got data count %d, expected %d\n", value, 11 ); + memset( data, 0, sizeof(data) ); + status = HidP_GetData( HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status ); + for (i = 0; i < ARRAY_SIZE(expect_data); ++i) + { + winetest_push_context( "data[%d]", i ); + check_member( data[i], expect_data[i], "%d", DataIndex ); + check_member( data[i], expect_data[i], "%d", RawValue ); + winetest_pop_context(); + } + + /* HID nary usage collections are set with 1-based usage index in their declaration order */ + + memset( report, 0, caps.InputReportByteLength ); + status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + value = 2; + usages[0] = 0x8e; + usages[1] = 0x8f; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status ); + ok( report[caps.InputReportByteLength - 2] == 3, "unexpected usage index %d, expected 3\n", + report[caps.InputReportByteLength - 2] ); + ok( report[caps.InputReportByteLength - 1] == 4, "unexpected usage index %d, expected 4\n", + report[caps.InputReportByteLength - 1] ); + status = HidP_UnsetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_UnsetUsages returned %#x\n", status ); + ok( report[caps.InputReportByteLength - 2] == 0, "unexpected usage index %d, expected 0\n", + report[caps.InputReportByteLength - 2] ); + ok( report[caps.InputReportByteLength - 1] == 0, "unexpected usage index %d, expected 0\n", + report[caps.InputReportByteLength - 1] ); + status = HidP_UnsetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, + preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_BUTTON_NOT_PRESSED, "HidP_UnsetUsages returned %#x\n", status ); + value = 1; + usages[0] = 0x8c; + status = HidP_SetUsages( HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status ); + ok( report[caps.InputReportByteLength - 2] == 1, "unexpected usage index %d, expected 1\n", + report[caps.InputReportByteLength - 2] ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, 3, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0, caps.FeatureReportByteLength ); + buffer[0] = report_id; + ok( !memcmp( buffer, report, sizeof(buffer) ), "unexpected report data\n" ); + + for (i = 0; i < caps.NumberLinkCollectionNodes; ++i) + { + if (collections[i].LinkUsagePage != HID_USAGE_PAGE_HAPTICS) continue; + if (collections[i].LinkUsage == HID_USAGE_HAPTICS_WAVEFORM_LIST) break; + } + ok( i < caps.NumberLinkCollectionNodes, + "HID_USAGE_HAPTICS_WAVEFORM_LIST collection not found\n" ); + waveform_list = i; + + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, (PHIDP_PREPARSED_DATA)buffer, + report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_SetUsageValue returned %#x\n", status ); + status = HidP_SetUsageValue( HidP_Feature + 1, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_SetUsageValue returned %#x\n", status ); + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, + caps.FeatureReportByteLength + 1 ); + ok( status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_SetUsageValue returned %#x\n", status ); + report[0] = 1 - report_id; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), + "HidP_SetUsageValue returned %#x\n", status ); + report[0] = 2; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status ); + report[0] = report_id; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status ); + + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + + memset( buffer, 0xcd, sizeof(buffer) ); + memset( buffer, 0, caps.FeatureReportByteLength ); + buffer[0] = report_id; + value = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + memcpy( buffer + 1, &value, 2 ); + ok( !memcmp( buffer, report, sizeof(buffer) ), "unexpected report data\n" ); + + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + (PHIDP_PREPARSED_DATA)buffer, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetUsageValue returned %#x\n", status ); + status = HidP_GetUsageValue( HidP_Feature + 1, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetUsageValue returned %#x\n", status ); + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength + 1 ); + ok( status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_GetUsageValue returned %#x\n", status ); + report[0] = 1 - report_id; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), + "HidP_GetUsageValue returned %#x\n", status ); + report[0] = 2; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status ); + report[0] = report_id; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status ); + + value = 0xdeadbeef; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, "got value %x, expected %#x\n", value, + HID_USAGE_HAPTICS_WAVEFORM_RUMBLE ); + + memset( buffer, 0xff, sizeof(buffer) ); + status = HidP_SetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, + HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status ); + status = HidP_SetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, + HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status ); + ok( !memcmp( report + 9, buffer, 8 ), "unexpected report data\n" ); + + memset( buffer, 0, sizeof(buffer) ); + status = HidP_GetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, + HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsageValueArray returned %#x\n", status ); + status = HidP_GetUsageValueArray( HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, + HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, + preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#x\n", status ); + memset( buffer + 16, 0xff, 8 ); + ok( !memcmp( buffer, buffer + 16, 16 ), "unexpected report value\n" ); + + value = 0x7fffffff; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0, "got value %x, expected %#x\n", value, 0 ); + value = 0xdeadbeef; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff ); + + value = 0x7fff; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0x0003ffff, "got value %x, expected %#x\n", value, 0x0003ffff ); + + value = 0; + status = HidP_SetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status ); + value = 0xdeadbeef; + status = HidP_GetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status ); + ok( value == 0xfff90000, "got value %x, expected %#x\n", value, 0xfff90000 ); + status = HidP_SetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + 0x1000, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status ); + value = 0; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0xfffff518, "got value %x, expected %#x\n", value, 0xfffff518 ); + status = HidP_SetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + 0, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status ); + value = 0; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0xfffff45e, "got value %x, expected %#x\n", value, 0xfffff45e ); + status = HidP_SetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + 0xdead, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status ); + value = 0; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0xfffffe7d, "got value %x, expected %#x\n", value, 0xfffffe7d ); + status = HidP_SetScaledUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + 0xbeef, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status ); + value = 0; + status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, + &value, preparsed_data, report, caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); + ok( value == 0xfffffd0b, "got value %x, expected %#x\n", value, 0xfffffd0b ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, 0 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, caps.InputReportByteLength - 1 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_GetInputReport( file, buffer, caps.InputReportByteLength ); + if (report_id || broken( !ret ) /* w7u */) + { + ok( !ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); + } + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, caps.InputReportByteLength ); + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + SetLastError( 0xdeadbeef ); + value = caps.InputReportByteLength * 2; + ret = sync_ioctl( file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value ); + ok( ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError() ); + ok( value == 3, "got length %u, expected 3\n", value ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, 0 ); + ok( !ret, "HidD_GetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, caps.FeatureReportByteLength - 1 ); + ok( !ret, "HidD_GetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetFeature returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_GetFeature( file, buffer, caps.FeatureReportByteLength ); + if (report_id || broken( !ret )) + { + ok( !ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetFeature returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); + ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); + } + + SetLastError( 0xdeadbeef ); + ret = HidD_GetFeature( file, report, caps.FeatureReportByteLength ); + ok( ret, "HidD_GetFeature failed, last error %u\n", GetLastError() ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + value = caps.FeatureReportByteLength * 2; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &value ); + ok( ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError() ); + ok( value == 3, "got length %u, expected 3\n", value ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Feature, report_id, preparsed_data, report, + caps.FeatureReportByteLength ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetFeature( file, report, 0 ); + ok( !ret, "HidD_SetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetFeature returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetFeature( file, report, caps.FeatureReportByteLength - 1 ); + ok( !ret, "HidD_SetFeature succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetFeature returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_SetFeature( file, buffer, caps.FeatureReportByteLength ); + if (report_id || broken( !ret )) + { + ok( !ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetFeature returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_SetFeature failed, last error %u\n", GetLastError() ); + } + + SetLastError( 0xdeadbeef ); + ret = HidD_SetFeature( file, report, caps.FeatureReportByteLength ); + ok( ret, "HidD_SetFeature failed, last error %u\n", GetLastError() ); + + value = caps.FeatureReportByteLength * 2; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_FEATURE, NULL, 0, report, &value ); + ok( !ret, "IOCTL_HID_SET_FEATURE succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_FEATURE returned error %u\n", + GetLastError() ); + value = 0; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_FEATURE, report, caps.FeatureReportByteLength * 2, NULL, &value ); + ok( ret, "IOCTL_HID_SET_FEATURE failed, last error %u\n", GetLastError() ); + ok( value == 3, "got length %u, expected 3\n", value ); + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Output, report_id, preparsed_data, report, caps.OutputReportByteLength ); + ok( status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status ); + memset( report, 0, caps.OutputReportByteLength ); + report[0] = report_id; + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, 0 ); + ok( !ret, "HidD_SetOutputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, caps.OutputReportByteLength - 1 ); + ok( !ret, "HidD_SetOutputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetOutputReport returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_SetOutputReport( file, buffer, caps.OutputReportByteLength ); + if (report_id || broken( !ret )) + { + ok( !ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_SetOutputReport returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); + } + + SetLastError( 0xdeadbeef ); + ret = HidD_SetOutputReport( file, report, caps.OutputReportByteLength ); + ok( ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError() ); + + value = caps.OutputReportByteLength * 2; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &value ); + ok( !ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, + "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError() ); + value = 0; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_OUTPUT_REPORT, report, caps.OutputReportByteLength * 2, NULL, &value ); + ok( ret, "IOCTL_HID_SET_OUTPUT_REPORT failed, last error %u\n", GetLastError() ); + ok( value == 3, "got length %u, expected 3\n", value ); + + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, 0, &value, NULL ); + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "WriteFile returned error %u\n", GetLastError() ); + ok( value == 0, "WriteFile returned %x\n", value ); + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, caps.OutputReportByteLength - 1, &value, NULL ); + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_USER_BUFFER, + "WriteFile returned error %u\n", GetLastError() ); + ok( value == 0, "WriteFile returned %x\n", value ); + + memset( report, 0xcd, sizeof(report) ); + report[0] = 0xa5; + SetLastError( 0xdeadbeef ); + ret = WriteFile( file, report, caps.OutputReportByteLength * 2, &value, NULL ); + if (report_id || broken( !ret ) /* w7u */) + { + ok( !ret, "WriteFile succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "WriteFile returned error %u\n", GetLastError() ); + ok( value == 0, "WriteFile wrote %u\n", value ); + SetLastError( 0xdeadbeef ); + report[0] = report_id; + ret = WriteFile( file, report, caps.OutputReportByteLength, &value, NULL ); + } + + if (report_id) + { + ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); + ok( value == 2, "WriteFile wrote %u\n", value ); + } + else + { + ok( ret, "WriteFile failed, last error %u\n", GetLastError() ); + ok( value == 3, "WriteFile wrote %u\n", value ); + } + + memset( report, 0xcd, sizeof(report) ); + SetLastError( 0xdeadbeef ); + ret = ReadFile( file, report, 0, &value, NULL ); + ok( !ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", + GetLastError() ); + ok( value == 0, "ReadFile returned %x\n", value ); + SetLastError( 0xdeadbeef ); + ret = ReadFile( file, report, caps.InputReportByteLength - 1, &value, NULL ); + ok( !ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", + GetLastError() ); + ok( value == 0, "ReadFile returned %x\n", value ); + + if (polled) + { + memset( report, 0xcd, sizeof(report) ); + SetLastError( 0xdeadbeef ); + ret = ReadFile( file, report, caps.InputReportByteLength, &value, NULL ); + ok( ret, "ReadFile failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "ReadFile returned %x\n", value ); + ok( report[0] == report_id, "unexpected report data\n" ); + + overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); + overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); + + /* drain available input reports */ + SetLastError( 0xdeadbeef ); + while (ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped )) + ResetEvent( overlapped.hEvent ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + ResetEvent( overlapped.hEvent ); + + memcpy( buffer, report, caps.InputReportByteLength ); + memcpy( buffer + caps.InputReportByteLength, report, caps.InputReportByteLength ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value ); + ok( memcmp( report, buffer + caps.InputReportByteLength, caps.InputReportByteLength ), + "expected different report\n" ); + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + + CloseHandle( overlapped.hEvent ); + CloseHandle( overlapped2.hEvent ); + } + + HidD_FreePreparsedData( preparsed_data ); +} + +static void test_hid_device( DWORD report_id, DWORD polled ) +{ + char buffer[FIELD_OFFSET( SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath[MAX_PATH] )]; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(SP_DEVICE_INTERFACE_DATA)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail = (void *)buffer; + SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; + ULONG count, poll_freq, out_len; + HANDLE file, async_file; + BOOL ret, found = FALSE; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + + winetest_push_context( "id %d%s", report_id, polled ? " poll" : "" ); + + set = SetupDiGetClassDevsW( &GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + ok( set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError() ); + + for (i = 0; SetupDiEnumDeviceInfo( set, i, &device ); ++i) + { + ret = SetupDiEnumDeviceInterfaces( set, &device, &GUID_DEVINTERFACE_HID, 0, &iface ); + ok( ret, "failed to get interface, error %#x\n", GetLastError() ); + ok( IsEqualGUID( &iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID ), "wrong class %s\n", + debugstr_guid( &iface.InterfaceClassGuid ) ); + ok( iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags ); + + iface_detail->cbSize = sizeof(*iface_detail); + ret = SetupDiGetDeviceInterfaceDetailW( set, &iface, iface_detail, sizeof(buffer), NULL, NULL ); + ok( ret, "failed to get interface path, error %#x\n", GetLastError() ); + + if (wcsstr( iface_detail->DevicePath, L"\\\\?\\hid#winetest#1" )) + { + found = TRUE; + break; + } + } + + SetupDiDestroyDeviceInfoList( set ); + + todo_wine + ok( found, "didn't find device\n" ); + + file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); + + count = 0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = HidD_GetNumInputBuffers( file, &count ); + ok( ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError() ); + ok( count == 32, "HidD_GetNumInputBuffers returned %u\n", count ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetNumInputBuffers( file, 1 ); + ok( !ret, "HidD_SetNumInputBuffers succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", + GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = HidD_SetNumInputBuffers( file, 513 ); + ok( !ret, "HidD_SetNumInputBuffers succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", + GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetNumInputBuffers( file, 16 ); + ok( ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError() ); + + count = 0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = HidD_GetNumInputBuffers( file, &count ); + ok( ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError() ); + ok( count == 16, "HidD_GetNumInputBuffers returned %u\n", count ); + + async_file = CreateFileW( iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL ); + ok( async_file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); + + count = 0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = HidD_GetNumInputBuffers( async_file, &count ); + ok( ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError() ); + ok( count == 32, "HidD_GetNumInputBuffers returned %u\n", count ); + + SetLastError( 0xdeadbeef ); + ret = HidD_SetNumInputBuffers( async_file, 2 ); + ok( ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError() ); + + count = 0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = HidD_GetNumInputBuffers( async_file, &count ); + ok( ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError() ); + ok( count == 2, "HidD_GetNumInputBuffers returned %u\n", count ); + count = 0xdeadbeef; + SetLastError( 0xdeadbeef ); + ret = HidD_GetNumInputBuffers( file, &count ); + ok( ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError() ); + ok( count == 16, "HidD_GetNumInputBuffers returned %u\n", count ); + + if (polled) + { + out_len = sizeof(ULONG); + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len ); + ok( ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len ); + todo_wine + ok( poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq ); + + out_len = 0; + poll_freq = 500; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == 0, "got out_len %u, expected 0\n", out_len ); + + out_len = 0; + poll_freq = 10001; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == 0, "got out_len %u, expected 0\n", out_len ); + + out_len = 0; + poll_freq = 0; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == 0, "got out_len %u, expected 0\n", out_len ); + + out_len = sizeof(ULONG); + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len ); + ok( ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len ); + ok( poll_freq == 10000, "got poll_freq %u, expected 10000\n", poll_freq ); + + out_len = 0; + poll_freq = 500; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == 0, "got out_len %u, expected 0\n", out_len ); + + out_len = sizeof(ULONG); + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len ); + ok( ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + ok( out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len ); + ok( poll_freq == 500, "got poll_freq %u, expected 500\n", poll_freq ); + } + + test_hidp( file, async_file, report_id, polled ); + + CloseHandle( async_file ); + CloseHandle( file ); + + RtlInitUnicodeString( &string, L"\\??\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}" ); + InitializeObjectAttributes( &attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL ); + status = NtOpenFile( &file, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + todo_wine + ok( status == STATUS_UNSUCCESSFUL, "got %#x\n", status ); + + winetest_pop_context(); +} + +static void test_hid_driver( DWORD report_id, DWORD polled ) +{ + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + LSTATUS status; + HKEY hkey; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + status = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", + 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL ); + ok( !status, "RegCreateKeyExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + status = RegSetValueExW( hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled) ); + ok( !status, "RegSetValueExW returned %#x\n", status ); + + if (pnp_driver_start( L"driver_hid.dll" )) test_hid_device( report_id, polled ); + + pnp_driver_stop(); + SetCurrentDirectoryW( cwd ); +} + +START_TEST( hid ) +{ + HANDLE mapping; + BOOL is_wow64; + + pSignerSign = (void *)GetProcAddress( LoadLibraryW( L"mssign32" ), "SignerSign" ); + + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + skip( "Running in WoW64.\n" ); + return; + } + + mapping = CreateFileMappingW( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, sizeof(*test_data), + L"Global\\winetest_dinput_section" ); + if (!mapping && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip( "Failed to create test data mapping.\n" ); + return; + } + ok( !!mapping, "got error %u\n", GetLastError() ); + test_data = MapViewOfFile( mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024 ); + test_data->running_under_wine = !strcmp( winetest_platform, "wine" ); + test_data->winetest_report_success = winetest_report_success; + test_data->winetest_debug = winetest_debug; + + okfile = CreateFileW( L"C:\\windows\\winetest_dinput_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL ); + ok( okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + + subtest( "driver_hid" ); + test_hid_driver( 0, FALSE ); + test_hid_driver( 1, FALSE ); + test_hid_driver( 0, TRUE ); + test_hid_driver( 1, TRUE ); + + UnmapViewOfFile( test_data ); + CloseHandle( mapping ); + CloseHandle( okfile ); + DeleteFileW( L"C:\\windows\\winetest_dinput_okfile" ); +} diff --git a/dlls/dinput8/tests/pop_hid_macros.h b/dlls/dinput8/tests/pop_hid_macros.h new file mode 100644 index 00000000000..767c26e8ecb --- /dev/null +++ b/dlls/dinput8/tests/pop_hid_macros.h @@ -0,0 +1,83 @@ +/* + * HID report helper macros. + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#undef Data +#undef Cnst +#undef Array +#undef Var +#undef Abs +#undef Rel +#undef NoWrap +#undef Wrap +#undef NonLin +#undef Lin +#undef NoPref +#undef Pref +#undef NoNull +#undef Null +#undef NonVol +#undef Vol +#undef Bits +#undef Buff + +#undef Physical +#undef Application +#undef Logical +#undef Report +#undef NamedArray +#undef UsageSwitch +#undef UsageModifier + +#undef SHORT_ITEM_0 +#undef SHORT_ITEM_1 +#undef SHORT_ITEM_2 +#undef SHORT_ITEM_4 + +#undef LONG_ITEM + +#undef INPUT +#undef OUTPUT +#undef FEATURE +#undef COLLECTION +#undef END_COLLECTION + +#undef USAGE_PAGE +#undef LOGICAL_MINIMUM +#undef LOGICAL_MAXIMUM +#undef PHYSICAL_MINIMUM +#undef PHYSICAL_MAXIMUM +#undef UNIT_EXPONENT +#undef UNIT +#undef REPORT_SIZE +#undef REPORT_ID +#undef REPORT_COUNT +#undef PUSH +#undef POP + +#undef USAGE +#undef USAGE_MINIMUM +#undef USAGE_MAXIMUM +#undef DESIGNATOR_INDEX +#undef DESIGNATOR_MINIMUM +#undef DESIGNATOR_MAXIMUM +#undef STRING_INDEX +#undef STRING_MINIMUM +#undef STRING_MAXIMUM +#undef DELIMITER diff --git a/dlls/dinput8/tests/psh_hid_macros.h b/dlls/dinput8/tests/psh_hid_macros.h new file mode 100644 index 00000000000..4623af20598 --- /dev/null +++ b/dlls/dinput8/tests/psh_hid_macros.h @@ -0,0 +1,85 @@ +/* + * HID report helper macros. + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <hidusage.h> + +#define Data 0 +#define Cnst 0x01 +#define Ary 0 +#define Var 0x02 +#define Abs 0 +#define Rel 0x04 +#define NoWrap 0 +#define Wrap 0x08 +#define NonLin 0 +#define Lin 0x10 +#define NoPref 0 +#define Pref 0x20 +#define NoNull 0 +#define Null 0x40 +#define NonVol 0 +#define Vol 0x80 +#define Bits 0 +#define Buff 0x100 + +#define Physical 0x00 +#define Application 0x01 +#define Logical 0x02 +#define Report 0x03 +#define NamedArray 0x04 +#define UsageSwitch 0x05 +#define UsageModifier 0x06 + +#define SHORT_ITEM_0(tag,type) (((tag)<<4)|((type)<<2)|0) +#define SHORT_ITEM_1(tag,type,data) (((tag)<<4)|((type)<<2)|1),((data)&0xff) +#define SHORT_ITEM_2(tag,type,data) (((tag)<<4)|((type)<<2)|2),((data)&0xff),(((data)>>8)&0xff) +#define SHORT_ITEM_4(tag,type,data) (((tag)<<4)|((type)<<2)|3),((data)&0xff),(((data)>>8)&0xff),(((data)>>16)&0xff),(((data)>>24)&0xff) + +#define LONG_ITEM(tag,size) SHORT_ITEM_2(0xf,0x3,((tag)<<8)|(size)) + +#define INPUT(n,data) SHORT_ITEM_##n(0x8,0,data) +#define OUTPUT(n,data) SHORT_ITEM_##n(0x9,0,data) +#define FEATURE(n,data) SHORT_ITEM_##n(0xb,0,data) +#define COLLECTION(n,data) SHORT_ITEM_##n(0xa,0,data) +#define END_COLLECTION SHORT_ITEM_0(0xc,0) + +#define USAGE_PAGE(n,data) SHORT_ITEM_##n(0x0,1,data) +#define LOGICAL_MINIMUM(n,data) SHORT_ITEM_##n(0x1,1,data) +#define LOGICAL_MAXIMUM(n,data) SHORT_ITEM_##n(0x2,1,data) +#define PHYSICAL_MINIMUM(n,data) SHORT_ITEM_##n(0x3,1,data) +#define PHYSICAL_MAXIMUM(n,data) SHORT_ITEM_##n(0x4,1,data) +#define UNIT_EXPONENT(n,data) SHORT_ITEM_##n(0x5,1,data) +#define UNIT(n,data) SHORT_ITEM_##n(0x6,1,data) +#define REPORT_SIZE(n,data) SHORT_ITEM_##n(0x7,1,data) +#define REPORT_ID(n,data) SHORT_ITEM_##n(0x8,1,data) +#define REPORT_COUNT(n,data) SHORT_ITEM_##n(0x9,1,data) +#define PUSH(n,data) SHORT_ITEM_##n(0xa,1,data) +#define POP(n,data) SHORT_ITEM_##n(0xb,1,data) + +#define USAGE(n,data) SHORT_ITEM_##n(0x0,2,data) +#define USAGE_MINIMUM(n,data) SHORT_ITEM_##n(0x1,2,data) +#define USAGE_MAXIMUM(n,data) SHORT_ITEM_##n(0x2,2,data) +#define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) +#define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) +#define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 85a6925138a..ab1db85adbb 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -7,8 +7,6 @@ driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass -driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal @@ -21,8 +19,6 @@ SOURCES = \ driver2.spec \ driver3.c \ driver3.spec \ - driver_hid.c \ - driver_hid.spec \ driver_netio.c \ driver_netio.spec \ driver_pnp.c \ diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..a6e52a17389 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1825,1594 +1825,6 @@ static void test_pnp_driver(struct testsign_context *ctx) SetCurrentDirectoryA(cwd); } -#define check_member_(file, line, val, exp, fmt, member) \ - ok_(file, line)((val).member == (exp).member, \ - "got " #member " " fmt ", expected " fmt "\n", \ - (val).member, (exp).member) -#define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member) - -#define check_hidp_caps(a, b) check_hidp_caps_(__LINE__, a, b) -static inline void check_hidp_caps_(int line, HIDP_CAPS *caps, const HIDP_CAPS *exp) -{ - check_member_(__FILE__, line, *caps, *exp, "%04x", Usage); - check_member_(__FILE__, line, *caps, *exp, "%04x", UsagePage); - check_member_(__FILE__, line, *caps, *exp, "%d", InputReportByteLength); - check_member_(__FILE__, line, *caps, *exp, "%d", OutputReportByteLength); - check_member_(__FILE__, line, *caps, *exp, "%d", FeatureReportByteLength); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberLinkCollectionNodes); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputButtonCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputValueCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputDataIndices); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputButtonCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputValueCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputDataIndices); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureButtonCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureValueCaps); - check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices); -} - -#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) -static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, - const HIDP_LINK_COLLECTION_NODE *exp) -{ - check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); - check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); - check_member_(__FILE__, line, *node, *exp, "%d", Parent); - check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); - check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); - check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); - check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); - check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); -} - -#define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) -static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) -{ - check_member_(__FILE__, line, *caps, *exp, "%04x", UsagePage); - check_member_(__FILE__, line, *caps, *exp, "%d", ReportID); - check_member_(__FILE__, line, *caps, *exp, "%d", IsAlias); - check_member_(__FILE__, line, *caps, *exp, "%d", BitField); - check_member_(__FILE__, line, *caps, *exp, "%d", LinkCollection); - check_member_(__FILE__, line, *caps, *exp, "%04x", LinkUsage); - check_member_(__FILE__, line, *caps, *exp, "%04x", LinkUsagePage); - check_member_(__FILE__, line, *caps, *exp, "%d", IsRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsStringRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsDesignatorRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsAbsolute); - - if (!caps->IsRange && !exp->IsRange) - { - check_member_(__FILE__, line, *caps, *exp, "%04x", NotRange.Usage); - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.DataIndex); - } - else if (caps->IsRange && exp->IsRange) - { - check_member_(__FILE__, line, *caps, *exp, "%04x", Range.UsageMin); - check_member_(__FILE__, line, *caps, *exp, "%04x", Range.UsageMax); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DataIndexMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DataIndexMax); - } - - if (!caps->IsRange && !exp->IsRange) - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.StringIndex); - else if (caps->IsStringRange && exp->IsStringRange) - { - check_member_(__FILE__, line, *caps, *exp, "%d", Range.StringMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.StringMax); - } - - if (!caps->IsDesignatorRange && !exp->IsDesignatorRange) - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.DesignatorIndex); - else if (caps->IsDesignatorRange && exp->IsDesignatorRange) - { - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DesignatorMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DesignatorMax); - } -} - -#define check_hidp_value_caps(a, b) check_hidp_value_caps_(__LINE__, a, b) -static inline void check_hidp_value_caps_(int line, HIDP_VALUE_CAPS *caps, const HIDP_VALUE_CAPS *exp) -{ - check_member_(__FILE__, line, *caps, *exp, "%04x", UsagePage); - check_member_(__FILE__, line, *caps, *exp, "%d", ReportID); - check_member_(__FILE__, line, *caps, *exp, "%d", IsAlias); - check_member_(__FILE__, line, *caps, *exp, "%d", BitField); - check_member_(__FILE__, line, *caps, *exp, "%d", LinkCollection); - check_member_(__FILE__, line, *caps, *exp, "%d", LinkUsage); - check_member_(__FILE__, line, *caps, *exp, "%d", LinkUsagePage); - check_member_(__FILE__, line, *caps, *exp, "%d", IsRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsStringRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsDesignatorRange); - check_member_(__FILE__, line, *caps, *exp, "%d", IsAbsolute); - - check_member_(__FILE__, line, *caps, *exp, "%d", HasNull); - check_member_(__FILE__, line, *caps, *exp, "%d", BitSize); - check_member_(__FILE__, line, *caps, *exp, "%d", ReportCount); - check_member_(__FILE__, line, *caps, *exp, "%d", UnitsExp); - check_member_(__FILE__, line, *caps, *exp, "%d", Units); - check_member_(__FILE__, line, *caps, *exp, "%d", LogicalMin); - check_member_(__FILE__, line, *caps, *exp, "%d", LogicalMax); - check_member_(__FILE__, line, *caps, *exp, "%d", PhysicalMin); - check_member_(__FILE__, line, *caps, *exp, "%d", PhysicalMax); - - if (!caps->IsRange && !exp->IsRange) - { - check_member_(__FILE__, line, *caps, *exp, "%04x", NotRange.Usage); - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.DataIndex); - } - else if (caps->IsRange && exp->IsRange) - { - check_member_(__FILE__, line, *caps, *exp, "%04x", Range.UsageMin); - check_member_(__FILE__, line, *caps, *exp, "%04x", Range.UsageMax); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DataIndexMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DataIndexMax); - } - - if (!caps->IsRange && !exp->IsRange) - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.StringIndex); - else if (caps->IsStringRange && exp->IsStringRange) - { - check_member_(__FILE__, line, *caps, *exp, "%d", Range.StringMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.StringMax); - } - - if (!caps->IsDesignatorRange && !exp->IsDesignatorRange) - check_member_(__FILE__, line, *caps, *exp, "%d", NotRange.DesignatorIndex); - else if (caps->IsDesignatorRange && exp->IsDesignatorRange) - { - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DesignatorMin); - check_member_(__FILE__, line, *caps, *exp, "%d", Range.DesignatorMax); - } -} - -static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len) -{ - OVERLAPPED ovl = {0}; - DWORD out_len = ret_len ? *ret_len : 0; - BOOL ret; - - ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl); - if (!ret && GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, &out_len, TRUE); - CloseHandle(ovl.hEvent); - - if (ret_len) *ret_len = out_len; - return ret; -} - -static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled) -{ - const HIDP_CAPS expect_hidp_caps[] = - { - /* without report id */ - { - .Usage = HID_USAGE_GENERIC_JOYSTICK, - .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 26, - .OutputReportByteLength = 3, - .FeatureReportByteLength = 22, - .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 17, - .NumberInputValueCaps = 7, - .NumberInputDataIndices = 47, - .NumberFeatureButtonCaps = 1, - .NumberFeatureValueCaps = 6, - .NumberFeatureDataIndices = 8, - }, - /* with report id */ - { - .Usage = HID_USAGE_GENERIC_JOYSTICK, - .UsagePage = HID_USAGE_PAGE_GENERIC, - .InputReportByteLength = 25, - .OutputReportByteLength = 2, - .FeatureReportByteLength = 21, - .NumberLinkCollectionNodes = 10, - .NumberInputButtonCaps = 17, - .NumberInputValueCaps = 7, - .NumberInputDataIndices = 47, - .NumberFeatureButtonCaps = 1, - .NumberFeatureValueCaps = 6, - .NumberFeatureDataIndices = 8, - }, - }; - const HIDP_BUTTON_CAPS expect_button_caps[] = - { - { - .UsagePage = HID_USAGE_PAGE_BUTTON, - .ReportID = report_id, - .BitField = 2, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .LinkCollection = 1, - .IsRange = TRUE, - .IsAbsolute = TRUE, - .Range.UsageMin = 1, - .Range.UsageMax = 8, - .Range.DataIndexMin = 2, - .Range.DataIndexMax = 9, - }, - { - .UsagePage = HID_USAGE_PAGE_BUTTON, - .ReportID = report_id, - .BitField = 3, - .LinkCollection = 1, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .IsRange = TRUE, - .IsAbsolute = TRUE, - .Range.UsageMin = 0x18, - .Range.UsageMax = 0x1f, - .Range.DataIndexMin = 10, - .Range.DataIndexMax = 17, - }, - { - .UsagePage = HID_USAGE_PAGE_KEYBOARD, - .ReportID = report_id, - .BitField = 0x1fc, - .LinkCollection = 1, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .IsRange = TRUE, - .IsAbsolute = FALSE, - .Range.UsageMin = 0x8, - .Range.UsageMax = 0xf, - .Range.DataIndexMin = 18, - .Range.DataIndexMax = 25, - }, - { - .UsagePage = HID_USAGE_PAGE_BUTTON, - .ReportID = report_id, - .BitField = 2, - .LinkCollection = 1, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .IsRange = FALSE, - .IsAbsolute = TRUE, - .NotRange.Usage = 0x20, - .NotRange.Reserved1 = 0x20, - .NotRange.DataIndex = 26, - .NotRange.Reserved4 = 26, - }, - }; - const HIDP_VALUE_CAPS expect_value_caps[] = - { - { - .UsagePage = HID_USAGE_PAGE_GENERIC, - .ReportID = report_id, - .BitField = 2, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .LinkCollection = 1, - .IsAbsolute = TRUE, - .BitSize = 8, - .ReportCount = 1, - .LogicalMin = -128, - .LogicalMax = 127, - .NotRange.Usage = HID_USAGE_GENERIC_Y, - .NotRange.Reserved1 = HID_USAGE_GENERIC_Y, - }, - { - .UsagePage = HID_USAGE_PAGE_GENERIC, - .ReportID = report_id, - .BitField = 2, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .LinkCollection = 1, - .IsAbsolute = TRUE, - .BitSize = 8, - .ReportCount = 1, - .LogicalMin = -128, - .LogicalMax = 127, - .NotRange.Usage = HID_USAGE_GENERIC_X, - .NotRange.Reserved1 = HID_USAGE_GENERIC_X, - .NotRange.DataIndex = 1, - .NotRange.Reserved4 = 1, - }, - { - .UsagePage = HID_USAGE_PAGE_BUTTON, - .ReportID = report_id, - .BitField = 2, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .LinkCollection = 1, - .IsAbsolute = TRUE, - .ReportCount = 1, - .LogicalMax = 1, - .IsRange = TRUE, - .Range.UsageMin = 0x21, - .Range.UsageMax = 0x22, - .Range.DataIndexMin = 27, - .Range.DataIndexMax = 28, - }, - { - .UsagePage = HID_USAGE_PAGE_GENERIC, - .ReportID = report_id, - .BitField = 2, - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .LinkCollection = 1, - .IsAbsolute = TRUE, - .BitSize = 4, - .ReportCount = 2, - .LogicalMin = 1, - .LogicalMax = 8, - .NotRange.Usage = HID_USAGE_GENERIC_HATSWITCH, - .NotRange.Reserved1 = HID_USAGE_GENERIC_HATSWITCH, - .NotRange.DataIndex = 29, - .NotRange.Reserved4 = 29, - }, - }; - static const HIDP_LINK_COLLECTION_NODE expect_collections[] = - { - { - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .CollectionType = 1, - .NumberOfChildren = 7, - .FirstChild = 9, - }, - { - .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, - .LinkUsagePage = HID_USAGE_PAGE_GENERIC, - .CollectionType = 2, - }, - }; - static const HIDP_DATA expect_data[] = - { - { .DataIndex = 0, }, - { .DataIndex = 1, }, - { .DataIndex = 5, .RawValue = 1, }, - { .DataIndex = 7, .RawValue = 1, }, - { .DataIndex = 19, .RawValue = 1, }, - { .DataIndex = 21, .RawValue = 1, }, - { .DataIndex = 30, }, - { .DataIndex = 31, }, - { .DataIndex = 32, .RawValue = 0xfeedcafe, }, - { .DataIndex = 37, .RawValue = 1, }, - { .DataIndex = 39, .RawValue = 1, }, - }; - - OVERLAPPED overlapped = {0}, overlapped2 = {0}; - HIDP_LINK_COLLECTION_NODE collections[16]; - PHIDP_PREPARSED_DATA preparsed_data; - USAGE_AND_PAGE usage_and_pages[16]; - HIDP_BUTTON_CAPS button_caps[32]; - HIDP_VALUE_CAPS value_caps[16]; - char buffer[200], report[200]; - DWORD collection_count; - DWORD waveform_list; - HIDP_DATA data[64]; - USAGE usages[16]; - NTSTATUS status; - HIDP_CAPS caps; - unsigned int i; - USHORT count; - ULONG value; - BOOL ret; - - ret = HidD_GetPreparsedData(file, &preparsed_data); - ok(ret, "HidD_GetPreparsedData failed with error %u\n", GetLastError()); - - memset(buffer, 0, sizeof(buffer)); - status = HidP_GetCaps((PHIDP_PREPARSED_DATA)buffer, &caps); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetCaps returned %#x\n", status); - status = HidP_GetCaps(preparsed_data, &caps); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status); - check_hidp_caps(&caps, &expect_hidp_caps[report_id]); - - collection_count = 0; - status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); - ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", - collection_count, caps.NumberLinkCollectionNodes); - collection_count = ARRAY_SIZE(collections); - status = HidP_GetLinkCollectionNodes(collections, &collection_count, (PHIDP_PREPARSED_DATA)buffer); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetLinkCollectionNodes returned %#x\n", status); - status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetLinkCollectionNodes returned %#x\n", status); - ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", - collection_count, caps.NumberLinkCollectionNodes); - - for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) - { - winetest_push_context("collections[%d]", i); - check_hidp_link_collection_node(&collections[i], &expect_collections[i]); - winetest_pop_context(); - } - - count = ARRAY_SIZE(button_caps); - status = HidP_GetButtonCaps(HidP_Output, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetButtonCaps returned %#x\n", status); - status = HidP_GetButtonCaps(HidP_Feature + 1, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetButtonCaps returned %#x\n", status); - count = 0; - status = HidP_GetButtonCaps(HidP_Input, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetButtonCaps returned %#x\n", status); - ok(count == caps.NumberInputButtonCaps, "HidP_GetButtonCaps returned count %d, expected %d\n", - count, caps.NumberInputButtonCaps); - count = ARRAY_SIZE(button_caps); - status = HidP_GetButtonCaps(HidP_Input, button_caps, &count, (PHIDP_PREPARSED_DATA)buffer); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetButtonCaps returned %#x\n", status); - memset(button_caps, 0, sizeof(button_caps)); - status = HidP_GetButtonCaps(HidP_Input, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetButtonCaps returned %#x\n", status); - ok(count == caps.NumberInputButtonCaps, "HidP_GetButtonCaps returned count %d, expected %d\n", - count, caps.NumberInputButtonCaps); - - for (i = 0; i < ARRAY_SIZE(expect_button_caps); ++i) - { - winetest_push_context("button_caps[%d]", i); - check_hidp_button_caps(&button_caps[i], &expect_button_caps[i]); - winetest_pop_context(); - } - - count = ARRAY_SIZE(button_caps) - 1; - status = HidP_GetSpecificButtonCaps(HidP_Output, 0, 0, 0, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status); - status = HidP_GetSpecificButtonCaps(HidP_Feature + 1, 0, 0, 0, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificButtonCaps returned %#x\n", status); - count = 0; - status = HidP_GetSpecificButtonCaps(HidP_Input, 0, 0, 0, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == caps.NumberInputButtonCaps, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", - count, caps.NumberInputButtonCaps); - count = ARRAY_SIZE(button_caps) - 1; - status = HidP_GetSpecificButtonCaps(HidP_Input, 0, 0, 0, button_caps, &count, (PHIDP_PREPARSED_DATA)buffer); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetSpecificButtonCaps returned %#x\n", status); - - status = HidP_GetSpecificButtonCaps(HidP_Input, 0, 0, 0, button_caps + 1, &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == caps.NumberInputButtonCaps, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", - count, caps.NumberInputButtonCaps); - check_hidp_button_caps(&button_caps[1], &button_caps[0]); - - status = HidP_GetSpecificButtonCaps(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, 5, button_caps + 1, - &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == 1, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 1); - check_hidp_button_caps(&button_caps[1], &button_caps[0]); - - count = 0xbeef; - status = HidP_GetSpecificButtonCaps(HidP_Input, 0xfffe, 0, 0, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0); - count = 0xbeef; - status = HidP_GetSpecificButtonCaps(HidP_Input, 0, 0xfffe, 0, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0); - count = 0xbeef; - status = HidP_GetSpecificButtonCaps(HidP_Input, 0, 0, 0xfffe, button_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificButtonCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificButtonCaps returned count %d, expected %d\n", count, 0); - - count = ARRAY_SIZE(value_caps); - status = HidP_GetValueCaps(HidP_Output, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetValueCaps returned %#x\n", status); - status = HidP_GetValueCaps(HidP_Feature + 1, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetValueCaps returned %#x\n", status); - count = 0; - status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetValueCaps returned %#x\n", status); - ok(count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", - count, caps.NumberInputValueCaps); - count = ARRAY_SIZE(value_caps); - status = HidP_GetValueCaps(HidP_Input, value_caps, &count, (PHIDP_PREPARSED_DATA)buffer); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetValueCaps returned %#x\n", status); - status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetValueCaps returned %#x\n", status); - ok(count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", - count, caps.NumberInputValueCaps); - - for (i = 0; i < ARRAY_SIZE(expect_value_caps); ++i) - { - winetest_push_context("value_caps[%d]", i); - check_hidp_value_caps(&value_caps[i], &expect_value_caps[i]); - winetest_pop_context(); - } - - count = ARRAY_SIZE(value_caps) - 4; - status = HidP_GetSpecificValueCaps(HidP_Output, 0, 0, 0, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); - status = HidP_GetSpecificValueCaps(HidP_Feature + 1, 0, 0, 0, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificValueCaps returned %#x\n", status); - count = 0; - status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", - count, caps.NumberInputValueCaps); - count = ARRAY_SIZE(value_caps) - 4; - status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0, value_caps + 4, &count, (PHIDP_PREPARSED_DATA)buffer); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetSpecificValueCaps returned %#x\n", status); - - status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0, value_caps + 4, &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", - count, caps.NumberInputValueCaps); - check_hidp_value_caps(&value_caps[4], &value_caps[0]); - check_hidp_value_caps(&value_caps[5], &value_caps[1]); - check_hidp_value_caps(&value_caps[6], &value_caps[2]); - check_hidp_value_caps(&value_caps[7], &value_caps[3]); - - count = 1; - status = HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, - value_caps + 4, &count, preparsed_data); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == 1, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 1); - check_hidp_value_caps(&value_caps[4], &value_caps[3]); - - count = 0xdead; - status = HidP_GetSpecificValueCaps(HidP_Input, 0xfffe, 0, 0, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); - count = 0xdead; - status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0xfffe, 0, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); - count = 0xdead; - status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0xfffe, value_caps, &count, preparsed_data); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); - ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); - - status = HidP_InitializeReportForID(HidP_Input, 0, (PHIDP_PREPARSED_DATA)buffer, report, sizeof(report)); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_InitializeReportForID returned %#x\n", status); - status = HidP_InitializeReportForID(HidP_Feature + 1, 0, preparsed_data, report, sizeof(report)); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_InitializeReportForID returned %#x\n", status); - status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, sizeof(report)); - ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); - status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1); - ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); - status = HidP_InitializeReportForID(HidP_Input, 1 - report_id, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - - memset(buffer, 0xcd, sizeof(buffer)); - memset(buffer, 0, caps.InputReportByteLength); - buffer[0] = report_id; - ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); - - status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, - sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status); - memset(buffer, 0xcd, sizeof(buffer)); - status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, - 0, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); - status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, - 8, preparsed_data, report, caps.InputReportByteLength); - todo_wine - ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status); - - status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, - sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_GetUsageValueArray returned %#x\n", status); - memset(buffer, 0xcd, sizeof(buffer)); - status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, - 0, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsageValueArray returned %#x\n", status); - status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, - 8, preparsed_data, report, caps.InputReportByteLength); - todo_wine - ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_GetUsageValueArray returned %#x\n", status); - - value = -128; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - &value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0x80, "got value %x, expected %#x\n", value, 0x80); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == -128, "got value %x, expected %#x\n", value, -128); - - value = 127; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 127, "got value %x, expected %#x\n", value, 127); - - value = 0; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - - value = 0x7fffffff; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - value = 0xdeadbeef; - status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); - - value = 0x3fffffff; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); - - value = 0; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0x80000000, "got value %x, expected %#x\n", value, 0x80000000); - - value = 0; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - - value = 0xfeedcafe; - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, - value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, - (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - status = HidP_SetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, - 0, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - - value = HidP_MaxUsageListLength(HidP_Feature + 1, 0, preparsed_data); - ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0); - value = HidP_MaxUsageListLength(HidP_Input, 0, preparsed_data); - ok(value == 50, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 50); - value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data); - ok(value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 32); - value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED, preparsed_data); - ok(value == 8, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 8); - value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON, preparsed_data); - ok(value == 8, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 8); - value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED, preparsed_data); - ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 0); - - usages[0] = 0xff; - value = 1; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsages returned %#x\n", status); - usages[1] = 2; - usages[2] = 0xff; - value = 3; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsages returned %#x\n", status); - usages[0] = 4; - usages[1] = 6; - value = 2; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); - usages[0] = 4; - usages[1] = 6; - value = 2; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_LED, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); - - value = ARRAY_SIZE(usages); - status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); - ok(value == 0, "got usage count %d, expected %d\n", value, 2); - - usages[0] = 0x9; - usages[1] = 0xb; - usages[2] = 0xa; - value = 3; - ok(report[6] == 0, "got report[6] %x expected 0\n", report[6]); - ok(report[7] == 0, "got report[7] %x expected 0\n", report[7]); - memcpy(buffer, report, caps.InputReportByteLength); - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsages returned %#x\n", status); - buffer[6] = 2; - buffer[7] = 4; - ok(!memcmp(buffer, report, caps.InputReportByteLength), "unexpected report data\n"); - - status = HidP_SetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, 1, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); - - value = 0xdeadbeef; - status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_LED, 0, 6, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); - ok(value == 0xdeadbeef, "got value %x, expected %#x\n", value, 0xdeadbeef); - - value = 1; - status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsages returned %#x\n", status); - ok(value == 2, "got usage count %d, expected %d\n", value, 2); - value = ARRAY_SIZE(usages); - memset(usages, 0xcd, sizeof(usages)); - status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, - preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); - ok(value == 2, "got usage count %d, expected %d\n", value, 2); - ok(usages[0] == 4, "got usages[0] %x, expected %x\n", usages[0], 4); - ok(usages[1] == 6, "got usages[1] %x, expected %x\n", usages[1], 6); - - value = ARRAY_SIZE(usages); - memset(usages, 0xcd, sizeof(usages)); - status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_LED, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); - ok(value == 2, "got usage count %d, expected %d\n", value, 2); - ok(usages[0] == 6, "got usages[0] %x, expected %x\n", usages[0], 6); - ok(usages[1] == 4, "got usages[1] %x, expected %x\n", usages[1], 4); - - value = ARRAY_SIZE(usage_and_pages); - memset(usage_and_pages, 0xcd, sizeof(usage_and_pages)); - status = HidP_GetUsagesEx(HidP_Input, 0, usage_and_pages, &value, preparsed_data, report, - caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsagesEx returned %#x\n", status); - ok(value == 6, "got usage count %d, expected %d\n", value, 4); - ok(usage_and_pages[0].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[0] UsagePage %x, expected %x\n", - usage_and_pages[0].UsagePage, HID_USAGE_PAGE_BUTTON); - ok(usage_and_pages[1].UsagePage == HID_USAGE_PAGE_BUTTON, "got usage_and_pages[1] UsagePage %x, expected %x\n", - usage_and_pages[1].UsagePage, HID_USAGE_PAGE_BUTTON); - ok(usage_and_pages[2].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[2] UsagePage %x, expected %x\n", - usage_and_pages[2].UsagePage, HID_USAGE_PAGE_KEYBOARD); - ok(usage_and_pages[3].UsagePage == HID_USAGE_PAGE_KEYBOARD, "got usage_and_pages[3] UsagePage %x, expected %x\n", - usage_and_pages[3].UsagePage, HID_USAGE_PAGE_KEYBOARD); - ok(usage_and_pages[4].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[4] UsagePage %x, expected %x\n", - usage_and_pages[4].UsagePage, HID_USAGE_PAGE_LED); - ok(usage_and_pages[5].UsagePage == HID_USAGE_PAGE_LED, "got usage_and_pages[5] UsagePage %x, expected %x\n", - usage_and_pages[5].UsagePage, HID_USAGE_PAGE_LED); - ok(usage_and_pages[0].Usage == 4, "got usage_and_pages[0] Usage %x, expected %x\n", - usage_and_pages[0].Usage, 4); - ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", - usage_and_pages[1].Usage, 6); - ok(usage_and_pages[2].Usage == 9, "got usage_and_pages[2] Usage %x, expected %x\n", - usage_and_pages[2].Usage, 9); - ok(usage_and_pages[3].Usage == 11, "got usage_and_pages[3] Usage %x, expected %x\n", - usage_and_pages[3].Usage, 11); - ok(usage_and_pages[4].Usage == 6, "got usage_and_pages[4] Usage %x, expected %x\n", - usage_and_pages[4].Usage, 6); - ok(usage_and_pages[5].Usage == 4, "got usage_and_pages[5] Usage %x, expected %x\n", - usage_and_pages[5].Usage, 4); - - value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); - ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); - value = HidP_MaxDataListLength(HidP_Input, preparsed_data); - ok(value == 58, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 58); - value = HidP_MaxDataListLength(HidP_Output, preparsed_data); - ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0); - value = HidP_MaxDataListLength(HidP_Feature, preparsed_data); - ok(value == 14, "HidP_MaxDataListLength(HidP_Feature) returned %d, expected %d\n", value, 14); - - value = 1; - status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - ok(value == 11, "got data count %d, expected %d\n", value, 11); - memset(data, 0, sizeof(data)); - status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetData returned %#x\n", status); - for (i = 0; i < ARRAY_SIZE(expect_data); ++i) - { - winetest_push_context("data[%d]", i); - check_member(data[i], expect_data[i], "%d", DataIndex); - check_member(data[i], expect_data[i], "%d", RawValue); - winetest_pop_context(); - } - - /* HID nary usage collections are set with 1-based usage index in their declaration order */ - - memset(report, 0, caps.InputReportByteLength); - status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, - caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - value = 2; - usages[0] = 0x8e; - usages[1] = 0x8f; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); - ok(report[caps.InputReportByteLength - 2] == 3, "unexpected usage index %d, expected 3\n", - report[caps.InputReportByteLength - 2]); - ok(report[caps.InputReportByteLength - 1] == 4, "unexpected usage index %d, expected 4\n", - report[caps.InputReportByteLength - 1]); - status = HidP_UnsetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_UnsetUsages returned %#x\n", status); - ok(report[caps.InputReportByteLength - 2] == 0, "unexpected usage index %d, expected 0\n", - report[caps.InputReportByteLength - 2]); - ok(report[caps.InputReportByteLength - 1] == 0, "unexpected usage index %d, expected 0\n", - report[caps.InputReportByteLength - 1]); - status = HidP_UnsetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_BUTTON_NOT_PRESSED, "HidP_UnsetUsages returned %#x\n", status); - value = 1; - usages[0] = 0x8c; - status = HidP_SetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, - report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); - ok(report[caps.InputReportByteLength - 2] == 1, "unexpected usage index %d, expected 1\n", - report[caps.InputReportByteLength - 2]); - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Feature, 3, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Feature, report_id, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - - memset(buffer, 0xcd, sizeof(buffer)); - memset(buffer, 0, caps.FeatureReportByteLength); - buffer[0] = report_id; - ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); - - for (i = 0; i < caps.NumberLinkCollectionNodes; ++i) - { - if (collections[i].LinkUsagePage != HID_USAGE_PAGE_HAPTICS) continue; - if (collections[i].LinkUsage == HID_USAGE_HAPTICS_WAVEFORM_LIST) break; - } - ok(i < caps.NumberLinkCollectionNodes, - "HID_USAGE_HAPTICS_WAVEFORM_LIST collection not found\n"); - waveform_list = i; - - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, (PHIDP_PREPARSED_DATA)buffer, - report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_SetUsageValue returned %#x\n", status); - status = HidP_SetUsageValue(HidP_Feature + 1, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, - caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_SetUsageValue returned %#x\n", status); - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, - caps.FeatureReportByteLength + 1); - ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_SetUsageValue returned %#x\n", status); - report[0] = 1 - report_id; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, - caps.FeatureReportByteLength); - ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), - "HidP_SetUsageValue returned %#x\n", status); - report[0] = 2; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, - caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); - report[0] = report_id; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, - preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); - - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, - caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - - memset(buffer, 0xcd, sizeof(buffer)); - memset(buffer, 0, caps.FeatureReportByteLength); - buffer[0] = report_id; - value = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; - memcpy(buffer + 1, &value, 2); - ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); - - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, - (PHIDP_PREPARSED_DATA)buffer, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetUsageValue returned %#x\n", status); - status = HidP_GetUsageValue(HidP_Feature + 1, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetUsageValue returned %#x\n", status); - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, - preparsed_data, report, caps.FeatureReportByteLength + 1); - ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_GetUsageValue returned %#x\n", status); - report[0] = 1 - report_id; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, - preparsed_data, report, caps.FeatureReportByteLength); - ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), - "HidP_GetUsageValue returned %#x\n", status); - report[0] = 2; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, - preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); - report[0] = report_id; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, - preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status); - - value = 0xdeadbeef; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, - preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, "got value %x, expected %#x\n", value, - HID_USAGE_HAPTICS_WAVEFORM_RUMBLE); - - memset(buffer, 0xff, sizeof(buffer)); - status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, - 0, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); - status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, - 64, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status); - ok(!memcmp(report + 9, buffer, 8), "unexpected report data\n"); - - memset(buffer, 0, sizeof(buffer)); - status = HidP_GetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, - 0, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsageValueArray returned %#x\n", status); - status = HidP_GetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, - 64, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#x\n", status); - memset(buffer + 16, 0xff, 8); - ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n"); - - - value = 0x7fffffff; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0, "got value %x, expected %#x\n", value, 0); - value = 0xdeadbeef; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); - - value = 0x7fff; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0x0003ffff, "got value %x, expected %#x\n", value, 0x0003ffff); - - value = 0; - status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValue returned %#x\n", status); - value = 0xdeadbeef; - status = HidP_GetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - (LONG *)&value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - ok(value == 0xfff90000, "got value %x, expected %#x\n", value, 0xfff90000); - status = HidP_SetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - 0x1000, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status); - value = 0; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0xfffff518, "got value %x, expected %#x\n", value, 0xfffff518); - status = HidP_SetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - 0, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status); - value = 0; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0xfffff45e, "got value %x, expected %#x\n", value, 0xfffff45e); - status = HidP_SetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - 0xdead, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status); - value = 0; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0xfffffe7d, "got value %x, expected %#x\n", value, 0xfffffe7d); - status = HidP_SetScaledUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - 0xbeef, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_SetScaledUsageValue returned %#x\n", status); - value = 0; - status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, - &value, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - ok(value == 0xfffffd0b, "got value %x, expected %#x\n", value, 0xfffffd0b); - - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - - SetLastError(0xdeadbeef); - ret = HidD_GetInputReport(file, report, 0); - ok(!ret, "HidD_GetInputReport succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1); - ok(!ret, "HidD_GetInputReport succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_GetInputReport returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - memset(buffer, 0x5a, sizeof(buffer)); - ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); - if (report_id || broken(!ret) /* w7u */) - { - ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_GetInputReport returned error %u\n", GetLastError()); - } - else - { - ok(ret, "HidD_GetInputReport failed, last error %u\n", GetLastError()); - ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); - } - - SetLastError(0xdeadbeef); - ret = HidD_GetInputReport(file, report, caps.InputReportByteLength); - ok(ret, "HidD_GetInputReport failed, last error %u\n", GetLastError()); - ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); - - SetLastError(0xdeadbeef); - value = caps.InputReportByteLength * 2; - ret = sync_ioctl(file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value); - ok(ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError()); - ok(value == 3, "got length %u, expected 3\n", value); - ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); - - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Feature, report_id, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - - SetLastError(0xdeadbeef); - ret = HidD_GetFeature(file, report, 0); - ok(!ret, "HidD_GetFeature succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetFeature returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength - 1); - ok(!ret, "HidD_GetFeature succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_GetFeature returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - memset(buffer, 0x5a, sizeof(buffer)); - ret = HidD_GetFeature(file, buffer, caps.FeatureReportByteLength); - if (report_id || broken(!ret)) - { - ok(!ret, "HidD_GetFeature succeeded, last error %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_GetFeature returned error %u\n", GetLastError()); - } - else - { - ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); - } - - SetLastError(0xdeadbeef); - ret = HidD_GetFeature(file, report, caps.FeatureReportByteLength); - ok(ret, "HidD_GetFeature failed, last error %u\n", GetLastError()); - ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); - - value = caps.FeatureReportByteLength * 2; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_GET_FEATURE, NULL, 0, report, &value); - ok(ret, "IOCTL_HID_GET_FEATURE failed, last error %u\n", GetLastError()); - ok(value == 3, "got length %u, expected 3\n", value); - ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); - - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Feature, report_id, preparsed_data, report, caps.FeatureReportByteLength); - ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); - - SetLastError(0xdeadbeef); - ret = HidD_SetFeature(file, report, 0); - ok(!ret, "HidD_SetFeature succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetFeature returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = HidD_SetFeature(file, report, caps.FeatureReportByteLength - 1); - ok(!ret, "HidD_SetFeature succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_SetFeature returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - memset(buffer, 0x5a, sizeof(buffer)); - ret = HidD_SetFeature(file, buffer, caps.FeatureReportByteLength); - if (report_id || broken(!ret)) - { - ok(!ret, "HidD_SetFeature succeeded, last error %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_SetFeature returned error %u\n", GetLastError()); - } - else - { - ok(ret, "HidD_SetFeature failed, last error %u\n", GetLastError()); - } - - SetLastError(0xdeadbeef); - ret = HidD_SetFeature(file, report, caps.FeatureReportByteLength); - ok(ret, "HidD_SetFeature failed, last error %u\n", GetLastError()); - - value = caps.FeatureReportByteLength * 2; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_FEATURE, NULL, 0, report, &value); - ok(!ret, "IOCTL_HID_SET_FEATURE succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_FEATURE returned error %u\n", GetLastError()); - value = 0; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_FEATURE, report, caps.FeatureReportByteLength * 2, NULL, &value); - ok(ret, "IOCTL_HID_SET_FEATURE failed, last error %u\n", GetLastError()); - ok(value == 3, "got length %u, expected 3\n", value); - - - memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed_data, report, caps.OutputReportByteLength); - ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); - memset(report, 0, caps.OutputReportByteLength); - report[0] = report_id; - - SetLastError(0xdeadbeef); - ret = HidD_SetOutputReport(file, report, 0); - ok(!ret, "HidD_SetOutputReport succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_SetOutputReport returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = HidD_SetOutputReport(file, report, caps.OutputReportByteLength - 1); - ok(!ret, "HidD_SetOutputReport succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_SetOutputReport returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - memset(buffer, 0x5a, sizeof(buffer)); - ret = HidD_SetOutputReport(file, buffer, caps.OutputReportByteLength); - if (report_id || broken(!ret)) - { - ok(!ret, "HidD_SetOutputReport succeeded, last error %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), - "HidD_SetOutputReport returned error %u\n", GetLastError()); - } - else - { - ok(ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError()); - } - - SetLastError(0xdeadbeef); - ret = HidD_SetOutputReport(file, report, caps.OutputReportByteLength); - ok(ret, "HidD_SetOutputReport failed, last error %u\n", GetLastError()); - - value = caps.OutputReportByteLength * 2; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, NULL, 0, report, &value); - ok(!ret, "IOCTL_HID_SET_OUTPUT_REPORT succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "IOCTL_HID_SET_OUTPUT_REPORT returned error %u\n", GetLastError()); - value = 0; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_OUTPUT_REPORT, report, caps.OutputReportByteLength * 2, NULL, &value); - ok(ret, "IOCTL_HID_SET_OUTPUT_REPORT failed, last error %u\n", GetLastError()); - ok(value == 3, "got length %u, expected 3\n", value); - - - SetLastError(0xdeadbeef); - ret = WriteFile(file, report, 0, &value, NULL); - ok(!ret, "WriteFile succeeded\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "WriteFile returned error %u\n", GetLastError()); - ok(value == 0, "WriteFile returned %x\n", value); - SetLastError(0xdeadbeef); - ret = WriteFile(file, report, caps.OutputReportByteLength - 1, &value, NULL); - ok(!ret, "WriteFile succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_USER_BUFFER, - "WriteFile returned error %u\n", GetLastError()); - ok(value == 0, "WriteFile returned %x\n", value); - - memset(report, 0xcd, sizeof(report)); - report[0] = 0xa5; - SetLastError(0xdeadbeef); - ret = WriteFile(file, report, caps.OutputReportByteLength * 2, &value, NULL); - if (report_id || broken(!ret) /* w7u */) - { - ok(!ret, "WriteFile succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "WriteFile returned error %u\n", GetLastError()); - ok(value == 0, "WriteFile wrote %u\n", value); - SetLastError(0xdeadbeef); - report[0] = report_id; - ret = WriteFile(file, report, caps.OutputReportByteLength, &value, NULL); - } - - if (report_id) - { - ok(ret, "WriteFile failed, last error %u\n", GetLastError()); - ok(value == 2, "WriteFile wrote %u\n", value); - } - else - { - ok(ret, "WriteFile failed, last error %u\n", GetLastError()); - ok(value == 3, "WriteFile wrote %u\n", value); - } - - - memset(report, 0xcd, sizeof(report)); - SetLastError(0xdeadbeef); - ret = ReadFile(file, report, 0, &value, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", GetLastError()); - ok(value == 0, "ReadFile returned %x\n", value); - SetLastError(0xdeadbeef); - ret = ReadFile(file, report, caps.InputReportByteLength - 1, &value, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, "ReadFile failed, last error %u\n", GetLastError()); - ok(value == 0, "ReadFile returned %x\n", value); - - if (polled) - { - memset(report, 0xcd, sizeof(report)); - SetLastError(0xdeadbeef); - ret = ReadFile(file, report, caps.InputReportByteLength, &value, NULL); - ok(ret, "ReadFile failed, last error %u\n", GetLastError()); - ok(value == (report_id ? 3 : 4), "ReadFile returned %x\n", value); - ok(report[0] == report_id, "unexpected report data\n"); - - overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - - /* drain available input reports */ - SetLastError(0xdeadbeef); - while (ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped)) - ResetEvent(overlapped.hEvent); - ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); - ret = GetOverlappedResult(async_file, &overlapped, &value, TRUE); - ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); - ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - ResetEvent(overlapped.hEvent); - - memcpy(buffer, report, caps.InputReportByteLength); - memcpy(buffer + caps.InputReportByteLength, report, caps.InputReportByteLength); - - SetLastError(0xdeadbeef); - ret = ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped); - ok(!ret, "ReadFile succeeded\n"); - ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = ReadFile(async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2); - ok(!ret, "ReadFile succeeded\n"); - ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); - - /* wait for second report to be ready */ - ret = GetOverlappedResult(async_file, &overlapped2, &value, TRUE); - ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); - ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - /* first report should be ready and the same */ - ret = GetOverlappedResult(async_file, &overlapped, &value, FALSE); - ok(ret, "GetOverlappedResult failed, last error %u\n", GetLastError()); - ok(value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected 3\n", value); - ok(memcmp(report, buffer + caps.InputReportByteLength, caps.InputReportByteLength), - "expected different report\n"); - ok(!memcmp(report, buffer, caps.InputReportByteLength), "expected identical reports\n"); - - CloseHandle(overlapped.hEvent); - CloseHandle(overlapped2.hEvent); - } - - - HidD_FreePreparsedData(preparsed_data); -} - -static void test_hid_device(DWORD report_id, DWORD polled) -{ - char buffer[200]; - SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - SP_DEVINFO_DATA device = {sizeof(device)}; - ULONG count, poll_freq, out_len; - HANDLE file, async_file; - BOOL ret, found = FALSE; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - IO_STATUS_BLOCK io; - NTSTATUS status; - unsigned int i; - HDEVINFO set; - - winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); - - set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); - - for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) - { - ret = SetupDiEnumDeviceInterfaces(set, &device, &GUID_DEVINTERFACE_HID, 0, &iface); - ok(ret, "failed to get interface, error %#x\n", GetLastError()); - ok(IsEqualGUID(&iface.InterfaceClassGuid, &GUID_DEVINTERFACE_HID), - "wrong class %s\n", debugstr_guid(&iface.InterfaceClassGuid)); - ok(iface.Flags == SPINT_ACTIVE, "got flags %#x\n", iface.Flags); - - iface_detail->cbSize = sizeof(*iface_detail); - ret = SetupDiGetDeviceInterfaceDetailA(set, &iface, iface_detail, sizeof(buffer), NULL, NULL); - ok(ret, "failed to get interface path, error %#x\n", GetLastError()); - - if (strstr(iface_detail->DevicePath, "\\\\?\\hid#winetest#1")) - { - found = TRUE; - break; - } - } - - SetupDiDestroyDeviceInfoList(set); - - todo_wine ok(found, "didn't find device\n"); - - file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = HidD_GetNumInputBuffers(file, &count); - ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); - - SetLastError(0xdeadbeef); - ret = HidD_SetNumInputBuffers(file, 1); - ok(!ret, "HidD_SetNumInputBuffers succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = HidD_SetNumInputBuffers(file, 513); - ok(!ret, "HidD_SetNumInputBuffers succeeded\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "HidD_SetNumInputBuffers returned error %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = HidD_SetNumInputBuffers(file, 16); - ok(ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError()); - - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = HidD_GetNumInputBuffers(file, &count); - ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); - - async_file = CreateFileA(iface_detail->DevicePath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); - ok(async_file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = HidD_GetNumInputBuffers(async_file, &count); - ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - ok(count == 32, "HidD_GetNumInputBuffers returned %u\n", count); - - SetLastError(0xdeadbeef); - ret = HidD_SetNumInputBuffers(async_file, 2); - ok(ret, "HidD_SetNumInputBuffers failed last error %u\n", GetLastError()); - - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = HidD_GetNumInputBuffers(async_file, &count); - ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - ok(count == 2, "HidD_GetNumInputBuffers returned %u\n", count); - count = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = HidD_GetNumInputBuffers(file, &count); - ok(ret, "HidD_GetNumInputBuffers failed last error %u\n", GetLastError()); - ok(count == 16, "HidD_GetNumInputBuffers returned %u\n", count); - - if (polled) - { - out_len = sizeof(ULONG); - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); - ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - todo_wine ok(poll_freq == 5, "got poll_freq %u, expected 5\n", poll_freq); - - out_len = 0; - poll_freq = 500; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); - ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == 0, "got out_len %u, expected 0\n", out_len); - - out_len = 0; - poll_freq = 10001; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); - ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == 0, "got out_len %u, expected 0\n", out_len); - - out_len = 0; - poll_freq = 0; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); - ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == 0, "got out_len %u, expected 0\n", out_len); - - out_len = sizeof(ULONG); - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); - ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 10000, "got poll_freq %u, expected 10000\n", poll_freq); - - out_len = 0; - poll_freq = 500; - SetLastError(0xdeadbeef); - ret = sync_ioctl(file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &poll_freq, sizeof(ULONG), NULL, &out_len); - ok(ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == 0, "got out_len %u, expected 0\n", out_len); - - out_len = sizeof(ULONG); - SetLastError(0xdeadbeef); - ret = sync_ioctl(async_file, IOCTL_HID_GET_POLL_FREQUENCY_MSEC, NULL, 0, &poll_freq, &out_len); - ok(ret, "IOCTL_HID_GET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError()); - ok(out_len == sizeof(ULONG), "got out_len %u, expected sizeof(ULONG)\n", out_len); - ok(poll_freq == 500, "got poll_freq %u, expected 500\n", poll_freq); - } - - test_hidp(file, async_file, report_id, polled); - - CloseHandle(async_file); - CloseHandle(file); - - RtlInitUnicodeString(&string, L"\\??\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}"); - InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); - status = NtOpenFile(&file, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); - todo_wine ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); - - winetest_pop_context(); -} - -static void test_hid_driver(struct testsign_context *ctx, DWORD report_id, DWORD polled) -{ - static const char hardware_id[] = "test_hardware_id\0"; - char path[MAX_PATH], dest[MAX_PATH], *filepart; - SP_DEVINFO_DATA device = {sizeof(device)}; - char cwd[MAX_PATH], tempdir[MAX_PATH]; - WCHAR driver_filename[MAX_PATH]; - SC_HANDLE manager, service; - BOOL ret, need_reboot; - HANDLE catalog, file; - LSTATUS status; - HDEVINFO set; - HKEY hkey; - FILE *f; - - GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); - GetTempPathA(ARRAY_SIZE(tempdir), tempdir); - SetCurrentDirectoryA(tempdir); - - status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL); - ok(!status, "RegCreateKeyExW returned %#x\n", status); - - status = RegSetValueExW(hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id)); - ok(!status, "RegSetValueExW returned %#x\n", status); - - status = RegSetValueExW(hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled)); - ok(!status, "RegSetValueExW returned %#x\n", status); - - load_resource(L"driver_hid.dll", driver_filename); - ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); - ok(ret, "failed to move file, error %u\n", GetLastError()); - - f = fopen("winetest.inf", "w"); - ok(!!f, "failed to open winetest.inf: %s\n", strerror(errno)); - fputs(inf_text, f); - fclose(f); - - /* Create the catalog file. */ - - catalog = CryptCATOpen((WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0); - ok(catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %#x\n", GetLastError()); - - add_file_to_catalog(catalog, L"winetest.sys"); - add_file_to_catalog(catalog, L"winetest.inf"); - - ret = CryptCATPersistStore(catalog); - todo_wine ok(ret, "Failed to write catalog, error %u\n", GetLastError()); - - ret = CryptCATClose(catalog); - ok(ret, "Failed to close catalog, error %u\n", GetLastError()); - - testsign_sign(ctx, L"winetest.cat"); - - /* Install the driver. */ - - set = SetupDiCreateDeviceInfoList(NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "failed to create device list, error %#x\n", GetLastError()); - - ret = SetupDiCreateDeviceInfoA(set, "root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device); - ok(ret, "failed to create device, error %#x\n", GetLastError()); - - ret = SetupDiSetDeviceRegistryPropertyA( set, &device, SPDRP_HARDWAREID, - (const BYTE *)hardware_id, sizeof(hardware_id) ); - ok(ret, "failed to create set hardware ID, error %#x\n", GetLastError()); - - ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); - ok(ret, "failed to register device, error %#x\n", GetLastError()); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); - ok(ret, "failed to install device, error %#x\n", GetLastError()); - ok(!need_reboot, "expected no reboot necessary\n"); - - /* Tests. */ - - test_hid_device(report_id, polled); - - /* Clean up. */ - - ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); - ok(ret, "failed to remove device, error %#x\n", GetLastError()); - - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file == INVALID_HANDLE_VALUE, "expected failure\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); - - ret = SetupDiDestroyDeviceInfoList(set); - ok(ret, "failed to destroy set, error %#x\n", GetLastError()); - - /* Windows stops the service but does not delete it. */ - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); - ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); - service = OpenServiceA(manager, "winetest", SERVICE_STOP | DELETE); - ok(!!service, "failed to open service, error %u\n", GetLastError()); - unload_driver(service); - CloseServiceHandle(manager); - - cat_okfile(); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); - ok(ret, "Failed to copy INF, error %#x\n", GetLastError()); - ret = SetupUninstallOEMInfA(filepart, 0, NULL); - ok(ret, "Failed to uninstall INF, error %u\n", GetLastError()); - - ret = DeleteFileA("winetest.cat"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.inf"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.sys"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ - ret = DeleteFileA("C:/windows/system32/drivers/winetest.sys"); - ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %u\n", GetLastError()); - - SetCurrentDirectoryA(cwd); -} - START_TEST(ntoskrnl) { WCHAR filename[MAX_PATH], filename2[MAX_PATH]; @@ -3499,12 +1911,6 @@ START_TEST(ntoskrnl) subtest("driver_pnp"); test_pnp_driver(&ctx); - subtest("driver_hid"); - test_hid_driver(&ctx, 0, FALSE); - test_hid_driver(&ctx, 1, FALSE); - test_hid_driver(&ctx, 0, TRUE); - test_hid_driver(&ctx, 1, TRUE); - out: testsign_cleanup(&ctx); UnmapViewOfFile(test_data); -- 2.33.0

2 2

[PATCH 2/2] user32: Scale scroll bar minimum thumb size according to DPI.
by Zhiyi Zhang 09 Sep '21

09 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index d62020f8f23..a17495d9ff0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -195,7 +195,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, INT *arrowSize, INT *thumbSize, INT *thumbPos ) { - INT pixels; + INT pixels, min_thumb_size; BOOL vertical; WND *wndPtr = WIN_GetPtr( hwnd ); @@ -265,7 +265,8 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, if (info->page) { *thumbSize = MulDiv(pixels,info->page,(info->maxVal-info->minVal+1)); - if (*thumbSize < SCROLL_MIN_THUMB) *thumbSize = SCROLL_MIN_THUMB; + min_thumb_size = MulDiv(SCROLL_MIN_THUMB, GetDpiForWindow(hwnd), 96); + if (*thumbSize < min_thumb_size) *thumbSize = min_thumb_size; } else *thumbSize = GetSystemMetrics(SM_CXVSCROLL); @@ -329,10 +330,10 @@ static void SCROLL_GetScrollBarDrawInfo( HWND hwnd, INT bar, * Compute the current scroll position based on the thumb position in pixels * from the top of the scroll-bar. */ -static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, - BOOL vertical, INT pos ) +static UINT SCROLL_GetThumbVal( HWND hwnd, SCROLLBAR_INFO *infoPtr, RECT *rect, BOOL vertical, + INT pos ) { - INT thumbSize; + INT thumbSize, minThumbSize; INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; INT range; @@ -342,7 +343,8 @@ static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, if (infoPtr->page) { thumbSize = MulDiv(pixels,infoPtr->page,(infoPtr->maxVal-infoPtr->minVal+1)); - if (thumbSize < SCROLL_MIN_THUMB) thumbSize = SCROLL_MIN_THUMB; + minThumbSize = MulDiv(SCROLL_MIN_THUMB, GetDpiForWindow(hwnd), 96); + if (thumbSize < minThumbSize) thumbSize = minThumbSize; } else thumbSize = GetSystemMetrics(SM_CXVSCROLL); @@ -938,7 +940,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) g_tracking_info.win = hwnd; g_tracking_info.bar = nBar; g_tracking_info.thumb_pos = trackThumbPos + lastMousePos - lastClickPos; - g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, g_tracking_info.thumb_pos ); if (!SCROLL_MovingThumb) { @@ -964,7 +966,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) { lastMousePos = pos; g_tracking_info.thumb_pos = trackThumbPos + pos - lastClickPos; - g_tracking_info.thumb_val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + g_tracking_info.thumb_val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, g_tracking_info.thumb_pos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, g_tracking_info.thumb_val ), @@ -1012,7 +1014,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) if (hittest == SCROLL_THUMB) { - UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + UINT val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, trackThumbPos + lastMousePos - lastClickPos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, val ), (LPARAM)hwndCtl ); @@ -1026,7 +1028,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) if (hittest == SCROLL_THUMB) { - UINT val = SCROLL_GetThumbVal( infoPtr, &rect, vertical, + UINT val = SCROLL_GetThumbVal( hwnd, infoPtr, &rect, vertical, trackThumbPos + lastMousePos - lastClickPos ); SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl ); -- 2.30.2

2 1

[PATCH] regsvr32: Enable visual styles.
by Zhiyi Zhang 09 Sep '21

09 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/regsvr32/regsvr32.manifest | 16 ++++++++++++++++ programs/regsvr32/regsvr32.rc | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 programs/regsvr32/regsvr32.manifest diff --git a/programs/regsvr32/regsvr32.manifest b/programs/regsvr32/regsvr32.manifest new file mode 100644 index 00000000000..be0d6710504 --- /dev/null +++ b/programs/regsvr32/regsvr32.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Regsvr32" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index c7fc2c3fa7b..1d9ec45eb90 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> #include "regsvr32.h" #pragma makedep po @@ -52,6 +53,9 @@ Options:\n\ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: regsvr32.manifest */ +1 RT_MANIFEST regsvr32.manifest + #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP -- 2.30.2

1 0

[PATCH 1/2] user32: Change scroll bar minimum thumb size to 8 pixels.
by Zhiyi Zhang 09 Sep '21

09 Sep '21

It's 8 pixels on XP and Win 7. On Win 10, it's the same size as themed scroll bar thumb. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 088e41eee43..d62020f8f23 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -60,7 +60,7 @@ typedef struct #define SCROLL_MIN_RECT 4 /* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 6 +#define SCROLL_MIN_THUMB 8 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0 -- 2.30.2

1 0

[PATCH] uxtheme: Get and set system metrics in 96 DPI.
by Zhiyi Zhang 09 Sep '21

09 Sep '21

Fix a bug that font size may be smaller than normal after toggling theming. For example, the following steps will change the system metrics to incorrect values. 1. Open winecfg, and set DPI to 192. Do not restart winecfg. 2. Change the theme to Light. UXTHEME_BackupSystemMetrics() backs up system metrics in 96 DPI because the current DPI is still 96. 3. Restart winecfg and turn off theming. UXTHEME_RestoreSystemMetrics() restores system metrics in 192 DPI because the current DPI is 192. So system metrics will be scaled to 1/2 of the original size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37592 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 4 ++++ dlls/uxtheme/system.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index efabd06f7c0..7356f6ea354 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -838,12 +838,16 @@ static BOOL parse_handle_nonclient_size (struct PARSENONCLIENTSTATE* state, static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) { + DPI_AWARENESS_CONTEXT old_context; + if (state->metricsDirty) { + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics), &state->metrics, 0); SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont), &state->iconTitleFont, 0); + SetThreadDpiAwarenessContext(old_context); } } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index ca0dd228b2c..a467fc8b157 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -278,9 +278,12 @@ static void save_sys_colors (HKEY baseKey) * is deactivated */ static void UXTHEME_BackupSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0) == ERROR_SUCCESS) @@ -317,14 +320,19 @@ static void UXTHEME_BackupSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Read back old settings after a theme was deactivated */ static void UXTHEME_RestoreSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { @@ -404,6 +412,8 @@ static void UXTHEME_RestoreSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Make system settings persistent, so they're in effect even w/o uxtheme -- 2.30.2

1 0

[PATCH] dbghelp: Support UWOP_EPILOG in unwind
by Alistair Leslie-Hughes 09 Sep '21

09 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/cpu_x86_64.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 8e8ac85dd2f..4fd8d76e010 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -209,6 +209,19 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F case UWOP_PUSH_MACHFRAME: TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; + case UWOP_EPILOG: + if (info->Version == 2) + { + unsigned int offset; + if (info->UnwindCode[i].u.OpInfo) + offset = info->UnwindCode[i].u.CodeOffset; + else + offset = (info->UnwindCode[i+1].u.OpInfo << 8) + info->UnwindCode[i+1].u.CodeOffset; + TRACE("UWOP_EPILOG %u offset %u\n", info->UnwindCode[i].u.OpInfo, offset); + i += 1; + break; + } + /* Fall through */ default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; @@ -490,7 +503,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, return FALSE; } - if (info->Version != 1) + if (info->Version != 1 && info->Version != 2) { WARN("unknown unwind info version %u at %lx\n", info->Version, base + function->UnwindData); return FALSE; -- 2.33.0

1 0

[PATCH 1/2] wpp: Don't choke on fully variadic macros
by Alex Henrie 09 Sep '21

09 Sep '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- libs/wpp/ppy.y | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index 5b7083b3813..0afc642d3e0 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -327,6 +327,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } emargs : margs { $$ = $1; } | margs ',' tELLIPSIS { nmacro_args *= -1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); } -- 2.33.0

1 1

[PATCH vkd3d 2/6] tests: Use assert_that() in get_buffer_readback_with_command_list().
by Conor McCarthy 09 Sep '21

09 Sep '21

Allows use of todo with check_buffer_uint(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c9e75e08..f782ef1f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -317,14 +317,14 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F HRESULT hr; hr = ID3D12Resource_GetDevice(buffer, &IID_ID3D12Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + assert_that(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(buffer); - assert(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER); + assert_that(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not a buffer.\n", buffer); resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; hr = ID3D12Resource_GetHeapProperties(buffer, &heap_properties, NULL); - ok(SUCCEEDED(hr), "Failed to get heap properties.\n"); + assert_that(SUCCEEDED(hr), "Failed to get heap properties.\n"); if (heap_properties.Type == D3D12_HEAP_TYPE_READBACK) { rb_buffer = buffer; @@ -338,7 +338,7 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F } hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + assert_that(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); @@ -354,7 +354,7 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb_buffer, 0, &read_range, &rb->data); - ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); + assert_that(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); } static uint8_t get_readback_uint8(struct resource_readback *rb, unsigned int x, unsigned int y) -- 2.32.0

1 5

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

08 Sep '21

1 0

[PATCH v3 1/2] oleacc: Check proper UI thread for window focus.
by Connor McAdams 08 Sep '21

08 Sep '21

From: Connor McAdams <conmanx360(a)gmail.com> When RPC is done in a multi-threaded apartment environment, this method may be called in a thread other than the one that the object was created in. To account for this, make sure to check the UI thread the HWND belongs to rather than the one belonging to the current thread. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/oleacc/client.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 3b33be55a21..a726c607109 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -227,6 +227,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); + GUITHREADINFO info; LONG style; TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); @@ -244,7 +245,10 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; else if(IsWindow(This->hwnd)) V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; - if(GetFocus() == This->hwnd) + + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(GetWindowThreadProcessId(This->hwnd, NULL), &info) && + info.hwndFocus == This->hwnd) V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; if(!(style & WS_VISIBLE)) V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; -- 2.25.1

2 6

[PATCH] wininet: Add handling for remaining special errors to InternetErrorDlg.
by Dmitry Timoshkov 08 Sep '21

08 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 36 ++++++++++++++++++++++++++++++- dlls/wininet/tests/internet.c | 40 +++++------------------------------ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 25ed1f2a651..b58b7e27f3c 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -514,11 +514,17 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, } break; } + + case ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ case ERROR_INTERNET_SEC_CERT_ERRORS: case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: case ERROR_INTERNET_SEC_CERT_REV_FAILED: + case ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE: if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { res = ERROR_CANCELLED; break; @@ -530,13 +536,41 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); break; + + case ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION: + if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { + res = ERROR_HTTP_COOKIE_DECLINED; + break; + } + FIXME("Need to display dialog for error %d\n", dwError); + break; + + case ERROR_INTERNET_INSERT_CDROM: + if(!req) + return ERROR_INVALID_PARAMETER; + /* fall through */ + case ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION: + case ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT: + case ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT: + case ERROR_INTERNET_MIXED_SECURITY: + case ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR: + if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { + res = ERROR_CANCELLED; + break; + } + /* fall through */ case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: + case ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR: + case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: case ERROR_INTERNET_POST_IS_NON_SECURE: FIXME("Need to display dialog for error %d\n", dwError); res = ERROR_SUCCESS; break; + default: - res = ERROR_CANCELLED; + if (!(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS)) + res = ERROR_CANCELLED; + break; } if(req) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e83b142e998..8513aabe174 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1566,29 +1566,14 @@ static void test_InternetErrorDlg(void) break; } - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_MIXED_SECURITY && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) @@ -1598,31 +1583,16 @@ static void test_InternetErrorDlg(void) } res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_INSERT_CDROM || - i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) - ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INCORRECT_PASSWORD && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && - i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) - ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetCloseHandle(req); -- 2.31.1

2 2

[PATCH vkd3d v2] tests: Test casting to and then from bool.
by Henri Verbeet 08 Sep '21

08 Sep '21

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Resolved conflict with Zebediah's patches in Makefile.am. Makefile.am | 2 ++ tests/hlsl-bool-cast.shader_test | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/hlsl-bool-cast.shader_test diff --git a/Makefile.am b/Makefile.am index 3c18c318..05d9f00c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ @@ -267,6 +268,7 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test new file mode 100644 index 00000000..8880b2f5 --- /dev/null +++ b/tests/hlsl-bool-cast.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + return float4( + (float)(bool)0.0, + (float)(bool)0, + (float)(bool)2.0, + (float)(bool)2 + ); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0) -- 2.20.1

1 0

[PATCH vkd3d v2 1/9] tests: Add tests for unbounded resource arrays.
by Conor McCarthy 08 Sep '21

08 Sep '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6bc03b0b..9d4b4e0d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34797,6 +34797,188 @@ done: destroy_test_context(&context); } +static void test_unbounded_resource_arrays(void) +{ + ID3D12Resource *constant_buffers[64], *input_buffers[64], *output_buffers[128]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + ID3D12GraphicsCommandList *command_list; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, UINT_MAX, 2, 1, 0}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, UINT_MAX, 2, 1, 64}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 1, 128}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 2, 127}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 3, 192}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}}, + }; + + static const DWORD cs_code[] = + { + /* Compiled with /res_may_alias (but it has no effect on the output from fxc 10.1). */ +#if 0 + struct cb + { + uint value; + }; + ConstantBuffer<cb> c1[] : register(b2, space1); + + Buffer<uint> t1[] : register(t2, space1); + + RWBuffer<uint> u1[] : register(u1, space1); + RWBuffer<uint> u2[] : register(u2, space2); + RWBuffer<uint> u3[] : register(u1, space3); + + [numthreads(64, 1, 1)] + void main(uint id : SV_DispatchThreadID) + { + uint i = c1[NonUniformResourceIndex(id)].value; + /* fxc emits a race condition error on the below statements apparently because it fails to account + * for id being the thread id. The error check is skipped if the statements are conditional. */ + if (id < 64) + { + u1[NonUniformResourceIndex(id)][0] = t1[NonUniformResourceIndex(i)][0]; + /* If u2 is an alias of u1, this should copy u1. */ + u3[NonUniformResourceIndex(id)][0] = u2[NonUniformResourceIndex(id)][0]; + } + } +#endif + 0x43425844, 0x82871767, 0x87353509, 0x8ccc50cb, 0x5006dd54, 0x00000001, 0x00000250, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000001fc, 0x00050051, 0x0000007f, 0x0100086a, + 0x07000859, 0x00308e46, 0x00000000, 0x00000002, 0xffffffff, 0x00000001, 0x00000001, 0x07000858, + 0x00307e46, 0x00000000, 0x00000002, 0xffffffff, 0x00004444, 0x00000001, 0x0700089c, 0x0031ee46, + 0x00000000, 0x00000001, 0xffffffff, 0x00004444, 0x00000001, 0x0700089c, 0x0031ee46, 0x00000001, + 0x00000002, 0xffffffff, 0x00004444, 0x00000002, 0x0700089c, 0x0031ee46, 0x00000002, 0x00000001, + 0xffffffff, 0x00004444, 0x00000003, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, + 0x00000040, 0x00000001, 0x00000001, 0x0600004f, 0x00100012, 0x00000000, 0x0002000a, 0x00004001, + 0x00000040, 0x0304001f, 0x0010000a, 0x00000000, 0x04000036, 0x00100012, 0x00000000, 0x0002000a, + 0x0a000036, 0x00100022, 0x00000000, 0x8630800a, 0x00020001, 0x00000000, 0x00000002, 0x0010000a, + 0x00000000, 0x00000000, 0x0e00002d, 0x00100022, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x86207e16, 0x00020001, 0x00000000, 0x00000002, 0x0010001a, 0x00000000, + 0x0e0000a4, 0x8621e0f2, 0x00020001, 0x00000000, 0x00000001, 0x0010000a, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100556, 0x00000000, 0x0e0000a3, 0x00100022, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8621ee16, 0x00020001, + 0x00000001, 0x00000002, 0x0010000a, 0x00000000, 0x0e0000a4, 0x8621e0f2, 0x00020001, 0x00000002, + 0x00000001, 0x0010000a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00100556, 0x00000000, 0x01000015, 0x0100003e, + }; + + if (!init_compute_test_context(&context)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + todo + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + goto done; + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 256); + + for (i = 0; i < ARRAY_SIZE(constant_buffers); ++i) + { + uint32_t cb_data = 63 - i; + constant_buffers[i] = create_default_buffer(device, D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(constant_buffers[i], 0, sizeof(cb_data), &cb_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, constant_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(constant_buffers[i]); + cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); + ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, get_cpu_descriptor_handle(&context, heap, i)); + } + + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + { + uint32_t srv_data = i ^ 0x35; + input_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(input_buffers[i], 0, sizeof(srv_data), &srv_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32_UINT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + ID3D12Device_CreateShaderResourceView(device, input_buffers[i], &srv_desc, + get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(constant_buffers) + i)); + } + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + output_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_R32_UINT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 1; + ID3D12Device_CreateUnorderedAccessView(device, output_buffers[i], NULL, + &uav_desc, get_cpu_descriptor_handle(&context, heap, + ARRAY_SIZE(constant_buffers) + ARRAY_SIZE(input_buffers) + i)); + } + + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, heap, 0)); + + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + vkd3d_test_set_context("buffer %u", i); + transition_sub_resource_state(command_list, output_buffers[i], 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + /* Buffers at index >= 64 are aliased. */ + check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + } + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + ID3D12Resource_Release(output_buffers[i]); + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + ID3D12Resource_Release(input_buffers[i]); + for (i = 0; i < ARRAY_SIZE(constant_buffers); ++i) + ID3D12Resource_Release(constant_buffers[i]); + ID3D12DescriptorHeap_Release(heap); +done: + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -34968,4 +35150,5 @@ START_TEST(d3d12) run_test(test_hull_shader_relative_addressing); run_test(test_hull_shader_patch_constant_inputs); run_test(test_resource_arrays); + run_test(test_unbounded_resource_arrays); } -- 2.32.0

3 11

[PATCH vkd3d 1/5] vkd3d: Change to void the return type for ID3D12GraphicsCommandList::ClearState().
by Conor McCarthy 08 Sep '21

08 Sep '21

ClearState() does not return a value. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 2 +- libs/vkd3d/command.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 11e597db..2d9aa1b6 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2052,7 +2052,7 @@ interface ID3D12GraphicsCommandList : ID3D12CommandList HRESULT Reset(ID3D12CommandAllocator *allocator, ID3D12PipelineState *initial_state); - HRESULT ClearState(ID3D12PipelineState *pipeline_state); + void ClearState(ID3D12PipelineState *pipeline_state); void DrawInstanced(UINT vertex_count_per_instance, UINT instance_count, UINT start_vertex_location, UINT start_instance_location); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 964f5cd4..46c0c3a5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2398,12 +2398,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL return hr; } -static HRESULT STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList2 *iface, +static void STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList2 *iface, ID3D12PipelineState *pipeline_state) { FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); - - return E_NOTIMPL; } static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) -- 2.32.0

2 6

[PATCH vkd3d] vkd3d-shader: Free the capabilities array on spirv builder destruction.
by Conor McCarthy 08 Sep '21

08 Sep '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 695882c7..6f948c31 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1800,6 +1800,8 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) vkd3d_spirv_stream_free(&builder->insertion_stream); + vkd3d_free(builder->capabilities); + rb_destroy(&builder->declarations, vkd3d_spirv_declaration_free, NULL); vkd3d_free(builder->iface); -- 2.32.0

2 1

[PATCH vkd3d 1/5] tests: Add a simple test for function overloads.
by Zebediah Figura 08 Sep '21

08 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-function-overload.shader_test | 40 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/hlsl-function-overload.shader_test diff --git a/Makefile.am b/Makefile.am index f51233c2..721a6b66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-function-overload.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -266,6 +267,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-function-overload.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/tests/hlsl-function-overload.shader_test b/tests/hlsl-function-overload.shader_test new file mode 100644 index 00000000..c6e0ccfe --- /dev/null +++ b/tests/hlsl-function-overload.shader_test @@ -0,0 +1,40 @@ +[pixel shader fail] +/* The same function signature cannot be defined twice. */ + +float func(int arg) +{ + return 0.1; +} + +float func(int arg) +{ + return 0.1; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader] +/* Test a basic overload. */ +float func(int arg) +{ + return 0.1; +} + +float func(uint arg) +{ + return 0.2; +} + +float4 main() : sv_target +{ + int i = 1; + uint u = 1; + return float4(func(i), func(u), func(int2(1, 1)), func(uint2(1, 1))); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.1, 0.2) -- 2.33.0

6 24

[PATCH 1/2] loader: Include timezones' Olson names in the registry.
by Giovanni Mascellani 08 Sep '21

08 Sep '21

They can be used for simplifying the timezone detection algorithm. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- loader/wine.inf.in | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ac30d9560c6..4cb5cd92894 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2740,6 +2740,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"MUI_Std",,"@tzres.dll,-39616" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Std",,"Afghanistan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"TZI",1,f2,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Olson names",,"Asia/Kabul" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Display",,"(UTC-09:00) Alaska" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Dlt",,"Alaskan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Display",,"@tzres.dll,-50194" @@ -2747,6 +2748,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Std",,"@tzres.dll,-50192" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Olson names",,"America/Anchorage America/Juneau America/Metlakatla America/Nome America/Sitka America/Yakutat US/Alaska" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2000",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2001",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2002",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -2764,6 +2766,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Std",,"@tzres.dll,-55200" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Std",,"Aleutian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Olson names",,"America/Adak America/Atka US/Aleutian" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2000",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2001",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2002",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -2781,6 +2784,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Dlt",,"@tzres.dll,-4 HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Std",,"@tzres.dll,-4464" HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Std",,"Altai Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Olson names",,"Asia/Barnaul" HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -2806,6 +2810,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41 HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Std",,"@tzres.dll,-41968" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Std",,"Arab Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Olson names",,"Asia/Aden Asia/Bahrain Asia/Kuwait Asia/Qatar Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Display",,"(UTC+04:00) Abu Dhabi, Muscat" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Dlt",,"Arabian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"MUI_Display",,"@tzres.dll,-42706" @@ -2813,6 +2818,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"MUI_Std",,"@tzres.dll,-42704" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Std",,"Arabian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Olson names",,"Asia/Dubai Asia/Muscat Etc/GMT-4" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Display",,"(UTC+03:00) Baghdad" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Dlt",,"Arabic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"MUI_Display",,"@tzres.dll,-8770" @@ -2820,6 +2826,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"MUI_Std",,"@tzres.dll,-8768" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Std",,"Arabic Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Olson names",,"Asia/Baghdad" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,03,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,03,00,00,00,00,00,00,00 @@ -2838,6 +2845,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Std",,"@tzres.dll,-19584" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Olson names",,"America/Argentina/La_Rioja America/Argentina/Rio_Gallegos America/Argentina/Salta America/Argentina/San_Juan America/Argentina/San_Luis America/Argentina/Tucuman America/Argentina/Ushuaia America/Buenos_Aires America/Catamarca America/Cordoba America/Jujuy America/Mendoza" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 @@ -2851,6 +2859,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Std",,"@tzres.dll,-25104" HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Std",,"Astrakhan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Olson names",,"Europe/Astrakhan Europe/Ulyanovsk" HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -2876,6 +2885,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Std",,"@tzres.dll,-34224" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Std",,"Atlantic Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Olson names",,"America/Glace_Bay America/Goose_Bay America/Halifax America/Moncton America/Thule Atlantic/Bermuda Canada/Atlantic" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -2893,6 +2903,7 @@ HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"MUI_Std",,"@tzres.dll,-47024" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Std",,"AUS Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Olson names",,"Australia/Darwin Australia/North" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Display",,"(UTC+08:45) Eucla" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Dlt",,"Aus Central W. Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"MUI_Display",,"@tzres.dll,-44674" @@ -2900,6 +2911,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"MUI_Std",,"@tzres.dll,-44672" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Std",,"Aus Central W. Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"TZI",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Olson names",,"Australia/Eucla" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2006",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2007",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2008",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 @@ -2914,6 +2926,7 @@ HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30368" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Std",,"AUS Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Olson names",,"Australia/ACT Australia/Canberra Australia/Melbourne Australia/NSW Australia/Sydney Australia/Victoria" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 @@ -2932,6 +2945,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Std",,"@tzres.dll,-11312" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Std",,"Azerbaijan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Olson names",,"Asia/Baku" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 @@ -2958,6 +2972,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"MUI_Std",,"@tzres.dll,-18832" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Std",,"Azores Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Olson names",,"America/Scoresbysund Atlantic/Azores" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Display",,"(UTC-03:00) Salvador" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Dlt",,"Bahia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"MUI_Display",,"@tzres.dll,-50898" @@ -2965,6 +2980,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"MUI_Dlt",,"@tzres.dll,-5 HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"MUI_Std",,"@tzres.dll,-50896" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Std",,"Bahia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Olson names",,"America/Bahia" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -2981,6 +2997,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Std",,"@tzres.dll,-48720" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Std",,"Bangladesh Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Olson names",,"Asia/Dacca Asia/Dhaka Asia/Thimbu Asia/Thimphu" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,05,00,03,00,17,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"FirstEntry",0x10001,"2009" @@ -2992,6 +3009,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Std",,"@tzres.dll,-56576" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Olson names",,"Europe/Minsk" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3014,6 +3032,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Std",,"@tzres.dll,-51968" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Std",,"Bougainville Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Olson names",,"Pacific/Bougainville" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3039,6 +3058,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"MUI_Std",,"@tzres.dll,-25712" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Std",,"Canada Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Olson names",,"America/Regina America/Swift_Current Canada/Saskatchewan" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Display",,"(UTC-01:00) Cabo Verde Is." HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Dlt",,"Cape Verde Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"MUI_Display",,"@tzres.dll,-2002" @@ -3046,6 +3066,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"MUI_Std",,"@tzres.dll,-2000" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Std",,"Cape Verde Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Olson names",,"Atlantic/Cape_Verde Etc/GMT+1" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Display",,"(UTC+04:00) Yerevan" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Dlt",,"Caucasus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Display",,"@tzres.dll,-29874" @@ -3053,6 +3074,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Std",,"@tzres.dll,-29872" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Std",,"Caucasus Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Olson names",,"Asia/Yerevan" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3075,6 +3097,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Std",,"@tzres.dll,-38928" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Std",,"Cen. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Olson names",,"Australia/Adelaide Australia/Broken_Hill Australia/South Australia/Yancowinna" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2000",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2001",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2002",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 @@ -3093,6 +3116,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Dlt",,"@tz HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Std",,"@tzres.dll,-36656" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Std",,"Central America Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Olson names",,"America/Belize America/Costa_Rica America/El_Salvador America/Guatemala America/Managua America/Tegucigalpa Etc/GMT+6 Pacific/Galapagos" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" @@ -3104,6 +3128,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-8176" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Std",,"Central Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Olson names",,"Antarctica/Vostok Asia/Almaty Asia/Bishkek Asia/Kashgar Asia/Qostanay Asia/Urumqi Etc/GMT-6 Indian/Chagos" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3119,6 +3144,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Dlt",,"@ HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Std",,"@tzres.dll,-56336" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Std",,"Central Brazilian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Olson names",,"America/Campo_Grande America/Cuiaba" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -3149,6 +3175,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"MUI_Std",,"@tzres.dll,-4896" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Std",,"Central Europe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Olson names",,"Europe/Belgrade Europe/Bratislava Europe/Budapest Europe/Ljubljana Europe/Podgorica Europe/Prague Europe/Tirane" HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"Display",,"(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"Dlt",,"Central European Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"MUI_Display",,"@tzres.dll,-2978" @@ -3156,6 +3183,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"MUI_Std",,"@tzres.dll,-2976" HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"Std",,"Central European Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central European Standard Time,"Olson names",,"Europe/Sarajevo Europe/Skopje Europe/Warsaw Europe/Zagreb Poland" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Display",,"(UTC+11:00) Solomon Is., New Caledonia" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Dlt",,"Central Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"MUI_Display",,"@tzres.dll,-64418" @@ -3163,6 +3191,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"MUI_Dlt",,"@tz HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"MUI_Std",,"@tzres.dll,-64416" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Std",,"Central Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Olson names",,"Antarctica/Casey Etc/GMT-11 Pacific/Efate Pacific/Guadalcanal Pacific/Kosrae Pacific/Noumea Pacific/Ponape" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Display",,"(UTC-06:00) Central Time (US & Canada)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Dlt",,"Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Display",,"@tzres.dll,-17458" @@ -3170,6 +3199,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Std",,"@tzres.dll,-17456" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Std",,"Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Olson names",,"America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Knox_IN America/Matamoros America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem America/Rainy_River America/Rankin_Inlet America/Resolute America/Winnipeg CST6CDT Canada/Central US/Central US/Indiana-Starke" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -3187,6 +3217,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-32800" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Olson names",,"America/Bahia_Banderas America/Merida America/Mexico_City America/Monterrey Mexico/General" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" @@ -3198,6 +3229,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Dlt",,"@tz HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Std",,"@tzres.dll,-62304" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Std",,"Chatham Islands Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"TZI",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Olson names",,"NZ-CHAT Pacific/Chatham" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2000",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2001",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2002",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 @@ -3216,6 +3248,7 @@ HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Std",,"@tzres.dll,-160" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Olson names",,"Asia/Chongqing Asia/Chungking Asia/Harbin Asia/Hong_Kong Asia/Macao Asia/Macau Asia/Shanghai Hongkong PRC" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Display",,"(UTC-05:00) Havana" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Dlt",,"Cuba Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Display",,"@tzres.dll,-17138" @@ -3223,6 +3256,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Dlt",,"@tzres.dll,-17 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Std",,"@tzres.dll,-17136" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Std",,"Cuba Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Olson names",,"America/Havana Cuba" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -3246,6 +3280,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Std",,"@tzres.dll,-50384" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Std",,"Dateline Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"TZI",1,d0,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Olson names",,"Etc/GMT+12" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Display",,"(UTC+03:00) Nairobi" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Dlt",,"E. Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Display",,"@tzres.dll,-62722" @@ -3253,6 +3288,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Std",,"@tzres.dll,-62720" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Std",,"E. Africa Standard Time" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Olson names",,"Africa/Addis_Ababa Africa/Asmera Africa/Dar_es_Salaam Africa/Djibouti Africa/Kampala Africa/Mogadishu Africa/Nairobi Antarctica/Syowa Etc/GMT-3 Indian/Antananarivo Indian/Comoro Indian/Mayotte" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Display",,"(UTC+10:00) Brisbane" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Dlt",,"E. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"MUI_Display",,"@tzres.dll,-65266" @@ -3260,6 +3296,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65264" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Std",,"E. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Olson names",,"Australia/Brisbane Australia/Lindeman Australia/Queensland" HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Display",,"(UTC+02:00) Chisinau" HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Dlt",,"E. Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Display",,"@tzres.dll,-32130" @@ -3267,6 +3304,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Std",,"@tzres.dll,-32128" HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Std",,"E. Europe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Olson names",,"Europe/Chisinau Europe/Tiraspol" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"(UTC-03:00) Brasilia" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Display",,"@tzres.dll,-64098" @@ -3274,6 +3312,7 @@ HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Std",,"@tzres.dll,-64096" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Olson names",,"America/Sao_Paulo Brazil/East" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -3304,6 +3343,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Dlt",,"@tzre HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Std",,"@tzres.dll,-58592" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Std",,"Easter Island Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Olson names",,"Chile/EasterIsland Pacific/Easter" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 @@ -3333,6 +3373,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Olson names",,"America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Iqaluit America/Kentucky/Monticello America/Louisville America/Montreal America/Nassau America/New_York America/Nipigon America/Pangnirtung America/Thunder_Bay America/Toronto Canada/Eastern EST5EDT US/Eastern US/Michigan" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -3350,6 +3391,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-59536" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Std",,"Eastern Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Olson names",,"America/Cancun" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -3376,6 +3418,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-5 HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Std",,"@tzres.dll,-59424" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Std",,"Egypt Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Olson names",,"Africa/Cairo Egypt" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 @@ -3398,6 +3441,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Std",,"@tzres.dll,-45952" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Std",,"Ekaterinburg Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Olson names",,"Asia/Yekaterinburg" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3423,6 +3467,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Dlt",,"@tzres.dll,-25 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Std",,"@tzres.dll,-25680" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Std",,"Fiji Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Olson names",,"Pacific/Fiji" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3466,6 +3511,7 @@ HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"MUI_Dlt",,"@tzres.dll,-632 HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"MUI_Std",,"@tzres.dll,-63264" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Std",,"FLE Standard Time" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Olson names",,"Europe/Helsinki Europe/Kiev Europe/Mariehamn Europe/Riga Europe/Sofia Europe/Tallinn Europe/Uzhgorod Europe/Vilnius Europe/Zaporozhye" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Display",,"(UTC+04:00) Tbilisi" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Dlt",,"Georgian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"MUI_Display",,"@tzres.dll,-418" @@ -3473,6 +3519,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"MUI_Std",,"@tzres.dll,-416" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Std",,"Georgian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Olson names",,"Asia/Tbilisi" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 @@ -3489,6 +3536,7 @@ HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"MUI_Dlt",,"@tzres.dll,-740 HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"MUI_Std",,"@tzres.dll,-7408" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Std",,"GMT Standard Time" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Olson names",,"Atlantic/Canary Atlantic/Faeroe Atlantic/Madeira Eire Europe/Belfast Europe/Dublin Europe/Guernsey Europe/Isle_of_Man Europe/Jersey Europe/Lisbon Europe/London GB GB-Eire Portugal" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Display",,"(UTC-03:00) Greenland" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Dlt",,"Greenland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Display",,"@tzres.dll,-58098" @@ -3496,6 +3544,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Std",,"@tzres.dll,-58096" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Std",,"Greenland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Olson names",,"America/Godthab" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 @@ -3521,6 +3570,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"MUI_Std",,"@tzres.dll,-47168" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Std",,"Greenwich Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Olson names",,"Africa/Abidjan Africa/Accra Africa/Bamako Africa/Banjul Africa/Bissau Africa/Conakry Africa/Dakar Africa/Freetown Africa/Lome Africa/Monrovia Africa/Nouakchott Africa/Ouagadougou Africa/Timbuktu America/Danmarkshavn Atlantic/Reykjavik Atlantic/St_Helena Iceland" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Display",,"(UTC+02:00) Athens, Bucharest" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Dlt",,"GTB Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Display",,"@tzres.dll,-24194" @@ -3528,6 +3578,7 @@ HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Dlt",,"@tzres.dll,-241 HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Std",,"@tzres.dll,-24192" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Std",,"GTB Standard Time" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Olson names",,"Asia/Famagusta Asia/Nicosia Europe/Athens Europe/Bucharest" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Display",,"(UTC-05:00) Haiti" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Dlt",,"Haiti Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Display",,"@tzres.dll,-2898" @@ -3535,6 +3586,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Std",,"@tzres.dll,-2896" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Std",,"Haiti Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Olson names",,"America/Port-au-Prince" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3558,6 +3610,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Std",,"@tzres.dll,-53376" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Std",,"Hawaiian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Olson names",,"Etc/GMT+10 Pacific/Honolulu Pacific/Johnston Pacific/Rarotonga Pacific/Tahiti US/Hawaii" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Display",,"(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Dlt",,"India Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"MUI_Display",,"@tzres.dll,-22402" @@ -3565,6 +3618,7 @@ HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"MUI_Std",,"@tzres.dll,-22400" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Std",,"India Standard Time" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Olson names",,"Asia/Calcutta" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Display",,"(UTC+03:30) Tehran" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Dlt",,"Iran Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Display",,"@tzres.dll,-5570" @@ -3572,6 +3626,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Dlt",,"@tzres.dll,-55 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Std",,"@tzres.dll,-5568" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Std",,"Iran Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Olson names",,"Asia/Tehran Iran" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2000",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2001",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2002",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 @@ -3630,6 +3685,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Std",,"@tzres.dll,-47968" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Std",,"Israel Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Olson names",,"Asia/Jerusalem Asia/Tel_Aviv Israel" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,01,00,02,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 @@ -3659,6 +3715,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Std",,"@tzres.dll,-17232" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Olson names",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 @@ -3683,6 +3740,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Std",,"@tzres.dll,-14720" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Std",,"Kaliningrad Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Olson names",,"Europe/Kaliningrad" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3708,6 +3766,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-6 HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"MUI_Std",,"@tzres.dll,-62048" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Olson names",,"Asia/Seoul ROK" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Display",,"(UTC+02:00) Tripoli" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Dlt",,"Libya Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"MUI_Display",,"@tzres.dll,-50770" @@ -3715,6 +3774,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"MUI_Dlt",,"@tzres.dll,-5 HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"MUI_Std",,"@tzres.dll,-50768" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Std",,"Libya Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Olson names",,"Africa/Tripoli Libya" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2012",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,02,00,02,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2013",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3727,6 +3787,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Std",,"@tzres.dll,-16768" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Std",,"Line Islands Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"TZI",1,b8,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Olson names",,"Etc/GMT-14 Pacific/Kiritimati" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Display",,"(UTC+10:30) Lord Howe Island" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Dlt",,"Lord Howe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Display",,"@tzres.dll,-8658" @@ -3734,6 +3795,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Std",,"@tzres.dll,-8656" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Std",,"Lord Howe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"TZI",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Olson names",,"Australia/LHI Australia/Lord_Howe" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2000",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2001",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2002",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 @@ -3752,6 +3814,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Std",,"@tzres.dll,-8832" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Olson names",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3779,6 +3842,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Std",,"@tzres.dll,-13120" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Std",,"Magallanes Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Olson names",,"America/Punta_Arenas" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -3805,6 +3869,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"MUI_Std",,"@tzres.dll,-20736" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Std",,"Marquesas Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"TZI",1,3a,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Olson names",,"Pacific/Marquesas" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Display",,"(UTC+04:00) Port Louis" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Dlt",,"Mauritius Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"MUI_Display",,"@tzres.dll,-60898" @@ -3812,6 +3877,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"MUI_Std",,"@tzres.dll,-60896" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Std",,"Mauritius Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Olson names",,"Indian/Mahe Indian/Mauritius Indian/Reunion" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3824,6 +3890,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"MUI_Std",,"@tzres.dll,-15968" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Std",,"Middle East Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Olson names",,"Asia/Beirut" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Display",,"(UTC-03:00) Montevideo" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Dlt",,"Montevideo Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Display",,"@tzres.dll,-27970" @@ -3831,6 +3898,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Std",,"@tzres.dll,-27968" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Std",,"Montevideo Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Olson names",,"America/Montevideo" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -3853,6 +3921,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Std",,"@tzres.dll,-2992" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Olson names",,"Africa/Casablanca Africa/El_Aaiun" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2000",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2001",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2002",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -3913,6 +3982,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Olson names",,"America/Boise America/Cambridge_Bay America/Denver America/Edmonton America/Inuvik America/Ojinaga America/Shiprock America/Yellowknife Canada/Mountain MST7MDT Navajo US/Mountain" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2000",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -3930,6 +4000,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-7248" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Std",,"Mountain Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Olson names",,"America/Chihuahua America/Mazatlan Mexico/BajaSur" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" @@ -3941,6 +4012,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"MUI_Std",,"@tzres.dll,-21104" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Std",,"Myanmar Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"TZI",1,7a,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Olson names",,"Asia/Rangoon Indian/Cocos" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Display",,"(UTC+07:00) Novosibirsk" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Dlt",,"N. Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Display",,"@tzres.dll,-30706" @@ -3948,6 +4020,7 @@ HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Dlt",,"@tz HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-30704" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Std",,"N. Central Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Olson names",,"Asia/Novosibirsk" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -3973,6 +4046,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Std",,"@tzres.dll,-6208" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Std",,"Namibia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Olson names",,"Africa/Windhoek" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2000",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2001",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2002",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4001,6 +4075,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"MUI_Std",,"@tzres.dll,-1216" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Std",,"Nepal Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"TZI",1,a7,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Olson names",,"Asia/Katmandu" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Display",,"(UTC+12:00) Auckland, Wellington" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Dlt",,"New Zealand Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"MUI_Display",,"@tzres.dll,-54898" @@ -4008,6 +4083,7 @@ HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"MUI_Std",,"@tzres.dll,-54896" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Std",,"New Zealand Standard Time" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Olson names",,"Antarctica/McMurdo Antarctica/South_Pole NZ Pacific/Auckland" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4026,6 +4102,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Std",,"@tzres.dll,-9504" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Std",,"Newfoundland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Olson names",,"America/St_Johns Canada/Newfoundland" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2000",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2001",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2002",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 @@ -4048,6 +4125,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Std",,"@tzres.dll,-47440" HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Std",,"Norfolk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Olson names",,"Pacific/Norfolk" HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2000",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2001",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2002",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4078,6 +4156,7 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Dlt",,"@tz HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Std",,"@tzres.dll,-19056" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Std",,"North Asia East Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Olson names",,"Asia/Irkutsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2000",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4103,6 +4182,7 @@ HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Std",,"@tzres.dll,-304" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Std",,"North Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Olson names",,"Asia/Krasnoyarsk Asia/Novokuznetsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4128,6 +4208,7 @@ HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Std",,"@tzres.dll,-35888" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Std",,"North Korea Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Olson names",,"Asia/Pyongyang" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2015",1,02,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,08,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2016",1,02,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2017",1,02,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4142,6 +4223,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Dlt",,"@tzres.dll,-55 HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Std",,"@tzres.dll,-55952" HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Std",,"Omsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Olson names",,"Asia/Omsk" HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4167,6 +4249,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Std",,"@tzres.dll,-65008" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Olson names",,"America/Santiago Chile/Continental" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -4205,6 +4288,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Std",,"@tzres.dll,-11232" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Olson names",,"America/Los_Angeles America/Vancouver Canada/Pacific PST8PDT US/Pacific" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4222,6 +4306,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-15584" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Olson names",,"America/Ensenada America/Santa_Isabel America/Tijuana Mexico/BajaNorte" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4242,6 +4327,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Std",,"@tzres.dll,-28752" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Std",,"Pakistan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Olson names",,"Asia/Karachi" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2008",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2009",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,03,00,03,00,00,00,00,00,00,00,00,00 @@ -4255,6 +4341,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Std",,"@tzres.dll,-50224" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Std",,"Paraguay Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Olson names",,"America/Asuncion" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -4278,6 +4365,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Std",,"@tzres.dll,-53760" HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Std",,"Qyzylorda Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Olson names",,"Asia/Qyzylorda" HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4307,6 +4395,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Std",,"@tzres.dll,-45104" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Olson names",,"Africa/Ceuta Europe/Brussels Europe/Copenhagen Europe/Madrid Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Display",,"(UTC+11:00) Chokurdakh" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Dlt",,"Russia Time Zone 10" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Display",,"@tzres.dll,-59266" @@ -4314,6 +4403,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Dlt",,"@tzres.dll,-5 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Std",,"@tzres.dll,-59264" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Std",,"Russia Time Zone 10" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Olson names",,"Asia/Srednekolymsk" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4339,6 +4429,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Dlt",,"@tzres.dll,-4 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Std",,"@tzres.dll,-46000" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Std",,"Russia Time Zone 11" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Olson names",,"Asia/Anadyr Asia/Kamchatka" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4361,6 +4452,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Dlt",,"@tzres.dll,-17 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Std",,"@tzres.dll,-17920" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Std",,"Russia Time Zone 3" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Olson names",,"Europe/Samara" HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4383,6 +4475,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Std",,"@tzres.dll,-44560" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Std",,"Russian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Olson names",,"Europe/Kirov Europe/Moscow Europe/Simferopol W-SU" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4408,6 +4501,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Olson names",,"America/Belem America/Cayenne America/Fortaleza America/Maceio America/Paramaribo America/Recife America/Santarem Antarctica/Palmer Antarctica/Rothera Atlantic/Stanley Etc/GMT+3" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"(UTC-05:00) Bogota, Lima, Quito, Rio Branco" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Display",,"@tzres.dll,-49426" @@ -4415,6 +4509,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Std",,"@tzres.dll,-49424" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Std",,"SA Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Olson names",,"America/Bogota America/Cayman America/Coral_Harbour America/Eirunepe America/Guayaquil America/Jamaica America/Lima America/Panama America/Porto_Acre America/Rio_Branco Brazil/Acre Etc/GMT+5 Jamaica" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Display",,"(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Dlt",,"SA Western Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"MUI_Display",,"@tzres.dll,-57122" @@ -4422,6 +4517,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"MUI_Std",,"@tzres.dll,-57120" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Std",,"SA Western Standard Time" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Olson names",,"America/Anguilla America/Antigua America/Aruba America/Barbados America/Blanc-Sablon America/Boa_Vista America/Curacao America/Dominica America/Grenada America/Guadeloupe America/Guyana America/Kralendijk America/La_Paz America/Lower_Princes America/Manaus America/Marigot America/Martinique America/Montserrat America/Port_of_Spain America/Porto_Velho America/Puerto_Rico America/Santo_Domingo America/St_Barthelemy America/St_Kitts America/St_Lucia America/St_Thomas America/St_Vincent America/Tortola America/Virgin Brazil/West Etc/GMT+4" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Display",,"(UTC-03:00) Saint Pierre and Miquelon" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Dlt",,"Saint Pierre Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"MUI_Display",,"@tzres.dll,-5586" @@ -4429,6 +4525,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"MUI_Std",,"@tzres.dll,-5584" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Std",,"Saint Pierre Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Olson names",,"America/Miquelon" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4446,6 +4543,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Std",,"@tzres.dll,-35104" HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Std",,"Sakhalin Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Olson names",,"Asia/Sakhalin" HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4471,6 +4569,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Std",,"@tzres.dll,-14592" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Std",,"Samoa Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Olson names",,"Pacific/Apia" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2000",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2001",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2002",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4493,6 +4592,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Std",,"@tzres.dll,-5984" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Std",,"Sao Tome Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Olson names",,"Africa/Sao_Tome" HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2018",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2019",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2020",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4505,6 +4605,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Std",,"@tzres.dll,-33808" HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Std",,"Saratov Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Olson names",,"Europe/Saratov" HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4530,6 +4631,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"MUI_Std",,"@tzres.dll,-53728" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Std",,"SE Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Olson names",,"Antarctica/Davis Asia/Bangkok Asia/Jakarta Asia/Phnom_Penh Asia/Pontianak Asia/Saigon Asia/Vientiane Etc/GMT-7 Indian/Christmas" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Display",,"(UTC+08:00) Kuala Lumpur, Singapore" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Dlt",,"Singapore Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"MUI_Display",,"@tzres.dll,-61842" @@ -4537,6 +4639,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"MUI_Std",,"@tzres.dll,-61840" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Std",,"Singapore Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Olson names",,"Asia/Brunei Asia/Kuala_Lumpur Asia/Kuching Asia/Makassar Asia/Manila Asia/Singapore Asia/Ujung_Pandang Etc/GMT-8 Singapore" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Display",,"(UTC+02:00) Harare, Pretoria" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Dlt",,"South Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Display",,"@tzres.dll,-38898" @@ -4544,6 +4647,7 @@ HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Std",,"@tzres.dll,-38896" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Std",,"South Africa Standard Time" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Olson names",,"Africa/Blantyre Africa/Bujumbura Africa/Gaborone Africa/Harare Africa/Johannesburg Africa/Juba Africa/Kigali Africa/Lubumbashi Africa/Lusaka Africa/Maputo Africa/Maseru Africa/Mbabane Etc/GMT-2" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Display",,"(UTC+05:30) Sri Jayawardenepura" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Dlt",,"Sri Lanka Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Display",,"@tzres.dll,-39410" @@ -4551,6 +4655,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Std",,"@tzres.dll,-39408" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Std",,"Sri Lanka Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Olson names",,"Asia/Colombo" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4568,6 +4673,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Dlt",,"@tzres.dll,-9 HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Std",,"@tzres.dll,-9792" HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Std",,"Sudan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Olson names",,"Africa/Khartoum" HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,06,00,03,00,0c,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4596,6 +4702,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Dlt",,"@tzres.dll,-4 HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Std",,"@tzres.dll,-46576" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Std",,"Syria Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Olson names",,"Asia/Damascus" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,00,00,00,00,00,00,00,00 @@ -4617,6 +4724,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"MUI_Std",,"@tzres.dll,-26432" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Std",,"Taipei Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Olson names",,"Asia/Taipei ROC" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Display",,"(UTC+10:00) Hobart" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Dlt",,"Tasmania Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"MUI_Display",,"@tzres.dll,-36018" @@ -4624,6 +4732,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"MUI_Std",,"@tzres.dll,-36016" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Std",,"Tasmania Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Olson names",,"Antarctica/Macquarie Australia/Currie Australia/Hobart Australia/Tasmania" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4641,6 +4750,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Std",,"@tzres.dll,-43072" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Std",,"Tocantins Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Olson names",,"America/Araguaina" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -4657,6 +4767,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"MUI_Dlt",,"@tzres.dll,-1 HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"MUI_Std",,"@tzres.dll,-16240" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Std",,"Tokyo Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Olson names",,"Asia/Dili Asia/Jayapura Asia/Tokyo Etc/GMT-9 Japan Pacific/Palau" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Display",,"(UTC+07:00) Tomsk" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Dlt",,"Tomsk Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Display",,"@tzres.dll,-29138" @@ -4664,6 +4775,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Std",,"@tzres.dll,-29136" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Std",,"Tomsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Olson names",,"Asia/Tomsk" HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4689,6 +4801,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Dlt",,"@tzres.dll,-7 HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Std",,"@tzres.dll,-7216" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Std",,"Tonga Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Olson names",,"Pacific/Tongatapu" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2000",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2001",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2002",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 @@ -4704,6 +4817,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Std",,"@tzres.dll,-31472" HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Std",,"Transbaikal Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Olson names",,"Asia/Chita" HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4731,6 +4845,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Dlt",,"@tzres.dll,- HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Std",,"@tzres.dll,-24848" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Olson names",,"Europe/Istanbul Turkey" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 @@ -4758,6 +4873,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Std",,"@tzres.dll,-20560" HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Std",,"Turks And Caicos Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Olson names",,"America/Grand_Turk" HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 @@ -4779,6 +4895,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Std",,"@tzres.dll,-47200" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Olson names",,"Asia/Choibalsan Asia/Ulaanbaatar Asia/Ulan_Bator" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2003",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 @@ -4797,6 +4914,7 @@ HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Dlt",,"@tzres.d HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Std",,"@tzres.dll,-34928" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Std",,"US Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Olson names",,"America/Indiana/Marengo America/Indiana/Vevay America/Indianapolis" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4814,6 +4932,7 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"MUI_Std",,"@tzres.dll,-37472" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Olson names",,"America/Creston America/Dawson_Creek America/Fort_Nelson America/Hermosillo America/Phoenix Etc/GMT+7 US/Arizona" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"(UTC) Coordinated Universal Time" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Display",,"@tzres.dll,-22002" @@ -4821,6 +4940,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Dlt",,"@tzres.dll,-22001" HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Std",,"@tzres.dll,-22000" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Olson names",,"Etc/GMT Etc/UCT Etc/UTC GMT+0 GMT-0 GMT0 Greenwich UCT UTC Universal Zulu" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Display",,"(UTC+12:00) Coordinated Universal Time+12" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Dlt",,"UTC+12" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Display",,"@tzres.dll,-1202" @@ -4828,6 +4948,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Dlt",,"@tzres.dll,-1201" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Std",,"@tzres.dll,-1200" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Std",,"UTC+12" HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Olson names",,"Etc/GMT-12 Kwajalein Pacific/Funafuti Pacific/Kwajalein Pacific/Majuro Pacific/Nauru Pacific/Tarawa Pacific/Wake Pacific/Wallis" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Display",,"(UTC+13:00) Coordinated Universal Time+13" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Dlt",,"UTC+13" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Display",,"@tzres.dll,-8786" @@ -4835,6 +4956,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Dlt",,"@tzres.dll,-8785" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Std",,"@tzres.dll,-8784" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Std",,"UTC+13" HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Olson names",,"Etc/GMT-13 Pacific/Enderbury Pacific/Fakaofo" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Display",,"(UTC-02:00) Coordinated Universal Time-02" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Dlt",,"UTC-02" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Display",,"@tzres.dll,-37330" @@ -4842,6 +4964,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Dlt",,"@tzres.dll,-37329" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Std",,"@tzres.dll,-37328" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Std",,"UTC-02" HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"TZI",1,78,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Olson names",,"America/Noronha Atlantic/South_Georgia Brazil/DeNoronha Etc/GMT+2" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Display",,"(UTC-08:00) Coordinated Universal Time-08" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Dlt",,"UTC-08" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Display",,"@tzres.dll,-3346" @@ -4849,6 +4972,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Dlt",,"@tzres.dll,-3345" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Std",,"@tzres.dll,-3344" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Std",,"UTC-08" HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Olson names",,"Etc/GMT+8 Pacific/Pitcairn" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Display",,"(UTC-09:00) Coordinated Universal Time-09" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Dlt",,"UTC-09" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Display",,"@tzres.dll,-39154" @@ -4856,6 +4980,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Dlt",,"@tzres.dll,-39153" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Std",,"@tzres.dll,-39152" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Std",,"UTC-09" HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Olson names",,"Etc/GMT+9 Pacific/Gambier" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Display",,"(UTC-11:00) Coordinated Universal Time-11" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Dlt",,"UTC-11" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Display",,"@tzres.dll,-19410" @@ -4863,6 +4988,7 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Dlt",,"@tzres.dll,-19409" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Std",,"@tzres.dll,-19408" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Std",,"UTC-11" HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"TZI",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Olson names",,"Etc/GMT+11 Pacific/Midway Pacific/Niue Pacific/Pago_Pago Pacific/Samoa US/Samoa" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"(UTC-04:00) Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Display",,"@tzres.dll,-51474" @@ -4870,6 +4996,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Std",,"@tzres.dll,-51472" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Olson names",,"America/Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2007",1,0e,01,00,00,00,00,00,00,e2,ff,ff,ff,00,00,0c,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2008",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2009",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 @@ -4890,6 +5017,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Std",,"@tzres.dll,-61376" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Std",,"Vladivostok Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Olson names",,"Asia/Ust-Nera Asia/Vladivostok" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4915,6 +5043,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Std",,"@tzres.dll,-18048" HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Std",,"Volgograd Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Olson names",,"Europe/Volgograd" HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -4943,6 +5072,7 @@ HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65376" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Std",,"W. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Olson names",,"Australia/Perth Australia/West" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 @@ -4957,6 +5087,7 @@ HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"MUI_Dlt",,"@ HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"MUI_Std",,"@tzres.dll,-64976" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Std",,"W. Central Africa Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Olson names",,"Africa/Algiers Africa/Bangui Africa/Brazzaville Africa/Douala Africa/Kinshasa Africa/Lagos Africa/Libreville Africa/Luanda Africa/Malabo Africa/Ndjamena Africa/Niamey Africa/Porto-Novo Africa/Tunis Etc/GMT-1" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Display",,"(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Dlt",,"W. Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"MUI_Display",,"@tzres.dll,-27698" @@ -4964,6 +5095,7 @@ HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"MUI_Std",,"@tzres.dll,-27696" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Std",,"W. Europe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Olson names",,"Arctic/Longyearbyen Atlantic/Jan_Mayen Europe/Amsterdam Europe/Andorra Europe/Berlin Europe/Busingen Europe/Gibraltar Europe/Luxembourg Europe/Malta Europe/Monaco Europe/Oslo Europe/Rome Europe/San_Marino Europe/Stockholm Europe/Vaduz Europe/Vatican Europe/Vienna Europe/Zurich" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Display",,"(UTC+07:00) Hovd" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Dlt",,"W. Mongolia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Display",,"@tzres.dll,-53954" @@ -4971,6 +5103,7 @@ HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Std",,"@tzres.dll,-53952" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Std",,"W. Mongolia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Olson names",,"Asia/Hovd" HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2003",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 @@ -4989,6 +5122,7 @@ HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Std",,"@tzres.dll,-49664" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Std",,"West Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Olson names",,"Antarctica/Mawson Asia/Aqtau Asia/Aqtobe Asia/Ashgabat Asia/Ashkhabad Asia/Atyrau Asia/Dushanbe Asia/Oral Asia/Samarkand Asia/Tashkent Etc/GMT-5 Indian/Kerguelen Indian/Maldives" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Display",,"(UTC+02:00) Gaza, Hebron" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Dlt",,"West Bank Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Display",,"@tzres.dll,-46162" @@ -4996,6 +5130,7 @@ HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Std",,"@tzres.dll,-46160" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Std",,"West Bank Standard Time" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Olson names",,"Asia/Gaza Asia/Hebron" HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 @@ -5043,6 +5178,7 @@ HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Dlt",,"@tzres HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Std",,"@tzres.dll,-10224" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Std",,"West Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Olson names",,"Antarctica/DumontDUrville Etc/GMT-10 Pacific/Guam Pacific/Port_Moresby Pacific/Saipan Pacific/Truk" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Display",,"(UTC+09:00) Yakutsk" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Dlt",,"Yakutsk Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"MUI_Display",,"@tzres.dll,-40578" @@ -5050,6 +5186,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"MUI_Std",,"@tzres.dll,-40576" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Olson names",,"Asia/Khandyga Asia/Yakutsk" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 @@ -5075,6 +5212,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Std",,"@tzres.dll,-26288" HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Std",,"Yukon Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Olson names",,"America/Dawson America/Whitehorse Canada/Yukon" HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -- 2.33.0

1 1

[PATCH vkd3d 1/3] tests: Introduce struct bundle_context.
by Conor McCarthy 08 Sep '21

08 Sep '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 26 +++++++++----------------- tests/d3d12_test_utils.h | 23 +++++++++++++++++++++++ 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index f723dbaa..eddd6cbf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7372,11 +7372,10 @@ static void test_bundle_state_inheritance(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list, *bundle; - ID3D12CommandAllocator *bundle_allocator; + struct bundle_context bundle_context; struct test_context context; struct resource_readback rb; ID3D12CommandQueue *queue; - ID3D12Device *device; unsigned int x, y; HRESULT hr; @@ -7388,16 +7387,10 @@ static void test_bundle_state_inheritance(void) if (!init_test_context(&context, NULL)) return; - device = context.device; command_list = context.list; queue = context.queue; - - hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_BUNDLE, - &IID_ID3D12CommandAllocator, (void **)&bundle_allocator); - ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); - hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE, - bundle_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&bundle); - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + init_bundle_context(context.device, &bundle_context); + bundle = bundle_context.list; /* A bundle does not inherit the current pipeline state. */ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -7431,7 +7424,7 @@ static void test_bundle_state_inheritance(void) release_resource_readback(&rb); reset_command_list(command_list, context.allocator); - reset_command_list(bundle, bundle_allocator); + reset_command_list(bundle, bundle_context.allocator); /* A bundle sets to null the pipeline state in the executing command list. */ ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); @@ -7466,7 +7459,7 @@ static void test_bundle_state_inheritance(void) release_resource_readback(&rb); reset_command_list(command_list, context.allocator); - reset_command_list(bundle, bundle_allocator); + reset_command_list(bundle, bundle_context.allocator); /* A bundle does not inherit the current primitive topology. */ transition_resource_state(command_list, context.render_target, @@ -7503,7 +7496,7 @@ static void test_bundle_state_inheritance(void) release_resource_readback(&rb); reset_command_list(command_list, context.allocator); - reset_command_list(bundle, bundle_allocator); + reset_command_list(bundle, bundle_context.allocator); /* A bundle sets to undefined the primitive topology in the executing command list. */ transition_resource_state(command_list, context.render_target, @@ -7540,7 +7533,7 @@ static void test_bundle_state_inheritance(void) release_resource_readback(&rb); reset_command_list(command_list, context.allocator); - reset_command_list(bundle, bundle_allocator); + reset_command_list(bundle, bundle_context.allocator); /* A bundle inherit all other states. */ transition_resource_state(command_list, context.render_target, @@ -7566,7 +7559,7 @@ static void test_bundle_state_inheritance(void) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); reset_command_list(command_list, context.allocator); - reset_command_list(bundle, bundle_allocator); + reset_command_list(bundle, bundle_context.allocator); /* All state that is set in a bundle affects a command list. */ transition_resource_state(command_list, context.render_target, @@ -7591,8 +7584,7 @@ static void test_bundle_state_inheritance(void) todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); - ID3D12CommandAllocator_Release(bundle_allocator); - ID3D12GraphicsCommandList_Release(bundle); + destroy_bundle_context(&bundle_context); destroy_test_context(&context); } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 0374d8d1..5cf2c130 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -1008,6 +1008,29 @@ static inline void destroy_test_context_(unsigned int line, struct test_context ok_(line)(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct bundle_context +{ + ID3D12CommandAllocator *allocator; + ID3D12GraphicsCommandList *list; +}; + +#define init_bundle_context(device, context) init_bundle_context_(__LINE__, device, context) +static inline void init_bundle_context_(unsigned int line, ID3D12Device *device, struct bundle_context *bundle) +{ + HRESULT hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_BUNDLE, + &IID_ID3D12CommandAllocator, (void **)&bundle->allocator); + ok_(line)(SUCCEEDED(hr), "Failed to create bundle command allocator, hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_BUNDLE, + bundle->allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&bundle->list); + ok(SUCCEEDED(hr), "Failed to create bundle command list, hr %#x.\n", hr); +} + +static inline void destroy_bundle_context(struct bundle_context *bundle) +{ + ID3D12CommandAllocator_Release(bundle->allocator); + ID3D12GraphicsCommandList_Release(bundle->list); +} + static inline D3D12_CPU_DESCRIPTOR_HANDLE get_cpu_handle(ID3D12Device *device, ID3D12DescriptorHeap *heap, D3D12_DESCRIPTOR_HEAP_TYPE heap_type, unsigned int offset) { -- 2.32.0

1 2

[PATCH 1/2] attrib: Avoid crash when called without parameter.
by Bernhard Übelacker 08 Sep '21

08 Sep '21

If attrib is called without any parameter the variable originalname is used uninitialized. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- C:\>attrib wine: Unhandled page fault on write access to 000000007B027406 at address 0000000000402937 (thread 0110), starting debugger... Unhandled exception: page fault on write access to 0x7b027406 in 64-bit code (0x0000000000402937). ... Backtrace: =>0 0x0000000000402937 wmain+0x197(argc=<is not available>, argv=<is not available>) [Z:\home\bernhard\data\entwicklung\2021\wine\wine-git\wine-git\programs\attrib\attrib.c:295] in attrib (0x0000000000000000) 1 0x0000000000403455 wmainCRTStartup+0x64() [Z:\home\bernhard\data\entwicklung\2021\wine\wine-git\wine-git\dlls\msvcrt\crt_wmain.c:58] in attrib (0x0000000000000000) 2 0x000000007b62c7a9 BaseThreadInitThunk+0x8(unknown=<is not available>, entry=<is not available>, arg=<is not available>) [Z:\home\bernhard\data\entwicklung\2021\wine\wine-git\wine-git\dlls\kernel32\thread.c:61] in kernel32 (0x0000000000000000) 3 0x000000007bc56ee3 RtlUserThreadStart+0x82(entry=0x4033f0, arg=0x3f0000) [Z:\home\bernhard\data\entwicklung\2021\wine\wine-git\wine-git\dlls\ntdll\thread.c:241] in ntdll (0x0000000000000000) 0x0000000000402937 wmain+0x197 [Z:\home\bernhard\data\entwicklung\2021\wine\wine-git\wine-git\programs\attrib\attrib.c:295] in attrib: movw %r15w,(%r8) 295 *namepart = 0; --- programs/attrib/attrib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 4813443449b..4ebcd2b8024 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -236,7 +236,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, int __cdecl wmain(int argc, WCHAR *argv[]) { WCHAR name[MAX_PATH]; - WCHAR *namepart; + WCHAR *namepart = 0; WCHAR curdir[MAX_PATH]; WCHAR originalname[MAX_PATH]; DWORD attrib_set = 0; @@ -252,7 +252,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - lstrcpyW(name, L"*"); + GetCurrentDirectoryW(ARRAY_SIZE(originalname), originalname); + lstrcatW(originalname, L"\\*"); while (i < argc) { WCHAR *param = argv[i++]; -- 2.30.2

1 1

[PATCH] cmd: Fix cmd test in pure 64-bit wine.
by Bernhard Übelacker 08 Sep '21

08 Sep '21

A pure wine64 prefix contains no c:\windows\command\start.exe. Therefore the cmd test fails like this: batch.c:321: Test failed: unexpected char 0x66 position 9 in line 1681 (got 'start /W failed to wait', wanted 'start /W seems to really wait') Or a shorter reproducer: $ wine cmd /C "start /w """" cmd" File not found. Related to the patches in: https://bugs.winehq.org/show_bug.cgi?id=50867 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..a55ce6e0244 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4351,8 +4351,8 @@ void WCMD_start(WCHAR *args) STARTUPINFOW st; PROCESS_INFORMATION pi; - GetWindowsDirectoryW( file, MAX_PATH ); - lstrcatW(file, L"\\command\\start.exe"); + GetSystemDirectoryW( file, MAX_PATH ); + lstrcatW(file, L"\\start.exe"); cmdline = heap_xalloc( (lstrlenW(file) + lstrlenW(args) + 8) * sizeof(WCHAR) ); lstrcpyW( cmdline, file ); lstrcatW(cmdline, L" "); -- 2.30.2

1 0

[PATCH] d3dx10: Partially implement D3DX10CreateEffectFromResource().
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/compiler.c | 82 +++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 4 +- dlls/d3dx10_43/tests/d3dx10.c | 22 ++++++++++ include/d3dx10async.h | 12 +++++ 4 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 0bda2712d76..2a306fa8f57 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -123,3 +123,85 @@ HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHA return hr; } + +static HRESULT get_resource_data(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) +{ + HGLOBAL resource; + + *length = SizeofResource(module, resinfo); + if (!*length) + return D3DX10_ERR_INVALID_DATA; + + resource = LoadResource(module, resinfo); + if (!resource) + return D3DX10_ERR_INVALID_DATA; + + *buffer = LockResource(resource); + if (!*buffer) + return D3DX10_ERR_INVALID_DATA; + + return S_OK; +} + +HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE module, const char *resource_name, + const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult) +{ + HRSRC resinfo; + void *data; + DWORD size; + HRESULT hr; + + TRACE("module %p, resource_name %s, filename %s, defines %p, include %p, profile %s, " + "shader_flags %#x, effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, " + "errors %p, hresult %p.\n", module, debugstr_a(resource_name), debugstr_a(filename), + defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (!(resinfo = FindResourceA(module, resource_name, (const char *)RT_RCDATA))) + return D3DX10_ERR_INVALID_DATA; + + if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) + return hr; + + return D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); +} + +HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *resource_name, + const WCHAR *filenameW, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult) +{ + char *filename; + HRSRC resinfo; + void *data; + DWORD size; + HRESULT hr; + int len; + + TRACE("module %p, resource_name %s, filename %s, defines %p, include %p, profile %s, " + "shader_flags %#x, effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, " + "errors %p, hresult %p.\n", module, debugstr_w(resource_name), debugstr_w(filenameW), + defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (!(resinfo = FindResourceW(module, resource_name, (const WCHAR *)RT_RCDATA))) + return D3DX10_ERR_INVALID_DATA; + + if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) + return hr; + + len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = heap_alloc(len))) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + + hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + heap_free(filename); + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index da6629ad1a0..8bc9451aeab 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -23,8 +23,8 @@ @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index bc5ca6747f5..70827056f5f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -3153,6 +3153,27 @@ todo_wine ok(!refcount, "Unexpected refcount.\n"); } +static void test_create_effect_from_resource(void) +{ + ID3D10Device *device; + ID3D10Effect *effect; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = D3DX10CreateEffectFromResourceA(GetModuleHandleA(NULL), "resource", NULL, NULL, NULL, + "fx_4_0", 0, 0, device, NULL, NULL, &effect, NULL, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Unexpected hr %#x.\n", hr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Unexpected refcount.\n"); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -3163,4 +3184,5 @@ START_TEST(d3dx10) test_create_texture(); test_font(); test_sprite(); + test_create_effect_from_resource(); } diff --git a/include/d3dx10async.h b/include/d3dx10async.h index c8204bc7798..0b7aca9c023 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -58,6 +58,18 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE module, const char *resource_name, + const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *resource_name, + const WCHAR *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader); -- 2.33.0

2 1

[PATCH] d3dx10_38/tests: Enable tests.
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure.ac | 1 + dlls/d3dx10_38/Makefile.in | 1 + dlls/d3dx10_38/tests/Makefile.in | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 dlls/d3dx10_38/tests/Makefile.in diff --git a/configure.ac b/configure.ac index e10bcca50e1..f986809a603 100644 --- a/configure.ac +++ b/configure.ac @@ -3085,6 +3085,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 5942b7c7c42..a1e7028de86 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_38.dll +IMPORTLIB = d3dx10_38 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_38/tests/Makefile.in b/dlls/d3dx10_38/tests/Makefile.in new file mode 100644 index 00000000000..9e911457c81 --- /dev/null +++ b/dlls/d3dx10_38/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_38.dll +IMPORTS = d3dx10_38 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/5] d3d10/effect: Fix indexing in GetPixelShader().
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++++++++----- dlls/d3d10/tests/effect.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 180d36ce65b..fbfe8d0113a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -7104,19 +7104,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_VARIABLE_TYPE basetype; + HRESULT hr; TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + *shader = NULL; - if (v->type->basetype != D3D10_SVT_PIXELSHADER) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, &basetype))) + return hr; + + if (basetype != D3D10_SVT_PIXELSHADER) { WARN("Shader is not a pixel shader.\n"); - return E_FAIL; + return D3DERR_INVALIDCALL; } - if ((*shader = v->u.shader.shader.ps)) + if ((*shader = s->shader.ps)) ID3D10PixelShader_AddRef(*shader); return S_OK; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 4583863d59b..603f3dd049a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6015,6 +6015,7 @@ static void test_effect_shader_object(void) ID3D10EffectShaderVariable *s; ID3D10EffectVariable *v; ID3D10VertexShader *vs; + ID3D10PixelShader *ps; ID3D10Effect* effect; ID3D10Device *device; ULONG refcount; @@ -6060,6 +6061,37 @@ static void test_effect_shader_object(void) ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 0, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 1, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 2, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 3, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 4, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = NULL; + hr = s->lpVtbl->GetPixelShader(s, 5, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!ps, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); -- 2.33.0

2 9

[PATCH 1/5] d3dcompiler/tests: Test including an absolute path.
by Zebediah Figura 08 Sep '21

08 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index a950fa83d89..ad27084dce0 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1523,7 +1523,7 @@ struct test_d3dinclude static void test_d3dcompile(void) { struct test_d3dinclude include = {{&test_d3dinclude_vtbl}}; - WCHAR filename[MAX_PATH], directory[MAX_PATH]; + WCHAR filename[MAX_PATH], directory[MAX_PATH], include_filename[MAX_PATH]; ID3D10Blob *blob = NULL, *errors = NULL; CHAR filename_a[MAX_PATH]; HRESULT hr; @@ -1542,12 +1542,20 @@ static void test_d3dcompile(void) static const char include2[] = "#include \"include1.h\"\n" "float4 light_color = LIGHT;\n"; + static const char ps_absolute_template[] = + "#include \"%ls\"\n" + "\n" + "float4 main() : COLOR\n" + "{\n" + " return light_color;\n" + "}"; + char ps_absolute_buffer[sizeof(ps_absolute_template) + MAX_PATH]; create_file(L"source.ps", ps_code, strlen(ps_code), filename); create_directory(L"include"); create_file(L"include\\include1.h", include1_wrong, strlen(include1_wrong), NULL); create_file(L"include1.h", include1, strlen(include1), NULL); - create_file(L"include\\include2.h", include2, strlen(include2), NULL); + create_file(L"include\\include2.h", include2, strlen(include2), include_filename); len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); @@ -1650,6 +1658,18 @@ static void test_d3dcompile(void) blob = NULL; } + sprintf(ps_absolute_buffer, ps_absolute_template, include_filename); + hr = ppD3DCompile(ps_absolute_buffer, sizeof(ps_absolute_buffer), filename_a, NULL, + D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!!blob, "Got unexpected blob.\n"); + todo_wine ok(!errors, "Got unexpected errors.\n"); + if (blob) + { + ID3D10Blob_Release(blob); + blob = NULL; + } + GetCurrentDirectoryW(MAX_PATH, directory); SetCurrentDirectoryW(temp_dir); -- 2.33.0

5 13

[PATCH] widl: Write default values for VARIANT arguments.
by Nikolay Sivov 08 Sep '21

08 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Main motivation is to fix sapiaut.idl warning from CreateGrammar() method. tools/widl/write_msft.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index c39f38249c8..228f58e2649 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1221,7 +1221,8 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e int vt; if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) { - if (get_type_vt(type) != VT_BSTR) + vt = get_type_vt(type); + if (vt != VT_BSTR && vt != VT_VARIANT) error("string default value applied to non-string type\n"); chat("default value '%s'\n", expr->u.sval); write_string_value(typelib, out, expr->u.sval); @@ -1251,6 +1252,20 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_VARIANT: { + switch (expr->type) { + case EXPR_DOUBLE: + vt = VT_R4; + break; + case EXPR_NUM: + vt = VT_I4; + break; + default: + warning("can't write default VT_VARIANT value for expression type %d.\n", expr->type); + return; + } + break; + } default: warning("can't write value of type %d yet\n", vt); return; -- 2.33.0

1 0

PE Conversion
by Ulrich Czekalla 08 Sep '21

08 Sep '21

Hi All, As most of you are aware, a significant on-going task has been PE conversion of builtin dlls. There is lots of activity going on in this area and I want to give the broader community visibility into CodeWeavers' efforts to help get this done. We're planning to do a push to complete most of this work in time for Wine 7.0. I also wanted to make sure there was no duplication of effort. Below is a table listing the outstanding dlls along with names next to the dlls that I know are actively being converted. This is mostly a thread to coordinate the effort and hopefully draw some discussion around design/implementation issues that still needs to be resolved in order to convert some of the dlls. avicap32 capi2032 ctapi32 d3d12 dinput*.dll.so - Rémi Bernon dxgi.dll.so gphoto2.ds.so iphlpapi.dll.so - Huw Davies l3codeca.acm.so mountmgr.sys.so mp3dmod.dll.so msgsm32.acm.so msxml3.dll.so nsiproxy.sys.so openal32.dll.so opengl32.dll.so sane.ds.so shell32.dll.so winealsa.drv.so wineandroid.drv winebus.sys.so - Rémi Bernon winecoreaudio.drv wined3d.dll.so - Zebediah Figura winejoystick.drv.so - Zebediah Figura winemac.drv wineoss.drv wineqtdecoder wineusb.sys winex11.drv.so - Jacek Caban winspool.drv.so - Huw Davies wnaspi32.dll.so x3daudio1_*.dll.so - Rémi Bernon xactengine2_*.dll.so - Rémi Bernon xactengine3_* xapofx1_*.dll.so - Rémi Bernon xaudio2_* Thanks, -Ulrich

13 17

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

08 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 68 ++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..330c9203b7d 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,48 @@ 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) return 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 (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) return 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 (!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 +532,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 +609,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 6

[PATCH 1/5] server: Cancel asyncs through fd_ops.
by Zebediah Figura 08 Sep '21

08 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 2 +- server/change.c | 1 + server/console.c | 6 ++++++ server/device.c | 1 + server/fd.c | 10 ++++++++++ server/file.c | 1 + server/file.h | 4 ++++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 12 files changed, 34 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 50cb47dec92..278048bc7a3 100644 --- a/server/async.c +++ b/server/async.c @@ -502,7 +502,7 @@ restart: (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { - async_terminate( async, STATUS_CANCELLED ); + fd_cancel_async( async->fd, async ); woken++; goto restart; } diff --git a/server/change.c b/server/change.c index b02a9cd65bf..5edeebf89d3 100644 --- a/server/change.c +++ b/server/change.c @@ -144,6 +144,7 @@ static const struct fd_ops dir_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/console.c b/server/console.c index 2a23081037b..3a5b1270116 100644 --- a/server/console.c +++ b/server/console.c @@ -115,6 +115,7 @@ static const struct fd_ops console_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -185,6 +186,7 @@ static const struct fd_ops console_server_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_server_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -254,6 +256,7 @@ static const struct fd_ops screen_buffer_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -340,6 +343,7 @@ static const struct fd_ops console_input_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -395,6 +399,7 @@ static const struct fd_ops console_output_fd_ops = console_get_file_info, /* get_file_info */ console_get_volume_info, /* get_volume_info */ console_output_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -451,6 +456,7 @@ static const struct fd_ops console_connection_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_connection_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/device.c b/server/device.c index d9199e8ddd8..2310de43ac4 100644 --- a/server/device.c +++ b/server/device.c @@ -243,6 +243,7 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_file_info, /* get_file_info */ device_file_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ device_file_reselect_async /* reselect_async */ }; diff --git a/server/fd.c b/server/fd.c index 7a88f412c7a..904b4e4217d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2216,6 +2216,11 @@ void fd_async_wake_up( struct fd *fd, int type, unsigned int status ) } } +void fd_cancel_async( struct fd *fd, struct async *async ) +{ + fd->fd_ops->cancel_async( fd, async ); +} + void fd_reselect_async( struct fd *fd, struct async_queue *queue ) { fd->fd_ops->reselect_async( fd, queue ); @@ -2226,6 +2231,11 @@ void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count set_error( STATUS_OBJECT_TYPE_MISMATCH ); } +void default_fd_cancel_async( struct fd *fd, struct async *async ) +{ + async_terminate( async, STATUS_CANCELLED ); +} + void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { fd_queue_async( fd, async, type ); diff --git a/server/file.c b/server/file.c index aff4d9e09e1..2c7cb0ce5ca 100644 --- a/server/file.c +++ b/server/file.c @@ -124,6 +124,7 @@ static const struct fd_ops file_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/file.h b/server/file.h index b481a68e530..22879b75c05 100644 --- a/server/file.h +++ b/server/file.h @@ -68,6 +68,8 @@ struct fd_ops void (*get_volume_info)( struct fd *, struct async *, unsigned int ); /* perform an ioctl on the file */ void (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); + /* cancel an async operation */ + void (*cancel_async)(struct fd *fd, struct async *async); /* queue an async operation */ void (*queue_async)(struct fd *, struct async *async, int type, int count); /* selected events for async i/o need an update */ @@ -106,6 +108,7 @@ extern void get_nt_name( struct fd *fd, struct unicode_str *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); +extern void fd_cancel_async( struct fd *fd, struct async *async ); extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -117,6 +120,7 @@ extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsign extern void no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); extern void no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern void default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); +extern void default_fd_cancel_async( struct fd *fd, struct async *async ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); diff --git a/server/mailslot.c b/server/mailslot.c index d4b2fd1b562..1f4cb87d0fc 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -108,6 +108,7 @@ static const struct fd_ops mailslot_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ mailslot_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -165,6 +166,7 @@ static const struct fd_ops mail_writer_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -255,6 +257,7 @@ static const struct fd_ops mailslot_device_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/mapping.c b/server/mapping.c index a814fe8090f..eb500ea67f4 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -204,6 +204,7 @@ static const struct fd_ops mapping_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ no_fd_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/named_pipe.c b/server/named_pipe.c index 234dfc701d9..f964ae19637 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -194,6 +194,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -237,6 +238,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_get_file_info, /* get_file_info */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -314,6 +316,7 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ named_pipe_device_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; diff --git a/server/serial.c b/server/serial.c index a5f7ef917b9..bdc27de8e4f 100644 --- a/server/serial.c +++ b/server/serial.c @@ -119,6 +119,7 @@ static const struct fd_ops serial_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ serial_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ serial_queue_async, /* queue_async */ serial_reselect_async /* reselect_async */ }; diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..bfaf6329ff4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -274,6 +274,7 @@ static const struct fd_ops sock_fd_ops = default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ + default_fd_cancel_async, /* cancel_async */ sock_queue_async, /* queue_async */ sock_reselect_async /* reselect_async */ }; @@ -2973,6 +2974,7 @@ static const struct fd_ops ifchange_fd_ops = no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ no_fd_ioctl, /* ioctl */ + NULL, /* cancel_async */ NULL, /* queue_async */ NULL /* reselect_async */ }; -- 2.33.0

3 7

[PATCH 9/9] wordpad: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/wordpad/wordpad.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wordpad/wordpad.manifest b/programs/wordpad/wordpad.manifest index 51fb21fa97d..26cdfed0569 100644 --- a/programs/wordpad/wordpad.manifest +++ b/programs/wordpad/wordpad.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 8/9] winver: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winver/winver.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest index 519bd175c19..f527afb8265 100644 --- a/programs/winver/winver.manifest +++ b/programs/winver/winver.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 7/9] winevdm: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winevdm/winevdm.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 9634ec55524..6547ce24206 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 6/9] winetest: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winetest/winetest.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winetest/winetest.manifest b/programs/winetest/winetest.manifest index a3b110b5eda..ca6433583b7 100644 --- a/programs/winetest/winetest.manifest +++ b/programs/winetest/winetest.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 5/9] winemine: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winemine/winemine.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winemine/winemine.manifest b/programs/winemine/winemine.manifest index 8850b090e37..d0fe0a892c4 100644 --- a/programs/winemine/winemine.manifest +++ b/programs/winemine/winemine.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 4/9] winefile: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winefile/winefile.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winefile/winefile.manifest b/programs/winefile/winefile.manifest index 4ebd48c8933..d4ae2d1b3f0 100644 --- a/programs/winefile/winefile.manifest +++ b/programs/winefile/winefile.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 3/9] winedbg: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winedbg/winedbg.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest index 5061d141f16..5746534b076 100644 --- a/programs/winedbg/winedbg.manifest +++ b/programs/winedbg/winedbg.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 2/9] winecfg: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/winecfg.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index 900887751ab..a0f08603ba2 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 1/9] wineboot: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 08 Sep '21

08 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/wineboot/wineboot.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wineboot/wineboot.manifest b/programs/wineboot/wineboot.manifest index 6e5892ae6ac..2ac376230bc 100644 --- a/programs/wineboot/wineboot.manifest +++ b/programs/wineboot/wineboot.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.191.
by Georg Lehmann 07 Sep '21

07 Sep '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ac1b43bbf12..3a6bc66d32b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.190" +VK_XML_VERSION = "1.2.191" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.0

1 0

[PATCH] mpr: Fix copy paste error when converting hex char to int
by Fabian Maurer 07 Sep '21

07 Sep '21

Spotted by Robert Naumann Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51728 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mpr/pwcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index aa09522a5f9..f330a2a000a 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -45,7 +45,7 @@ static inline signed char ctox( CHAR x ) return x - '0'; if( ( x >= 'A' ) && ( x <= 'F' ) ) return x - 'A' + 10; - if( ( x >= 'a' ) && ( x <= 'a' ) ) + if( ( x >= 'a' ) && ( x <= 'f' ) ) return x - 'a' + 10; return -1; } -- 2.33.0

1 0

[PATCH v5 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 07 Sep '21

07 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 6 +++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 30 +++++++++++++++++++++++++++++- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..0b22d3e39a3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,25 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid( RROutput output, unsigned char **prop, unsigned long *len ) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( gdi_display, output, x11drv_atom(EDID), 0, 128, FALSE, FALSE, + AnyPropertyType, &actual_type, &actual_format, len, + &bytes_after, prop ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1057,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1113,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1162,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

2 3

[PATCH 01/41] robocopy: add stub
by Florian Eder 07 Sep '21

07 Sep '21

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- Please feel free to give any kind of feedback regarding the patches :-) --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 9 +++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.h | 19 +++++++++++++++++++ programs/robocopy/robocopy.rc | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.h create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 99283e0ef18..9e2fa9ef009 100755 --- a/configure +++ b/configure @@ -21264,6 +21264,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22797,4 +22798,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index 26f74985924..88b9426260f 100644 --- a/configure.ac +++ b/configure.ac @@ -3963,6 +3963,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5463edcb8b3 --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,9 @@ +MODULE = robocopy.exe +IMPORTS = + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc \ No newline at end of file diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..a184235e488 --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} \ No newline at end of file diff --git a/programs/robocopy/robocopy.h b/programs/robocopy/robocopy.h new file mode 100644 index 00000000000..33e84b82ea0 --- /dev/null +++ b/programs/robocopy/robocopy.h @@ -0,0 +1,19 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN \ No newline at end of file diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..c7acd5ad161 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,35 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include "robocopy.h" + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

3 45

[PATCH v7 1/2] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 07 Sep '21

07 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++--- include/wine/afd.h | 2 +- server/protocol.def | 1 + server/sock.c | 52 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..8fc21e39da1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + int exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2839,7 +2841,50 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, +static void poll_handle_exclusive(struct poll_req *req) +{ + struct poll_req *areq; + unsigned int i, j; + + for (i = 0; i < req->count; ++i) + { + int has_main = FALSE; + + LIST_FOR_EACH_ENTRY(areq, &poll_list, struct poll_req, entry) + { + for (j = 0; j < areq->count; ++j) + { + if (areq->sockets[j].sock != req->sockets[i].sock) + continue; + + if (!areq->sockets[j].main) + continue; + + has_main = TRUE; + + if (areq->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll */ + areq->sockets[j].main = FALSE; + + areq->iosb->status = STATUS_SUCCESS; + areq->iosb->out_data = areq->output; + areq->iosb->out_size = areq->count * sizeof(*areq->output); + async_terminate(areq->async, STATUS_ALERTED); + + has_main = FALSE; + } + + goto next; + } + } + + next: + req->sockets[i].main = !has_main; + } +} + +static void poll_socket( struct sock *poll_sock, struct async *async, int exclusive, timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; @@ -2880,11 +2925,14 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3285,7 +3333,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - poll_socket( sock, async, req->timeout, count, input ); + poll_socket( sock, async, req->exclusive, req->timeout, count, input ); reply->wait = async_handoff( async, NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); -- 2.33.0

3 5

[PATCH v2 1/3] winex11.drv: Add GUID_DISPLAY_DEVICE_ARRIVAL interface to display device.
by Paul Gofman 07 Sep '21

07 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ include/ntddvdeo.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..0b20cff5e79 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -409,6 +410,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; @@ -432,6 +434,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, &iface_data)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0; diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index 9523e37f7b4..8736c6cc845 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -21,5 +21,6 @@ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); #endif -- 2.31.1

3 7

[PATCH v3 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 07 Sep '21

07 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 6 +++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 30 +++++++++++++++++++++++++++++- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..0b22d3e39a3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,25 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid( RROutput output, unsigned char **prop, unsigned long *len ) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( gdi_display, output, x11drv_atom(EDID), 0, 128, FALSE, FALSE, + AnyPropertyType, &actual_type, &actual_format, len, + &bytes_after, prop ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1057,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1113,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1162,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

3 5

[PATCH 7/7] gdi32: Don't use gdi_private.h and ntgdi_private.h at the same time.
by Jacek Caban 07 Sep '21

07 Sep '21

2 1

[PATCH 6/7] gdi32: Move metafile defines to gdi_private.h.
by Jacek Caban 07 Sep '21

07 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 45 ++++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 43 ------------------------------------ 2 files changed, 45 insertions(+), 43 deletions(-)

2 1

[PATCH 5/7] gdi32: Move get_full_gdi_handle to objects.c.
by Jacek Caban 07 Sep '21

07 Sep '21

2 1

[PATCH 4/7] gdi32: Use zero biClrUsed in emfdc_create_brush when possible.
by Jacek Caban 07 Sep '21

07 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 2 + dlls/gdi32/tests/metafile.c | 129 ++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+)

2 1

[PATCH 3/7] gdi32: Copy brush bits in get_brush_bitmap_info.
by Jacek Caban 07 Sep '21

07 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It's the last significant call to a private ntgdi function in metafile code. I tried replacing it with public API. NtGdiGetObjectBitmapHandle seems like something that could be used for that. It would require brush object pattern storage to be changed to use an actual (but "special" in a sense that it behaves slightly different) bitmap (or DIB) object, which we could return here. Then metafiles could use GetDIBits on that. I even prototyped an implementation of that and it mostly worked. The problematic case that I didn't find how to implement using public ntgdi functions is for tests like test_mf_palette_brush from the first patch in series. It would require us to somehow preserve original indexes for DIB_PAL_COLORS (unlike eg. DIB section, which converts them immediately), but I don't see a way to get them from GetDIBits. A different Wine extension just for that would be another possibility, but all those changes don't seem to be generally very useful for us. Given all that, I think that we should be fine just exposing an extra function. This patch makes get_brush_bitmap_info behaviour more friendly to syscalls interface and allows sharing a bit more code between metafiles and EMFs. dlls/gdi32/brush.c | 35 +++++++++++++++++++++++++++++------ dlls/gdi32/emfdc.c | 5 ++--- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/metadc.c | 19 ++----------------- dlls/gdi32/ntgdi_private.h | 1 - 5 files changed, 36 insertions(+), 27 deletions(-)

2 1

[PATCH 2/7] gdi32: Allocate extra DWORD for EMR_CREATEDIBPATTERNBRUSHPT records.
by Jacek Caban 07 Sep '21

07 Sep '21

Like for EMR_CREATEMONOBRUSH. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)

2 1

[PATCH 1/7] gdi32/tests: Add more metafile brush tests.
by Jacek Caban 07 Sep '21

07 Sep '21

Based on brush.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 351 +++++++++++++++++++++++++++++++++++- 1 file changed, 346 insertions(+), 5 deletions(-)

2 1

[PATCH] jscript: Fix refcounting the object prototype fallback.
by Gabriel Ivăncescu 07 Sep '21

07 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It gets released later. dlls/jscript/dispex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 345bcd2..e5d711a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1881,7 +1881,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); else - prot = ctx->object_prototype; + prot = jsdisp_addref(ctx->object_prototype); jsval_release(val); } -- 2.31.1

2 1

[PATCH v4 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 07 Sep '21

07 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 ++++++++++++--- dlls/winex11.drv/x11drv.h | 6 +++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 30 +++++++++++++++++++++++++++++- 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..0b22d3e39a3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,25 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid( RROutput output, unsigned char **prop, unsigned long *len ) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( gdi_display, output, x11drv_atom(EDID), 0, 128, FALSE, FALSE, + AnyPropertyType, &actual_type, &actual_format, len, + &bytes_after, prop ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1057,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1113,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1162,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

2 3

[PATCH 0/6] DbgHelp: Reworked line handling APIs (v2)
by Eric Pouech 07 Sep '21

07 Sep '21

Basically, current implem line management is broken: - in some code paths, same buffer is used both as input and output this serie fixes it by putting in place a cleaner way of setting the returned buffer it also implements a couple of missing W64 variants of APIs (this issue had been reported by Alistair a couple of months ago on wine-devel) Changes in v2: - set internal flags on line info on the fly (use of func_normalize() was broken anyway) A+ --- Eric Pouech (6): dbghelp: let symt_fill_func_line_info and symt_get_func_line_next be a static function inside symbol.c dbghelp: introducing internal_line_t structure as help in Line manipulation dbghelp: implemented all SymGetLineNext* functions using internal_line_t dbghelp: (re)write SymGetLinePrev* with internal_line_t dbghelp: set is_first and is_last flags on the fly in symt_add_func_line dbghelp: get rid of useless symt_normalize_func() dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/dbghelp_private.h | 2 - dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/msc.c | 3 - dlls/dbghelp/stabs.c | 1 - dlls/dbghelp/symbol.c | 429 ++++++++++++++++++++------------- 6 files changed, 258 insertions(+), 182 deletions(-)

1 6

[PATCH 1/3] msi: Set dialog as parent in subsequent dialog
by Fabian Maurer 07 Sep '21

07 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..e6048ee6a22 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -140,6 +140,9 @@ typedef struct static DWORD uiThreadId; static HWND hMsiHiddenWindow; +static HWND handle_parent_dialog[10] = { NULL }; +static UINT parent_level = 0; + static LPWSTR msi_get_window_text( HWND hwnd ) { UINT sz, r; @@ -3881,6 +3884,11 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, return SendMessageW( (HWND) lParam, WM_CTLCOLORSTATIC, wParam, lParam ); case WM_DESTROY: + if (parent_level > 0) + { + handle_parent_dialog[parent_level - 1] = NULL; + parent_level--; + } dialog->hwnd = NULL; return 0; case WM_NOTIFY: @@ -3904,7 +3912,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,15 +3925,23 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = parent_level > 0 ? handle_parent_dialog[parent_level - 1] : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); return ERROR_FUNCTION_FAILED; } + if (parent_level < ARRAY_SIZE(handle_parent_dialog)) + { + handle_parent_dialog[parent_level] = hwnd; + parent_level++; + } + ShowWindow( hwnd, SW_SHOW ); /* UpdateWindow( hwnd ); - and causes the transparent static controls not to paint */ -- 2.33.0

3 7

[PATCH] nsiproxy: Include sys/param.h from udp.c.
by Gerald Pfeifer 07 Sep '21

07 Sep '21

udp.c features specific code to handle versions of FreeBSD past early 12.0 snapshots. This is guarded by a check on __FreeBSD_version which is defined in sys/param.h. Actually including that, like tcp.c already does, activates that check and adjusted code and unbreaks the build. Signed-off-by: Gerald Pfeifer <gerald(a)FreeBSD.org> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 112170782f7..a0ace071753 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -22,6 +22,10 @@ #include <stdarg.h> #include <stddef.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -- 2.31.1

2 1

[PATCH 9/9] view: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/view/view.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/view/view.manifest b/programs/view/view.manifest index 198ffbfc055..19882bc943f 100644 --- a/programs/view/view.manifest +++ b/programs/view/view.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 8/9] uninstaller: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/uninstaller/uninstaller.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest index ee41796562e..56595d8a281 100644 --- a/programs/uninstaller/uninstaller.manifest +++ b/programs/uninstaller/uninstaller.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 7/9] taskmgr: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/taskmgr/taskmgr.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/taskmgr/taskmgr.manifest b/programs/taskmgr/taskmgr.manifest index b93212bc931..dc599d1ee9f 100644 --- a/programs/taskmgr/taskmgr.manifest +++ b/programs/taskmgr/taskmgr.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 6/9] regedit: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/regedit/regedit.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest index a2c1a437027..9ffabb0f9db 100644 --- a/programs/regedit/regedit.manifest +++ b/programs/regedit/regedit.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 5/9] oleview: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/oleview/oleview.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/oleview/oleview.manifest b/programs/oleview/oleview.manifest index da8d81cffec..135559d7cbb 100644 --- a/programs/oleview/oleview.manifest +++ b/programs/oleview/oleview.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 4/9] notepad: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/notepad/notepad.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/notepad/notepad.manifest b/programs/notepad/notepad.manifest index 30aa0f3853b..2e50e69399e 100644 --- a/programs/notepad/notepad.manifest +++ b/programs/notepad/notepad.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 3/9] msinfo32: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/msinfo32/msinfo32.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/msinfo32/msinfo32.manifest b/programs/msinfo32/msinfo32.manifest index 67eb98a2799..07d174ba19c 100644 --- a/programs/msinfo32/msinfo32.manifest +++ b/programs/msinfo32/msinfo32.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 2/9] msiexec: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/msiexec/msiexec.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/msiexec/msiexec.manifest b/programs/msiexec/msiexec.manifest index a4a17a5397d..0e3454555c2 100644 --- a/programs/msiexec/msiexec.manifest +++ b/programs/msiexec/msiexec.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 1/9] iexplore: Set process DPI settings to be system awareness.
by Zhiyi Zhang 07 Sep '21

07 Sep '21

iexplore.exe doesn't have DPI awareness settings in its manifest. However, tests show that it has at least per-monitor DPI awareness on Win10. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/iexplore/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index ade9f8c5226..adb6eff1101 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -68,6 +68,8 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { + SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_SYSTEM_AWARE); + if(*cmdline == '-' || *cmdline == '/') { if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); -- 2.30.2

1 0

[PATCH] winex11.drv: Derive the monitor device name from the EDID where available.
by Eduard Permyakov 07 Sep '21

07 Sep '21

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 43 +++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index eb2f7021ba6..3ae1e845ed3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -499,6 +499,43 @@ static void get_edid(RROutput output, unsigned char **prop, unsigned long *len) } } +static BOOL edid_parse_name(const unsigned char *edid, unsigned long edid_len, WCHAR name[14]) +{ + BOOL found = FALSE; + enum { DESC_OFFSET = 0x48, DESC_SIZE = 18, NDESCS = 3, MAXLEN = 13 }; + static unsigned char disp_product_name_hdr[5] = {0x00, 0x00, 0x00, 0xFC, 0x00}; + const unsigned char *cursor = edid + DESC_OFFSET; + int i, name_idx = 0; + + if (edid_len < 128) + return FALSE; + + for (i = 0; i < NDESCS; i++, cursor += DESC_SIZE) + { + if (memcmp( cursor, disp_product_name_hdr, sizeof(disp_product_name_hdr) ) != 0) + continue; + + cursor += sizeof(disp_product_name_hdr); + while (*cursor != 0x0A && name_idx < MAXLEN) + name[name_idx++] = *cursor++; + name[name_idx++] = '\0'; + + found = TRUE; + break; + } + return found; +} + +static void monitor_set_name(struct x11drv_monitor *monitor, int index, const WCHAR *default_name) +{ + WCHAR name[14]; + if (monitor->edid && edid_parse_name(monitor->edid, monitor->edid_len, name)) + lstrcpyW( monitor->name, name ); + else + lstrcpyW( monitor->name, default_name ); + TRACE("set name of monitor %d: %s\n", index, debugstr_w(monitor->name)); +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1067,9 +1104,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { - lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); + monitor_set_name( monitors + monitor_count, monitor_count, generic_nonpnp_monitorW ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1112,9 +1149,6 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * enum_crtc_info->width == crtc_info->width && enum_crtc_info->height == crtc_info->height) { - /* FIXME: Read output EDID property and parse the data to get the correct name */ - lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); - SetRect( &monitors[monitor_count].rc_monitor, crtc_info->x, crtc_info->y, crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); monitors[monitor_count].rc_work = get_work_area( &monitors[monitor_count].rc_monitor ); @@ -1128,6 +1162,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); + monitor_set_name( monitors + monitor_count, monitor_count, generic_nonpnp_monitorW ); monitor_count++; } -- 2.25.1

3 4

[PATCH] server: Make sure that async_request_complete() is called in the case of a failed connection as well.
by Zebediah Figura 07 Sep '21

07 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51726 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3c5f2612b51..6452cfb0dd7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2905,7 +2905,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, timeout_t /* FIXME: do other error conditions deserve a similar treatment? */ if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) { - req->iosb->status = STATUS_SUCCESS; + signaled = TRUE; output[i].flags |= AFD_POLL_CONNECT_ERR; output[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); } -- 2.33.0

1 0

[PATCH v3 1/5] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon 06 Sep '21

06 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 213297-213305 I'll resend the HID patches later, I'd really like to move them to dlls/hid/tests, unless there's reasons not to, probably by copying the code from dlls/ntoskrnl.exe/tests. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..4434e61bcb8 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -968,6 +968,9 @@ static void test_return_status(void) 0xceadbeef, }; + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; + for (i = 0; i < ARRAY_SIZE(status_tests); ++i) { for (j = 0; j < ARRAY_SIZE(status_tests); ++j) @@ -989,6 +992,8 @@ static void test_return_status(void) } } } + + winetest_mute_threshold = old_threshold; } static BOOL compare_unicode_string(const WCHAR *buffer, ULONG len, const WCHAR *expect) -- 2.33.0

2 8

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

06 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 68 ++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 60f7a8ed5dd..330c9203b7d 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,48 @@ 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) return 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 (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) return 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 (!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 +532,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 +609,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

3 18

[PATCH 1/2] tzres: Regenerate TZ data from de facto standard sources.
by Giovanni Mascellani 06 Sep '21

06 Sep '21

The sources used to regenerate data are: * The Olson database, tracing all world time zone changes since 1970, widely used under Unix systems and dedicated to the public domain[1]. * Unicode CLDR's windowsZones.xml, used by Windows itself as source for naming timezones and providing the correspondance with the Olson zones. It is licensed under a MIT-styled license[2]. [1] https://github.com/eggert/tz/blob/main/LICENSE [2] https://github.com/unicode-org/cldr/blob/master/ICU-LICENSE Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/kernel32/tests/time.c | 22 +- dlls/tzres/tzres.rc | 52 ++ loader/wine.inf.in | 1800 ++++++++++++++++++++++++++++++------ 3 files changed, 1579 insertions(+), 295 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 7283075dc5e..0ae272311bb 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -949,16 +949,16 @@ static void test_GetTimeZoneInformationForYear(void) { L"Greenland Standard Time", 2015, 180, 0, -60, 10, 24, 3, 28 }, { L"Greenland Standard Time", 2016, 180, 0, -60, 10, 29, 3, 26 }, { L"Greenland Standard Time", 2017, 180, 0, -60, 10, 28, 3, 25 }, - { L"Easter Island Standard Time", 2014, 360, 0, -60, 4, 26, 9, 6, 0, 1, 0, 1, 1, 1, 1, 1 }, - { L"Easter Island Standard Time", 2015, 300, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, - { L"Easter Island Standard Time", 2016, 360, 0, -60, 5, 14, 8, 13, 0, 1, 0, 1, 1, 1, 1, 1 }, - { L"Egypt Standard Time", 2013, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, - { L"Egypt Standard Time", 2014, -120, 0, -60, 9, 25, 5, 15, 0, 0, 0, 0, 1, 1, 1, 1 }, - { L"Egypt Standard Time", 2015, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, - { L"Egypt Standard Time", 2016, -120, 0, -60, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, - { L"Altai Standard Time", 2016, -420, 0, 60, 3, 27, 1, 1, 1 }, - { L"Altai Standard Time", 2017, -420, 0, -60, 0, 0, 0, 0, 1 }, - { L"Altai Standard Time", 2018, -420, 0, -60, 0, 0, 0, 0, 1 }, + { L"Easter Island Standard Time", 2014, 360, 0, -60, 4, 26, 9, 6 }, + { L"Easter Island Standard Time", 2015, 300, 0, -60, 0, 0, 0, 0 }, + { L"Easter Island Standard Time", 2016, 360, 0, -60, 5, 14, 8, 13 }, + { L"Egypt Standard Time", 2013, -120, 0, -60, 0, 0, 0, 0 }, + { L"Egypt Standard Time", 2014, -120, 0, -60, 9, 25, 5, 15, 0, 0, 0, 0, 0, 1, 0, 1 }, + { L"Egypt Standard Time", 2015, -120, 0, -60, 0, 0, 0, 0 }, + { L"Egypt Standard Time", 2016, -120, 0, -60, 0, 0, 0, 0 }, + { L"Altai Standard Time", 2016, -420, 0, 60, 3, 27, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1 }, + { L"Altai Standard Time", 2017, -420, 0, -60, 0, 0, 0, 0 }, + { L"Altai Standard Time", 2018, -420, 0, -60, 0, 0, 0, 0 }, }; if (!pGetTimeZoneInformationForYear || !pGetDynamicTimeZoneInformation) @@ -1013,7 +1013,7 @@ static void test_GetTimeZoneInformationForYear(void) ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) broken_test = TRUE; - todo_wine ok(ret == TRUE || broken(broken_test) /* before 10 1809 */, + ok(ret == TRUE || broken(broken_test) /* before 10 1809 */, "GetTimeZoneInformationForYear err %u\n", GetLastError()); if (broken(broken_test)) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 8779c62b360..07c3c2b4c8f 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -32,6 +32,8 @@ STRINGTABLE 50193 "Alaskan Daylight Time" 55200 "Aleutian Standard Time" 55201 "Aleutian Daylight Time" + 4464 "Altai Standard Time" + 4465 "Altai Daylight Time" 41968 "Arab Standard Time" 41969 "Arab Daylight Time" 42704 "Arabian Standard Time" @@ -40,6 +42,8 @@ STRINGTABLE 8769 "Arabic Daylight Time" 19584 "Argentina Standard Time" 19585 "Argentina Daylight Time" + 25104 "Astrakhan Standard Time" + 25105 "Astrakhan Daylight Time" 34224 "Atlantic Standard Time" 34225 "Atlantic Daylight Time" 47024 "AUS Central Standard Time" @@ -96,6 +100,8 @@ STRINGTABLE 62721 "E. Africa Daylight Time" 65264 "E. Australia Standard Time" 65265 "E. Australia Daylight Time" + 32128 "E. Europe Standard Time" + 32129 "E. Europe Daylight Time" 64096 "E. South America Standard Time" 64097 "E. South America Daylight Time" 58592 "Easter Island Standard Time" @@ -174,12 +180,16 @@ STRINGTABLE 54897 "New Zealand Daylight Time" 9504 "Newfoundland Standard Time" 9505 "Newfoundland Daylight Time" + 47440 "Norfolk Standard Time" + 47441 "Norfolk Daylight Time" 19056 "North Asia East Standard Time" 19057 "North Asia East Daylight Time" 304 "North Asia Standard Time" 305 "North Asia Daylight Time" 35888 "North Korea Standard Time" 35889 "North Korea Daylight Time" + 55952 "Omsk Standard Time" + 55953 "Omsk Daylight Time" 65008 "Pacific SA Standard Time" 65009 "Pacific SA Daylight Time" 11232 "Pacific Standard Time" @@ -190,8 +200,16 @@ STRINGTABLE 28753 "Pakistan Daylight Time" 50224 "Paraguay Standard Time" 50225 "Paraguay Daylight Time" + 53760 "Qyzylorda Standard Time" + 53761 "Qyzylorda Daylight Time" 45104 "Romance Standard Time" 45105 "Romance Daylight Time" + 59264 "Russia Time Zone 10" + 59265 "Russia Time Zone 10" + 46000 "Russia Time Zone 11" + 46001 "Russia Time Zone 11" + 17920 "Russia Time Zone 3" + 17921 "Russia Time Zone 3" 44560 "Russian Standard Time" 44561 "Russian Daylight Time" 40656 "SA Eastern Standard Time" @@ -202,8 +220,14 @@ STRINGTABLE 57121 "SA Western Daylight Time" 5584 "Saint Pierre Standard Time" 5585 "Saint Pierre Daylight Time" + 35104 "Sakhalin Standard Time" + 35105 "Sakhalin Daylight Time" 14592 "Samoa Standard Time" 14593 "Samoa Daylight Time" + 5984 "Sao Tome Standard Time" + 5985 "Sao Tome Daylight Time" + 33808 "Saratov Standard Time" + 33809 "Saratov Daylight Time" 53728 "SE Asia Standard Time" 53729 "SE Asia Daylight Time" 61840 "Singapore Standard Time" @@ -212,6 +236,8 @@ STRINGTABLE 38897 "South Africa Daylight Time" 39408 "Sri Lanka Standard Time" 39409 "Sri Lanka Daylight Time" + 9792 "Sudan Standard Time" + 9793 "Sudan Daylight Time" 46576 "Syria Standard Time" 46577 "Syria Daylight Time" 26432 "Taipei Standard Time" @@ -222,10 +248,16 @@ STRINGTABLE 43073 "Tocantins Daylight Time" 16240 "Tokyo Standard Time" 16241 "Tokyo Daylight Time" + 29136 "Tomsk Standard Time" + 29137 "Tomsk Daylight Time" 7216 "Tonga Standard Time" 7217 "Tonga Daylight Time" + 31472 "Transbaikal Standard Time" + 31473 "Transbaikal Daylight Time" 24848 "Turkey Standard Time" 24849 "Turkey Daylight Time" + 20560 "Turks And Caicos Standard Time" + 20561 "Turks And Caicos Daylight Time" 47200 "Ulaanbaatar Standard Time" 47201 "Ulaanbaatar Daylight Time" 34928 "US Eastern Standard Time" @@ -234,20 +266,40 @@ STRINGTABLE 37473 "US Mountain Daylight Time" 22000 "Coordinated Universal Time" 22001 "Coordinated Universal Time" + 1200 "UTC+12" + 1201 "UTC+12" + 8784 "UTC+13" + 8785 "UTC+13" + 37328 "UTC-02" + 37329 "UTC-02" + 3344 "UTC-08" + 3345 "UTC-08" + 39152 "UTC-09" + 39153 "UTC-09" + 19408 "UTC-11" + 19409 "UTC-11" 51472 "Venezuela Standard Time" 51473 "Venezuela Daylight Time" 61376 "Vladivostok Standard Time" 61377 "Vladivostok Daylight Time" + 18048 "Volgograd Standard Time" + 18049 "Volgograd Daylight Time" 65376 "W. Australia Standard Time" 65377 "W. Australia Daylight Time" 64976 "W. Central Africa Standard Time" 64977 "W. Central Africa Daylight Time" 27696 "W. Europe Standard Time" 27697 "W. Europe Daylight Time" + 53952 "W. Mongolia Standard Time" + 53953 "W. Mongolia Daylight Time" 49664 "West Asia Standard Time" 49665 "West Asia Daylight Time" + 46160 "West Bank Standard Time" + 46161 "West Bank Daylight Time" 10224 "West Pacific Standard Time" 10225 "West Pacific Daylight Time" 40576 "Yakutsk Standard Time" 40577 "Yakutsk Daylight Time" + 26288 "Yukon Standard Time" + 26289 "Yukon Daylight Time" } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index adaa29a804b..cc590109ace 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2738,16 +2738,22 @@ HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Dlt",,"Afghanistan HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"MUI_Dlt",,"@tzres.dll,-39617" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"MUI_Std",,"@tzres.dll,-39616" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Std",,"Afghanistan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"TZI",1,f2,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"TZI",1,f2,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Display",,"America/Anchorage" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Dlt",,"Alaskan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Dlt",,"@tzres.dll,-50193" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Std",,"@tzres.dll,-50192" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2000",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2001",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2002",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2003",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2004",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2005",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Display",,"America/Adak" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Dlt",,"Aleutian Daylight Time" @@ -2755,59 +2761,139 @@ HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Std",,"@tzres.dll,-55200" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Std",,"Aleutian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2000",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2001",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2002",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2003",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2004",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2005",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2006",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2007",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Display",,"Asia/Barnaul" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Dlt",,"Altai Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Dlt",,"@tzres.dll,-4465" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Std",,"@tzres.dll,-4464" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Std",,"Altai Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Std",,"@tzres.dll,-41968" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Std",,"Arab Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Display",,"Asia/Dubai" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Dlt",,"Arabian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"MUI_Dlt",,"@tzres.dll,-42705" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"MUI_Std",,"@tzres.dll,-42704" HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"Std",,"Arabian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Display",,"Asia/Baghdad" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Dlt",,"Arabic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"MUI_Dlt",,"@tzres.dll,-8769" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"MUI_Std",,"@tzres.dll,-8768" HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"Std",,"Arabic Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,02,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,04,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Display",,"America/Buenos_Aires" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Dlt",,"Argentina Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Dlt",,"@tzres.dll,-19585" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Std",,"@tzres.dll,-19584" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"FirstEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Display",,"Europe/Astrakhan" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Dlt",,"Astrakhan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Dlt",,"@tzres.dll,-25105" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Std",,"@tzres.dll,-25104" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Std",,"Astrakhan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2017",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Display",,"America/Halifax" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Dlt",,"Atlantic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Dlt",,"@tzres.dll,-34225" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Std",,"@tzres.dll,-34224" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Std",,"Atlantic Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Display",,"Australia/Darwin" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Dlt",,"AUS Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"MUI_Dlt",,"@tzres.dll,-47025" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"MUI_Std",,"@tzres.dll,-47024" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Std",,"AUS Central Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Display",,"Australia/Eucla" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Dlt",,"Aus Central W. Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"MUI_Dlt",,"@tzres.dll,-44673" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"MUI_Std",,"@tzres.dll,-44672" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"Std",,"Aus Central W. Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"TZI",1,f3,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2005",1,f3,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time,"TZI",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2006",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2007",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2008",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2007",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2008",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2009",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2010",1,f3,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2010",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Display",,"Australia/Sydney" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Dlt",,"AUS Eastern Daylight Time" @@ -2815,21 +2901,41 @@ HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30368" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Std",,"AUS Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Display",,"Asia/Baku" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Dlt",,"Azerbaijan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.dll,-11313" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Std",,"@tzres.dll,-11312" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Std",,"Azerbaijan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2016",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2014",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2016",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azores" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" @@ -2842,51 +2948,103 @@ HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Dlt",,"Bahia Daylight Ti HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"MUI_Dlt",,"@tzres.dll,-50897" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"MUI_Std",,"@tzres.dll,-50896" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Std",,"Bahia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Display",,"Asia/Dhaka" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Dlt",,"Bangladesh Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Dlt",,"@tzres.dll,-48721" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Std",,"@tzres.dll,-48720" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Std",,"Bangladesh Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,05,00,03,00,17,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"FirstEntry",0x10001,"2009" +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Display",,"Europe/Minsk" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Dlt",,"Belarus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Dlt",,"@tzres.dll,-56577" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Std",,"@tzres.dll,-56576" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Display",,"Pacific/Bougainville" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Dlt",,"Bougainville Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Dlt",,"@tzres.dll,-51969" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Std",,"@tzres.dll,-51968" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Std",,"Bougainville Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"FirstEntry",0x10001,"2013" +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Display",,"America/Regina" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Dlt",,"Canada Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"MUI_Dlt",,"@tzres.dll,-25713" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"MUI_Std",,"@tzres.dll,-25712" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Std",,"Canada Central Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Display",,"Atlantic/Cape_Verde" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Dlt",,"Cape Verde Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"MUI_Dlt",,"@tzres.dll,-2001" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"MUI_Std",,"@tzres.dll,-2000" HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"Std",,"Cape Verde Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cape Verde Standard Time,"TZI",1,3c,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Display",,"Asia/Yerevan" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Dlt",,"Caucasus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Dlt",,"@tzres.dll,-29873" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"MUI_Std",,"@tzres.dll,-29872" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"Std",,"Caucasus Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2011" +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Display",,"Australia/Adelaide" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Dlt",,"Cen. Australia Daylight Time" @@ -2894,37 +3052,70 @@ HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Std",,"@tzres.dll,-38928" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Std",,"Cen. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2005",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2000",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2001",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2002",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2003",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2004",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2005",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2006",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2007",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2007",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2008",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Display",,"America/Guatemala" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Dlt",,"Central America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Dlt",,"@tzres.dll,-36657" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Std",,"@tzres.dll,-36656" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Std",,"Central America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"TZI",1,68,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Display",,"Asia/Almaty" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Dlt",,"Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-8177" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-8176" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Std",,"Central Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2005" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Cuiaba" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Dlt",,"Central Brazilian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Dlt",,"@tzres.dll,-56337" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Std",,"@tzres.dll,-56336" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Std",,"Central Brazilian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2023",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2026",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2034",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2037",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Display",,"Europe/Budapest" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Dlt",,"Central Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"MUI_Dlt",,"@tzres.dll,-4897" @@ -2942,16 +3133,22 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Dlt",,"Central HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-64417" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"MUI_Std",,"@tzres.dll,-64416" HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"Std",,"Central Pacific Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Pacific Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Display",,"America/Chicago" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Dlt",,"Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Dlt",,"@tzres.dll,-17457" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Std",,"@tzres.dll,-17456" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Std",,"Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" @@ -2959,151 +3156,264 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-32800" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2002" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Display",,"Pacific/Chatham" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Dlt",,"Chatham Islands Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Dlt",,"@tzres.dll,-62305" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Std",,"@tzres.dll,-62304" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Std",,"Chatham Islands Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"TZI",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2000",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2001",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2002",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2003",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2004",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2005",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2006",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2007",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2008",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Dlt",,"@tzres.dll,-161" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Std",,"@tzres.dll,-160" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Std",,"China Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Display",,"America/Havana" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Dlt",,"Cuba Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Dlt",,"@tzres.dll,-17137" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"MUI_Std",,"@tzres.dll,-17136" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"Std",,"Cuba Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Etc/GMT+12" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Dlt",,"Dateline Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Dlt",,"@tzres.dll,-50385" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Std",,"@tzres.dll,-50384" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Std",,"Dateline Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"TZI",1,d0,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Display",,"Africa/Nairobi" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Dlt",,"E. Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Dlt",,"@tzres.dll,-62721" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Std",,"@tzres.dll,-62720" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Std",,"E. Africa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Display",,"Australia/Brisbane" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Dlt",,"E. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"MUI_Dlt",,"@tzres.dll,-65265" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65264" HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"Std",,"E. Australia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Australia Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Display",,"Europe/Chisinau" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Dlt",,"E. Europe Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Dlt",,"@tzres.dll,-32129" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Std",,"@tzres.dll,-32128" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Std",,"E. Europe Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Dlt",,"@tzres.dll,-64097" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Std",,"@tzres.dll,-64096" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0c,00,02,00,05,00,17,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter"" +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2016",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2017",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2019",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Dlt",,"@tzres.dll,-58593" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Std",,"@tzres.dll,-58592" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Std",,"Easter Island Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,06,00,19,00,17,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2008",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2009",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2010",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2011",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,03,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2012",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2013",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2016",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2017",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2018",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2019",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Display",,"America/New_York" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Dlt",,"Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-30801" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Display",,"America/Cancun" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Dlt",,"Eastern Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-59537" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-59536" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Std",,"Eastern Standard Time (Mexico)" -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2008",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2009",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2010",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2011",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2012",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2013",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2015",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,02,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Std",,"@tzres.dll,-59424" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Std",,"Egypt Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Display",,"Asia/Yekaterinburg" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Dlt",,"Ekaterinburg Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Dlt",,"@tzres.dll,-45953" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Std",,"@tzres.dll,-45952" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Std",,"Ekaterinburg Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2003",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2004",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2005",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2006",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2007",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2008",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2009",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2010",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2011",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2012",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2013",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2014",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2015",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Display",,"Pacific/Fiji" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Dlt",,"Fiji Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Dlt",,"@tzres.dll,-25681" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Std",,"@tzres.dll,-25680" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Std",,"Fiji Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2016",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e0,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e1,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e1,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e5,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e5,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,e6,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2023",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e7,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e7,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2027",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,eb,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,eb,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2028",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,ec,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,ec,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2033",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f1,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2034",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f2,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f2,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2038",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f6,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,f6,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2039",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f7,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2040",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f8,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f8,07,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2044",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,fc,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2045",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fd,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,fd,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2049",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,01,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,01,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2050",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,02,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2051",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,03,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,03,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2055",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,07,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,07,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2056",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,08,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,08,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2061",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,0d,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2062",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0e,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,0e,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2066",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,12,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,12,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2067",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,13,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2068",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,14,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,14,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2072",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,18,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2073",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,19,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,19,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2077",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1d,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,1d,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2078",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,1e,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2079",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1f,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,1f,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2083",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,23,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,23,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2084",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,24,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,24,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2089",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,29,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2090",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2a,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,2a,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2094",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2e,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,2e,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2095",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,2f,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2096",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,30,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,30,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"FirstEntry",0x10001,2016 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"LastEntry",0x10001,2096 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2009",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2010",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2011",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2014",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,02,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2015",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2016",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2018",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2019",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2020",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2024",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2025",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2029",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2030",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2031",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2035",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2036",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2041",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2042",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2046",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2047",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2048",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2049",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"LastEntry",0x10001,"2049" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Display",,"Europe/Kiev" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Dlt",,"FLE Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"MUI_Dlt",,"@tzres.dll,-63265" @@ -3115,7 +3425,16 @@ HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Dlt",,"Georgian Dayli HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"MUI_Dlt",,"@tzres.dll,-417" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"MUI_Std",,"@tzres.dll,-416" HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"Std",,"Georgian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"LastEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Display",,"Europe/London" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Dlt",,"GMT Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"MUI_Dlt",,"@tzres.dll,-7409" @@ -3128,39 +3447,30 @@ HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Std",,"@tzres.dll,-58096" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Std",,"Greenland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,df,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e2,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,e2,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e4,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,e4,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,ea,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2029",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ed,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,ed,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2035",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f3,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,f5,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2040",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f8,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f8,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2043",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fb,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,fb,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2046",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fe,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,fe,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2048",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,00,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2054",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,06,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,06,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2057",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,09,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,09,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2063",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,0f,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,0f,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2065",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,11,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,11,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2068",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,14,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,14,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2071",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,17,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,17,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2074",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1a,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,1a,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2076",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1c,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,1c,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2082",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,22,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,22,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2085",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,25,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,25,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2091",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2b,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,2b,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2093",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2d,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,2d,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2096",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,30,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,30,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2099",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,33,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,33,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"LastEntry",0x10001,2099 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2029",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2035",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2040",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2043",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2046",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2048",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2049",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"LastEntry",0x10001,"2049" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Display",,"Atlantic/Reykjavik" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Dlt",,"Greenwich Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"MUI_Dlt",,"@tzres.dll,-47169" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"MUI_Std",,"@tzres.dll,-47168" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Std",,"Greenwich Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Display",,"Europe/Bucharest" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"Dlt",,"GTB Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\GTB Standard Time,"MUI_Dlt",,"@tzres.dll,-24193" @@ -3173,57 +3483,46 @@ HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Std",,"@tzres.dll,-2896" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Std",,"Haiti Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2014",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2017",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Display",,"Pacific/Honolulu" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Dlt",,"Hawaiian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Dlt",,"@tzres.dll,-53377" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Std",,"@tzres.dll,-53376" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Std",,"Hawaiian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Display",,"Asia/Calcutta" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Dlt",,"India Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"MUI_Dlt",,"@tzres.dll,-22401" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"MUI_Std",,"@tzres.dll,-22400" HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"Std",,"India Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\India Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Display",,"Asia/Tehran" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Dlt",,"Iran Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Dlt",,"@tzres.dll,-5569" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Std",,"@tzres.dll,-5568" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Std",,"Iran Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1991",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1992",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1993",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1994",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1995",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1996",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1997",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1998",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1999",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2000",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2001",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2002",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2003",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2004",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2005",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2006",1,2e,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2007",1,2e,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2008",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2009",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2010",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 @@ -3254,96 +3553,173 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2034",1,2e,ff HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2035",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2036",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2037",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"FirstEntry",0x10001,1991 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2038",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2039",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2040",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2041",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2042",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2043",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2044",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2045",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2046",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2047",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2048",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2049",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2050",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"LastEntry",0x10001,"2050" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Display",,"Asia/Jerusalem" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Dlt",,"Israel Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Dlt",,"@tzres.dll,-47969" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Std",,"@tzres.dll,-47968" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Std",,"Israel Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e3,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e3,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e8,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ee,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ee,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f9,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,f9,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ff,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ff,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2052",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,04,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,04,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2058",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0a,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,0a,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2069",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,15,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,15,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2075",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1b,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,1b,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2080",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,20,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,20,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2086",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,26,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,26,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2097",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,31,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,31,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"FirstEntry",0x10001,2019 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"LastEntry",0x10001,2097 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,01,00,02,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,03,00,01,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2048",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"LastEntry",0x10001,"2048" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Display",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Dlt",,"Jordan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Dlt",,"@tzres.dll,-17233" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Std",,"@tzres.dll,-17232" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e0,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e6,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f1,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f7,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,fc,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,02,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2061",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,0d,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2067",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,13,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2072",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,18,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2078",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,1e,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2089",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,29,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2095",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,2f,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"FirstEntry",0x10001,2016 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,2095 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2045",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,"2045" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Display",,"Europe/Kaliningrad" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Dlt",,"Kaliningrad Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Dlt",,"@tzres.dll,-14721" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Std",,"@tzres.dll,-14720" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Std",,"Kaliningrad Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2013",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-62049" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"MUI_Std",,"@tzres.dll,-62048" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Display",,"Africa/Tripoli" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Dlt",,"Libya Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"MUI_Dlt",,"@tzres.dll,-50769" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"MUI_Std",,"@tzres.dll,-50768" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Std",,"Libya Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2012",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,02,00,02,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2013",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"FirstEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"LastEntry",0x10001,"2014" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Display",,"Pacific/Kiritimati" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Dlt",,"Line Islands Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Dlt",,"@tzres.dll,-16769" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Std",,"@tzres.dll,-16768" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Std",,"Line Islands Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"TZI",1,b8,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"TZI",1,b8,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Display",,"Australia/Lord_Howe" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Dlt",,"Lord Howe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Dlt",,"@tzres.dll,-8657" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"MUI_Std",,"@tzres.dll,-8656" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"Std",,"Lord Howe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time,"TZI",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2005",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2000",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2001",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2002",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2003",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2004",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2005",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2006",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2007",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2007",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2008",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Dlt",,"@tzres.dll,-8833" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Std",,"@tzres.dll,-8832" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2003",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2004",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2005",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2006",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2007",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2008",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2009",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2016",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Display",,"America/Punta_Arenas" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Dlt",,"Magallanes Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Dlt",,"@tzres.dll,-13121" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Std",,"@tzres.dll,-13120" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Std",,"Magallanes Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -3352,25 +3728,29 @@ HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2009",1 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2017",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2017",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Display",,"Pacific/Marquesas" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Dlt",,"Marquesas Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"MUI_Dlt",,"@tzres.dll,-20737" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"MUI_Std",,"@tzres.dll,-20736" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Std",,"Marquesas Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"TZI",1,3a,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"TZI",1,3a,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Display",,"Indian/Mauritius" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Dlt",,"Mauritius Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"MUI_Dlt",,"@tzres.dll,-60897" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"MUI_Std",,"@tzres.dll,-60896" HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Std",,"Mauritius Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"FirstEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Display",,"Asia/Beirut" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Dlt",,"Middle East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"MUI_Dlt",,"@tzres.dll,-15969" @@ -3382,31 +3762,96 @@ HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Dlt",,"Montevideo D HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Dlt",,"@tzres.dll,-27969" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Std",,"@tzres.dll,-27968" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Std",,"Montevideo Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2016",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Display",,"Africa/Casablanca" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Dlt",,"Morocco Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Dlt",,"@tzres.dll,-2993" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Std",,"@tzres.dll,-2992" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,00,00,13,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,00,00,0a,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,00,00,08,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,00,00,17,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,00,00,0e,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,00,00,13,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"LastEntry",0x10001,2036 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2000",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2001",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2002",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2003",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2004",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2005",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2006",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2007",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2008",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2009",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,06,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2010",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2011",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,07,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2012",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2013",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2014",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2017",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2018",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,06,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2019",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,06,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2020",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2021",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2026",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2027",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2028",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2029",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2030",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,02,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2031",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,02,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2032",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,01,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2033",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,01,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2034",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2035",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2037",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2038",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2039",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2040",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2041",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2042",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2043",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2044",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,07,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2045",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,07,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2046",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,07,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2047",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,06,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,07,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2048",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,06,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,07,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2049",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,07,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2050",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"LastEntry",0x10001,"2050" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Display",,"America/Denver" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Dlt",,"Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll,-34353" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2000",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2003",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2004",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2005",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2006",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Dlt",,"Mountain Daylight Time (Mexico)" @@ -3414,74 +3859,236 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-7248" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Std",,"Mountain Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2002" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Display",,"Asia/Rangoon" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Dlt",,"Myanmar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"MUI_Dlt",,"@tzres.dll,-21105" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"MUI_Std",,"@tzres.dll,-21104" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Std",,"Myanmar Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"TZI",1,7a,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"TZI",1,7a,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Display",,"Asia/Novosibirsk" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Dlt",,"N. Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-30705" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-30704" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Std",,"N. Central Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,07,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Display",,"Africa/Windhoek" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Dlt",,"Namibia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Dlt",,"@tzres.dll,-6209" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Std",,"@tzres.dll,-6208" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Std",,"Namibia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2000",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2001",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2002",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2003",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2004",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2005",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2006",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2007",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2008",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2009",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2010",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2011",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2012",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2013",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2014",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2015",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2016",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2017",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Display",,"Asia/Katmandu" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Dlt",,"Nepal Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"MUI_Dlt",,"@tzres.dll,-1217" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"MUI_Std",,"@tzres.dll,-1216" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Std",,"Nepal Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"TZI",1,a7,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"TZI",1,a7,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Display",,"Pacific/Auckland" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Dlt",,"New Zealand Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"MUI_Dlt",,"@tzres.dll,-54897" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"MUI_Std",,"@tzres.dll,-54896" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"Std",,"New Zealand Standard Time" HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Display",,"America/St_Johns" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Dlt",,"Newfoundland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Dlt",,"@tzres.dll,-9505" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Std",,"@tzres.dll,-9504" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Std",,"Newfoundland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2000",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2001",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2002",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2003",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2004",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2005",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2006",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2007",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2008",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2009",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2010",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2011",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2012",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Display",,"Pacific/Norfolk" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Dlt",,"Norfolk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Dlt",,"@tzres.dll,-47441" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Std",,"@tzres.dll,-47440" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Std",,"Norfolk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2000",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2001",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2002",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2003",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2004",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2005",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2006",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2007",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2008",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2009",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2010",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2011",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2012",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2013",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2014",1,4e,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2016",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2018",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2019",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2020",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Display",,"Asia/Irkutsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Dlt",,"North Asia East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Dlt",,"@tzres.dll,-19057" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Std",,"@tzres.dll,-19056" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Std",,"North Asia East Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2000",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2003",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2004",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2009",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2010",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2011",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2012",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2013",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2014",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Display",,"Asia/Krasnoyarsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Dlt",,"North Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-305" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Std",,"@tzres.dll,-304" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Std",,"North Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2003",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2004",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2005",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2006",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2007",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2008",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2009",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2010",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2011",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2012",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2013",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2014",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2015",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Display",,"Asia/Pyongyang" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Dlt",,"North Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-35889" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Std",,"@tzres.dll,-35888" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Std",,"North Korea Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2014",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2015",1,e4,fd,ff,ff,00,00,00,00,1e,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,08,00,06,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2016",1,02,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2017",1,02,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2015",1,02,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,08,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2016",1,02,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2017",1,02,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2018",1,02,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,17,00,1e,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2019",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2019",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Display",,"Asia/Omsk" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Dlt",,"Omsk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Dlt",,"@tzres.dll,-55953" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Std",,"@tzres.dll,-55952" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Std",,"Omsk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2012",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2013",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.dll,-65009" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Std",,"@tzres.dll,-65008" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -3490,25 +4097,39 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2009",1 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2024",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2029",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2030",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2035",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2040",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2041",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2046",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2047",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2048",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,"2048" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-11233" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Std",,"@tzres.dll,-11232" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" @@ -3516,219 +4137,830 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-15584" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2008",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2009",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2010",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Display",,"Asia/Karachi" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Dlt",,"Pakistan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Dlt",,"@tzres.dll,-28753" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Std",,"@tzres.dll,-28752" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Std",,"Pakistan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2008",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2009",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,03,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2010",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2002" +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Display",,"America/Asuncion" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Dlt",,"Paraguay Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Dlt",,"@tzres.dll,-50225" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Std",,"@tzres.dll,-50224" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Std",,"Paraguay Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Display",,"Asia/Qyzylorda" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Dlt",,"Qyzylorda Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Dlt",,"@tzres.dll,-53761" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Std",,"@tzres.dll,-53760" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Std",,"Qyzylorda Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2003",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2004",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2012",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2013",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2017",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2018",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2019",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Display",,"Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Dlt",,"Romance Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Dlt",,"@tzres.dll,-45105" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Std",,"@tzres.dll,-45104" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Display",,"Asia/Srednekolymsk" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Dlt",,"Russia Time Zone 10" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Dlt",,"@tzres.dll,-59265" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Std",,"@tzres.dll,-59264" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Std",,"Russia Time Zone 10" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2003",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2004",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2005",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2006",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2007",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2008",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2009",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2014",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Display",,"Asia/Kamchatka" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Dlt",,"Russia Time Zone 11" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Dlt",,"@tzres.dll,-46001" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Std",,"@tzres.dll,-46000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Std",,"Russia Time Zone 11" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2009",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Display",,"Europe/Samara" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Dlt",,"Russia Time Zone 3" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Dlt",,"@tzres.dll,-17921" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Std",,"@tzres.dll,-17920" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Std",,"Russia Time Zone 3" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Display",,"Europe/Moscow" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Dlt",,"Russian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Dlt",,"@tzres.dll,-44561" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Std",,"@tzres.dll,-44560" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Std",,"Russian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Display",,"America/Cayenne" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"America/Bogota" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-49425" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Std",,"@tzres.dll,-49424" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Std",,"SA Pacific Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Display",,"America/La_Paz" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Dlt",,"SA Western Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"MUI_Dlt",,"@tzres.dll,-57121" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"MUI_Std",,"@tzres.dll,-57120" HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"Std",,"SA Western Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Western Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Display",,"America/Miquelon" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Dlt",,"Saint Pierre Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"MUI_Dlt",,"@tzres.dll,-5585" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"MUI_Std",,"@tzres.dll,-5584" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"Std",,"Saint Pierre Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Display",,"Asia/Sakhalin" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Dlt",,"Sakhalin Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Dlt",,"@tzres.dll,-35105" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Std",,"@tzres.dll,-35104" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Std",,"Sakhalin Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2016",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Display",,"Pacific/Apia" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Dlt",,"Samoa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Dlt",,"@tzres.dll,-14593" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Std",,"@tzres.dll,-14592" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Std",,"Samoa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2000",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2001",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2002",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2003",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2004",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2005",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2006",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2007",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2008",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2009",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2010",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2011",1,94,02,00,00,00,00,00,00,24,fa,ff,ff,00,00,04,00,06,00,01,00,04,00,00,00,00,00,00,00,00,00,0c,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2012",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Display",,"Africa/Sao_Tome" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Dlt",,"Sao Tome Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Dlt",,"@tzres.dll,-5985" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Std",,"@tzres.dll,-5984" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Std",,"Sao Tome Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2018",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2019",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2020",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"FirstEntry",0x10001,"2018" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Display",,"Europe/Saratov" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Dlt",,"Saratov Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Dlt",,"@tzres.dll,-33809" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Std",,"@tzres.dll,-33808" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Std",,"Saratov Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2017",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Display",,"Asia/Bangkok" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Dlt",,"SE Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-53729" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"MUI_Std",,"@tzres.dll,-53728" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Std",,"SE Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Display",,"Asia/Singapore" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Dlt",,"Singapore Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"MUI_Dlt",,"@tzres.dll,-61841" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"MUI_Std",,"@tzres.dll,-61840" HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"Std",,"Singapore Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Singapore Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Display",,"Africa/Johannesburg" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Dlt",,"South Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Dlt",,"@tzres.dll,-38897" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"MUI_Std",,"@tzres.dll,-38896" HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"Std",,"South Africa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\South Africa Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Display",,"Asia/Colombo" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Dlt",,"Sri Lanka Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Dlt",,"@tzres.dll,-39409" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"MUI_Std",,"@tzres.dll,-39408" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Std",,"Sri Lanka Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2006",1,b6,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,06,00,03,00,00,00,1e,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2007",1,b6,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Display",,"Africa/Khartoum" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Dlt",,"Sudan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Dlt",,"@tzres.dll,-9793" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Std",,"@tzres.dll,-9792" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Std",,"Sudan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,06,00,03,00,0c,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2013",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2017",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Display",,"Asia/Damascus" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Dlt",,"Syria Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Dlt",,"@tzres.dll,-46577" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Std",,"@tzres.dll,-46576" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Std",,"Syria Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Display",,"Asia/Taipei" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Dlt",,"Taipei Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"MUI_Dlt",,"@tzres.dll,-26433" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"MUI_Std",,"@tzres.dll,-26432" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Std",,"Taipei Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Display",,"Australia/Hobart" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Dlt",,"Tasmania Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"MUI_Dlt",,"@tzres.dll,-36017" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"MUI_Std",,"@tzres.dll,-36016" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Std",,"Tasmania Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Display",,"America/Araguaina" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Dlt",,"Tocantins Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Dlt",,"@tzres.dll,-43073" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Std",,"@tzres.dll,-43072" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Std",,"Tocantins Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"FirstEntry",0x10001,"2011" +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"LastEntry",0x10001,"2014" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Display",,"Asia/Tokyo" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Dlt",,"Tokyo Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"MUI_Dlt",,"@tzres.dll,-16241" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"MUI_Std",,"@tzres.dll,-16240" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Std",,"Tokyo Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Display",,"Asia/Tomsk" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Dlt",,"Tomsk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Dlt",,"@tzres.dll,-29137" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Std",,"@tzres.dll,-29136" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Std",,"Tomsk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Display",,"Pacific/Tongatapu" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Dlt",,"Tonga Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Dlt",,"@tzres.dll,-7217" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Std",,"@tzres.dll,-7216" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Std",,"Tonga Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2000",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2001",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2002",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2016",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2017",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2018",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Display",,"Asia/Chita" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Dlt",,"Transbaikal Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Dlt",,"@tzres.dll,-31473" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Std",,"@tzres.dll,-31472" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Std",,"Transbaikal Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2003",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2004",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2005",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2006",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2007",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2008",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2009",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2010",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2011",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2014",1,20,fe,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2016",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2017",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Display",,"Europe/Istanbul" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Dlt",,"Turkey Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Dlt",,"@tzres.dll,-24849" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Std",,"@tzres.dll,-24848" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,df,07,0b,00,00,00,08,00,04,00,00,00,00,00,00,00,df,07,03,00,00,00,1d,00,03,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,01,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2017",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Display",,"America/Grand_Turk" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Dlt",,"Turks And Caicos Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Dlt",,"@tzres.dll,-20561" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Std",,"@tzres.dll,-20560" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Std",,"Turks And Caicos Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2018",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2019",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Dlt",,"@tzres.dll,-47201" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Std",,"@tzres.dll,-47200" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2003",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2004",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2016",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2017",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Display",,"America/Indianapolis" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Dlt",,"US Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-34929" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Std",,"@tzres.dll,-34928" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Std",,"US Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America/Phoenix" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"MUI_Dlt",,"@tzres.dll,-37473" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"MUI_Std",,"@tzres.dll,-37472" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" +HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Dlt",,"@tzres.dll,-22001" HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Std",,"@tzres.dll,-22000" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" -HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Display",,"Etc/GMT-12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Dlt",,"UTC+12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Dlt",,"@tzres.dll,-1201" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Std",,"@tzres.dll,-1200" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Std",,"UTC+12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Display",,"Etc/GMT-13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Dlt",,"UTC+13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Dlt",,"@tzres.dll,-8785" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Std",,"@tzres.dll,-8784" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Std",,"UTC+13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Display",,"Etc/GMT+2" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Dlt",,"UTC-02" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Dlt",,"@tzres.dll,-37329" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Std",,"@tzres.dll,-37328" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Std",,"UTC-02" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"TZI",1,78,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Display",,"Etc/GMT+8" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Dlt",,"UTC-08" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Dlt",,"@tzres.dll,-3345" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Std",,"@tzres.dll,-3344" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Std",,"UTC-08" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Display",,"Etc/GMT+9" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Dlt",,"UTC-09" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Dlt",,"@tzres.dll,-39153" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Std",,"@tzres.dll,-39152" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Std",,"UTC-09" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Display",,"Etc/GMT+11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Dlt",,"UTC-11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Dlt",,"@tzres.dll,-19409" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Std",,"@tzres.dll,-19408" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Std",,"UTC-11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"TZI",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Dlt",,"@tzres.dll,-51473" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Std",,"@tzres.dll,-51472" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"TZI",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2007",1,0e,01,00,00,00,00,00,00,e2,ff,ff,ff,00,00,0c,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2008",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2009",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2010",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2011",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2012",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2013",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2014",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2015",1,0e,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2016",1,0e,01,00,00,00,00,00,00,e2,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,1e,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"FirstEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Display",,"Asia/Vladivostok" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Dlt",,"Vladivostok Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Dlt",,"@tzres.dll,-61377" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Std",,"@tzres.dll,-61376" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Std",,"Vladivostok Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2012",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2013",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Display",,"Europe/Volgograd" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Dlt",,"Volgograd Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Dlt",,"@tzres.dll,-18049" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Std",,"@tzres.dll,-18048" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Std",,"Volgograd Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2018",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2019",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2020",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2021",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"LastEntry",0x10001,"2021" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Display",,"Australia/Perth" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Dlt",,"W. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Dlt",,"@tzres.dll,-65377" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65376" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Std",,"W. Australia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2009",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2010",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2010",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Display",,"Africa/Lagos" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Dlt",,"W. Central Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"MUI_Dlt",,"@tzres.dll,-64977" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"MUI_Std",,"@tzres.dll,-64976" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Std",,"W. Central Africa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Display",,"Europe/Berlin" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Dlt",,"W. Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"MUI_Dlt",,"@tzres.dll,-27697" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"MUI_Std",,"@tzres.dll,-27696" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"Std",,"W. Europe Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Europe Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Display",,"Asia/Hovd" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Dlt",,"W. Mongolia Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Dlt",,"@tzres.dll,-53953" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Std",,"@tzres.dll,-53952" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Std",,"W. Mongolia Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2003",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2004",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2005",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2006",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2015",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2016",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Display",,"Asia/Tashkent" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Dlt",,"West Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-49665" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Std",,"@tzres.dll,-49664" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Std",,"West Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Display",,"Asia/Hebron" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Dlt",,"West Bank Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Dlt",,"@tzres.dll,-46161" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Std",,"@tzres.dll,-46160" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Std",,"West Bank Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,02,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,03,00,02,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,03,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2017",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2025",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2027",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2031",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2032",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2036",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2038",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2042",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2049",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2050" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Display",,"Pacific/Port_Moresby" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Dlt",,"West Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-10225" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Std",,"@tzres.dll,-10224" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Std",,"West Pacific Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Display",,"Asia/Yakutsk" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Dlt",,"Yakutsk Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"MUI_Dlt",,"@tzres.dll,-40577" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"MUI_Std",,"@tzres.dll,-40576" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2003",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2004",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2005",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2006",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2007",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2008",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2009",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2010",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2011",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2014",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2015",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Display",,"America/Whitehorse" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Dlt",,"Yukon Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Dlt",,"@tzres.dll,-26289" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Std",,"@tzres.dll,-26288" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Std",,"Yukon Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2008",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2009",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2010",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2011",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2012",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2013",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2014",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2015",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2016",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2017",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2018",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2019",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2020",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2021",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"LastEntry",0x10001,"2021" HKLM,%CurrentVersion%\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\%CurrentVersionNT%\Time Zones" [BITSService] -- 2.33.0

1 1

[PATCH 3/3] wininet: InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS) should return ERROR_SUCCESS instead of ERROR_CANCELLED.
by Dmitry Timoshkov 06 Sep '21

06 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 3 ++- dlls/wininet/tests/internet.c | 29 ++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 25ed1f2a651..77cbbfb1337 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -536,7 +536,8 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_SUCCESS; break; default: - res = ERROR_CANCELLED; + res = (dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS) ? ERROR_SUCCESS : ERROR_CANCELLED; + break; } if(req) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index f7d7f1f49d7..f97cfef03d7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1575,15 +1575,11 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && - i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && - i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + todo_wine_if(i == ERROR_INTERNET_MIXED_SECURITY || i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE || + i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || i == ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR || + i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE || + i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT || + i == ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT || i == ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ @@ -1601,23 +1597,18 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && - i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && - i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && - i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && - i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && - i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION && - i != ERROR_INTERNET_INCORRECT_PASSWORD) + todo_wine_if(i == ERROR_INTERNET_MIXED_SECURITY || i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE || + i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || i == ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR || + i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE || + i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT || + i == ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT || i == ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); -todo_wine ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); res = InternetCloseHandle(req); -- 2.31.1

2 1

[PATCH 1/3] wininet/tests: Add some tests for InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS).
by Dmitry Timoshkov 06 Sep '21

06 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/internet.c | 57 +++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9feafc4118e..6b8eefc0b78 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1514,7 +1514,7 @@ static void test_InternetErrorDlg(void) for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected = ERROR_CANCELLED, test_flags = 0, j; + DWORD expected = ERROR_CANCELLED, expected2 = ERROR_SUCCESS, test_flags = 0, j; for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) { @@ -1522,6 +1522,7 @@ static void test_InternetErrorDlg(void) { test_flags = no_ui_res[j].test_flags; expected = no_ui_res[j].res; + expected2 = no_ui_res[j].res; } } @@ -1550,43 +1551,75 @@ static void test_InternetErrorDlg(void) switch(i) { case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: - if (broken(res == ERROR_CANCELLED)) /* before win10 returns ERROR_CANCELLED */ + if (res == ERROR_CANCELLED) /* before win10 returns ERROR_CANCELLED */ + { expected = ERROR_CANCELLED; + expected2 = ERROR_CANCELLED; + } break; default: - if(broken((expected == ERROR_CANCELLED || i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) && - res == ERROR_NOT_SUPPORTED)) /* XP, Win7, Win8 */ + if (expected == ERROR_CANCELLED && res == ERROR_NOT_SUPPORTED) /* XP, Win7, Win8 */ + { expected = ERROR_NOT_SUPPORTED; + expected2 = ERROR_SUCCESS; + } break; } - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && + i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && + i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && + i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && + i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) + { expected = ERROR_INVALID_PARAMETER; + expected2 = ERROR_INVALID_PARAMETER; + } res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + + res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && + i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && + i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } + res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + + res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + res = InternetCloseHandle(req); ok(res == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); res = InternetCloseHandle(con); -- 2.31.1

2 1

[PATCH v2 2/2] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
by Jacek Caban 06 Sep '21

06 Sep '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 5 +---- dlls/wininet/tests/internet.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH v2 1/2] wininet/tests: Add some tests for InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS).
by Jacek Caban 06 Sep '21

06 Sep '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 45 ++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)

1 0

[PATCH 1/3] winex11.drv: Add GUID_DISPLAY_DEVICE_ARRIVAL interface to display device.
by Paul Gofman 06 Sep '21

06 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ include/ntddvdeo.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..0b20cff5e79 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -409,6 +410,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; @@ -432,6 +434,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, &iface_data)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0; diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index 9523e37f7b4..8736c6cc845 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -21,5 +21,6 @@ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); #endif -- 2.31.1

3 4

[PATCH] winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
by Jan Sikorski 06 Sep '21

06 Sep '21

The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Fixes a crash in Lord of the Rings online. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++------ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index eec750706a8..0926756c875 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1785,7 +1785,7 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; @@ -1964,7 +1964,7 @@ - (void) setFrameFromWine:(NSRect)contentRect { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; } } } @@ -2129,7 +2129,7 @@ - (void) postBroughtForwardEvent macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing skipSizeMove:(BOOL)skipSizeMove { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2149,6 +2149,7 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.skip_size_move_loop = skipSizeMove; [queue postEvent:event]; macdrv_release_event(event); } @@ -2912,7 +2913,7 @@ - (void)windowDidResignKey:(NSNotification *)notification macdrv_release_event(event); } - - (void)windowDidResize:(NSNotification *)notification + - (void)windowDidResize:(NSNotification *)notification skipSizeMove:(BOOL)skipSizeMove { NSRect frame = self.wine_fractionalFrame; @@ -2935,12 +2936,18 @@ - (void)windowDidResize:(NSNotification *)notification [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + skipSizeMove:skipSizeMove]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; } + - (void)windowDidResize:(NSNotification *)notification + { + [self windowDidResize:notification skipSizeMove:FALSE]; + } + - (BOOL)windowShouldClose:(id)sender { macdrv_event* event = macdrv_create_event(WINDOW_CLOSE_REQUESTED, self); @@ -2997,7 +3004,7 @@ - (void) windowWillEnterFullScreen:(NSNotification*)notification - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE skipSizeMove:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 47ae6627b9f..81840e067a9 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, CGRect frame; int fullscreen; int in_resize; + int skip_size_move_loop; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 14d6a6fd1b2..622f136930c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } } -- 2.29.2

1 0

[PATCH v2 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 06 Sep '21

06 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 +++++++++--- dlls/winex11.drv/x11drv.h | 6 ++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 42 +++++++++++++++++++++++++++++++++- 6 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..eb2f7021ba6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,37 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid(RROutput output, unsigned char **prop, unsigned long *len) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( + gdi_display, + output, + x11drv_atom(EDID), + 0, + 128, + FALSE, + FALSE, + AnyPropertyType, + &actual_type, + &actual_format, + len, + &bytes_after, + prop + ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1069,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1125,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1174,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

3 6

[PATCH 0/4] DbgHelp: Reworked line handling APIs
by Eric Pouech 06 Sep '21

06 Sep '21

Basically, current implem is broken: - in some code paths, same buffer is used both as input and output this serie fixes it by putting in place a cleaner way of setting the returned buffer it also implements a couple of missing W64 variants of APIs (this issue had been reported by Alistair a couple of months ago on wine-devel) A+ --- Eric Pouech (4): dbghelp: let symt_fill_func_line_info and symt_get_func_line_next be a static function inside symbol.c dbghelp: introducing internal_line_t structure as help in Line manipulation dbghelp: implemented all SymGetLineNext* functions using internal_line_t dbghelp: (re)write SymGetLinePrev* with internal_line_t dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/symbol.c | 393 ++++++++++++++++++++++++-------------- 2 files changed, 248 insertions(+), 149 deletions(-)

1 4

[PATCH 5/5] hh: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/hh/hh.manifest | 9 +++++++++ programs/hh/hh.rc | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 programs/hh/hh.manifest diff --git a/programs/hh/hh.manifest b/programs/hh/hh.manifest new file mode 100644 index 00000000000..be1e025a548 --- /dev/null +++ b/programs/hh/hh.manifest @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.HelpViewer" version="0.0.0.0"/> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> +</assembly> diff --git a/programs/hh/hh.rc b/programs/hh/hh.rc index d397dc63ee4..36c142345b9 100644 --- a/programs/hh/hh.rc +++ b/programs/hh/hh.rc @@ -18,6 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <winuser.h> /* @makedep: winhelp.ico */ 101 ICON winhelp.ico + +/* @makedep: hh.manifest */ +1 RT_MANIFEST hh.manifest -- 2.30.2

1 0

[PATCH 4/5] explorer: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

This is also required for get_monitor_dpi() in wineserver to function properly for DPI unaware applications because it uses desktop window DPI as monitor DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/explorer.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/explorer.manifest b/programs/explorer/explorer.manifest index 15e5428a1b7..a4b573f0b41 100644 --- a/programs/explorer/explorer.manifest +++ b/programs/explorer/explorer.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 3/5] dxdiag: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/dxdiag/dxdiag.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest index 57ba80c05db..6b17f6cd09f 100644 --- a/programs/dxdiag/dxdiag.manifest +++ b/programs/dxdiag/dxdiag.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 2/5] clock: Add DPI system awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/clock/clock.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest index 4a9f38c4ff8..393459c383c 100644 --- a/programs/clock/clock.manifest +++ b/programs/clock/clock.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 1/5] control: Add DPI system awareness settings to the application manifest.
by Zhiyi Zhang 06 Sep '21

06 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Most builtin programs already achieved system DPI awareness. When scaling for DPI unaware applications are implemented and enabled. These programs will be consider as DPI unaware due to their lack of DPI awareness settings in their manifest. So add them now to avoid blurry application windows in the future. programs/control/control.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/control/control.manifest b/programs/control/control.manifest index 2834937e564..0b677f379b0 100644 --- a/programs/control/control.manifest +++ b/programs/control/control.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 0/7] DbgHelp: A bunch of fixes/improvements related to module management
by Eric Pouech 06 Sep '21

06 Sep '21

- Various corner case bug fixes when loading modules - Reporting machine information for modules - Improved management of module's name: + native (W10) stores & matches with module's name truncated to 64 characters + updated builtin to have equivalent behavior A+ --- Eric Pouech (7): dbghelp: SymLoadModule* should return the base address in case of success, and 0 otherwise dbghelp: native allows loading virtual module at any address dbghelp: return correct error code when reloading a module in SymLoadModule* dbghelp: use module->modulename instead of module->module.ModuleName in traces dbghelp: use the correct module name for lookups including module's name include/imagehlp.h: extend IMAGEHLP_MODULE*64 with new fields (keeping in sync with dbghelp.h) dbghelp: Properly managing the new MachineType field in IMAGEHLP_MODULE(W)64 dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 6 +++--- dlls/dbghelp/elf_module.c | 33 ++++++++++++++++++++++++--------- dlls/dbghelp/macho_module.c | 11 ++++++----- dlls/dbghelp/module.c | 30 ++++++++++++++++++++++-------- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 8 +++++--- dlls/dbghelp/symbol.c | 24 ++++++++++++------------ dlls/dbghelp/type.c | 4 ++-- include/imagehlp.h | 4 ++++ 10 files changed, 80 insertions(+), 44 deletions(-)

1 7

[PATCH 1/3] winebus.sys: Return an event from SDL bus wait on device creation.
by Rémi Bernon 06 Sep '21

06 Sep '21

Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 14 ++++---------- dlls/winebus.sys/main.c | 10 ++++++++++ dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 14 ++++++++++++++ dlls/winebus.sys/unixlib.h | 7 +++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1f7cf237e25..80252e7e6b1 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -741,7 +741,6 @@ static void sdl_add_device(unsigned int index) .serial = {'0','0','0','0',0}, }; struct platform_private *private; - DEVICE_OBJECT *device = NULL; char guid_str[34]; SDL_Joystick* joystick; @@ -791,16 +790,11 @@ static void sdl_add_device(unsigned int index) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; private->unix_device.vtbl = &sdl_device_vtbl; + private->sdl_joystick = joystick; + private->sdl_controller = controller; + private->id = id; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - else - { - private->sdl_joystick = joystick; - private->sdl_controller = controller; - private->id = id; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } static void process_device_event(SDL_Event *event) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6093a0b79eb..8a565bc3c46 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -578,6 +578,16 @@ static DWORD CALLBACK bus_main_thread(void *args) LeaveCriticalSection(&device_list_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; + case BUS_EVENT_TYPE_DEVICE_CREATED: + device = bus_create_hid_device(&event->device_created.desc, event->device_created.device); + if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); + else + { + WARN("failed to create device for %s bus device %p\n", + debugstr_w(bus.name), event->device_created.device); + winebus_call(device_remove, event->device_created.device); + } + break; } } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 81c4658068b..5cf999fff86 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -61,6 +61,7 @@ extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; struct hid_descriptor diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 2337cb3706d..9b0ccc0ae1a 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -327,6 +327,20 @@ BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, voi return TRUE; } +BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) +{ + ULONG size = sizeof(struct bus_event); + struct bus_event *event = HeapAlloc(GetProcessHeap(), 0, size); + if (!event) return FALSE; + + event->type = BUS_EVENT_TYPE_DEVICE_CREATED; + event->device_created.device = device; + event->device_created.desc = *desc; + list_add_tail(queue, &event->entry); + + return TRUE; +} + BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) { struct list *entry = list_head(queue); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 96671de0cac..85a03dd17ee 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -65,6 +65,7 @@ enum bus_event_type { BUS_EVENT_TYPE_NONE, BUS_EVENT_TYPE_DEVICE_REMOVED, + BUS_EVENT_TYPE_DEVICE_CREATED, }; struct bus_event @@ -79,6 +80,12 @@ struct bus_event const WCHAR *bus_id; void *context; } device_removed; + + struct + { + struct unix_device *device; + struct device_desc desc; + } device_created; }; }; -- 2.33.0

1 2

[PATCH] ntdll/tests: Remove unused variable sbi from test_query_process
by Alex Henrie 06 Sep '21

06 Sep '21

The code that used it was removed in commit 8ac77cfbf96689d83463928a9d0bdc5fcd054cb9. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e642427bffb..d05db6d1858 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -444,7 +444,6 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - SYSTEM_BASIC_INFORMATION sbi; PROCESS_BASIC_INFORMATION pbi; THREAD_BASIC_INFORMATION tbi; OBJECT_ATTRIBUTES attr; @@ -492,8 +491,6 @@ static void test_query_process(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); spi = spi_buf; - pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - for (;;) { DWORD_PTR tid; -- 2.33.0

1 0

[PATCH] dbghelp: Use the internal modulename when comparing Module names.
by Alistair Leslie-Hughes 05 Sep '21

05 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/elf_module.c | 4 ++-- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/symbol.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 7be7e8efce6..7f9f336d6b4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1068,8 +1068,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; } - if (wcsstr(module->module.ModuleName, S_ElfW) || - !wcscmp(module->module.ModuleName, S_WineLoaderW)) + if (wcsstr(module->modulename, S_ElfW) || + !wcscmp(module->modulename, S_WineLoaderW)) { /* add the thunks for native libraries */ if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3bc2a9e143a..66e9177c722 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -271,7 +271,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { - if (!wcsicmp(name, module->module.ModuleName)) return module; + if (!wcsnicmp(name, module->modulename, ARRAYSIZE(module->modulename))) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 9863a736299..31cd7771ad2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1089,7 +1089,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, { if (pair.requested->type == DMT_PE && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } @@ -1104,7 +1104,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, !module_get_containee(pair.pcs, pair.requested) && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } -- 2.33.0

1 0

[PATCH] cmd: Fix capitalization of WCMD_ReadFile in comment
by Alex Henrie 05 Sep '21

05 Sep '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index acf8f63b1f1..8c6ed1c057c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -212,7 +212,7 @@ void WCMD_leave_paged_mode(void) } /*************************************************************************** - * WCMD_Readfile + * WCMD_ReadFile * * Read characters in from a console/file, returning result in Unicode */ -- 2.33.0

1 0

[PATCH] msvcp140_1: Remove __cdecl on static functions where not needed.
by Francois Gouget 05 Sep '21

05 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp140_1/msvcp140_1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 823adedf3ac..c6a6ff19f13 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -64,7 +64,7 @@ void __cdecl MSVCRT_operator_delete(void *mem) free(mem); } -static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) +static void* MSVCRT_operator_new_aligned(size_t size, size_t alignment) { void *retval; int freed; @@ -85,7 +85,7 @@ static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) return NULL; } -static void __cdecl MSVCRT_operator_delete_aligned(void *mem, size_t alignment) +static void MSVCRT_operator_delete_aligned(void *mem, size_t alignment) { _aligned_free(mem); } -- 2.30.2

2 1

How to install Wine?
by igor evgen 05 Sep '21

05 Sep '21

Hi there, I tried to install Wine (whatever latest version) on my Ubuntu 21.04. My computer Terminal advised: <wget dl.winehq.org/wine-builds/Release.key sudo apt-key add Release.key sudo apt-add-repository 'dl.winehq.org/wine-builds/ubuntu'>. The above was followed & done more than once, including the way recommended by winehq.org. (I mean to enter a site, copy a command to a Terminal, etc., as a dummy does.) However, Terminal answered: <The following packages have unmet dependencies. winehq-stable : Depends: wine-stable (= 6.0.1~hirsute-1) E: Unable to correct problems, you have held broken packages.> Does it mean that Wine cannot be installed on my 21.04? Kindly note, I am not a computer engineer, just a user.What I quoted from the Terminal program is not my expertise. Thank you.Igor

2 1

[PATCH] sppc: Stub SLClose.
by Esme Povirk 04 Sep '21

04 Sep '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 19895041a32..a5250df23b9 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) sppc.SLClose @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index c05f15a28db..ce3183f39bd 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -51,6 +51,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId -- 2.25.1

1 0

[PATCH 2/2] wininet: Decoding is enabled by default
by Alistair Leslie-Hughes 04 Sep '21

04 Sep '21

Unless explicitly turned off decoding of gzip, deflate is supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 62 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cef151c7bf2..4ac66660aa3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -107,6 +107,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si if(!ret) return NULL; + ret->decoding = -1; list_init(&ret->children); EnterCriticalSection( &WININET_cs ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..462c7a47635 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -283,7 +283,7 @@ struct _object_header_t ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; - BOOL decoding; + INT decoding; INTERNET_STATUS_CALLBACK lpfnStatusCB; struct list entry; struct list children; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d32f01be2c5..ed35025d5f4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3523,6 +3523,67 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_deflate(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + BOOL b; + char binary[] = "\x1f\x8b\x08"; + char text[] = "<!DOCTYPE HTML PUBLIC"; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + /* Default Decoding */ + req = HttpOpenRequestA(con, NULL, "/tests/gzip.php", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, L"Accept-Encoding: gzip, deflate", ~0u, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + ret = InternetReadFile(req, buf, 256, &len); + ok(ret, "InternetReadFile failed %d\n", GetLastError()); + ok(!strncmp(buf, text, strlen(text)), "got %s\n", debugstr_a(buf)); + + InternetCloseHandle(req); + InternetCloseHandle(con); + + /* Disabled Decoding */ + b = FALSE; + InternetSetOptionA(ses, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + + con = InternetConnectA(ses, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/tests/gzip.php", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, L"Accept-Encoding: gzip, deflate", ~0u, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + ret = InternetReadFile(req, buf, 256, &len); + ok(ret, "InternetReadFile failed %d\n", GetLastError()); + ok(!strncmp(buf, binary, strlen(binary)), "got %s\n", debugstr_a(buf)); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6097,6 +6158,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_deflate(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH 1/2] wininet: Set context length for http status 403
by Alistair Leslie-Hughes 04 Sep '21

04 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..d32f01be2c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3492,37 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6096,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH v2 1/2] server: Add helper functions to perform atomic stores.
by Zebediah Figura 03 Sep '21

03 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/fd.c | 61 ++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/server/fd.c b/server/fd.c index a09fc9edfcf..79ddd0a96a9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -385,41 +385,44 @@ timeout_t monotonic_time; struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const int user_shared_data_timeout = 16; +static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) +{ + /* on x86 there should be total store order guarantees, so volatile is + * enough to ensure the stores aren't reordered by the compiler, and then + * they will always be seen in-order from other CPUs. On other archs, we + * need atomic intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + +static void atomic_store_long(volatile LONG *ptr, LONG value) +{ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + static void set_user_shared_data_time(void) { timeout_t tick_count = monotonic_time / 10000; - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - user_shared_data->SystemTime.High2Time = current_time >> 32; - user_shared_data->SystemTime.LowPart = current_time; - user_shared_data->SystemTime.High1Time = current_time >> 32; + atomic_store_long(&user_shared_data->SystemTime.High2Time, current_time >> 32); + atomic_store_ulong(&user_shared_data->SystemTime.LowPart, current_time); + atomic_store_long(&user_shared_data->SystemTime.High1Time, current_time >> 32); - user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; - user_shared_data->InterruptTime.LowPart = monotonic_time; - user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + atomic_store_long(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32); + atomic_store_ulong(&user_shared_data->InterruptTime.LowPart, monotonic_time); + atomic_store_long(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32); - user_shared_data->TickCount.High2Time = tick_count >> 32; - user_shared_data->TickCount.LowPart = tick_count; - user_shared_data->TickCount.High1Time = tick_count >> 32; - *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; -#else - __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); -#endif + atomic_store_long(&user_shared_data->TickCount.High2Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCount.LowPart, tick_count); + atomic_store_long(&user_shared_data->TickCount.High1Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCountLowDeprecated, tick_count); } void set_current_time(void) -- 2.33.0

1 1

[PATCH] windowscodecs: Make the jpeg_encoder_*() functions static.
by Francois Gouget 03 Sep '21

03 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/libjpeg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 96a9b79f358..dff13c90db2 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -535,7 +535,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) } } -HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) +static HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -570,7 +570,7 @@ HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) return S_OK; } -HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, +static HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -590,7 +590,7 @@ HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pix return S_OK; } -HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +static HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -629,7 +629,7 @@ HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct enco return S_OK; } -HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, +static HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, DWORD line_count, DWORD stride) { struct jpeg_encoder *This = impl_from_encoder(iface); @@ -690,7 +690,7 @@ HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, return S_OK; } -HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -705,12 +705,12 @@ HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) return S_OK; } -HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) { return S_OK; } -void CDECL jpeg_encoder_destroy(struct encoder* iface) +static void CDECL jpeg_encoder_destroy(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); if (This->cinfo_initialized) -- 2.30.2

2 1

[PATCH v3 1/3] ntoskrnl.exe/tests: Move driver testing helpers to a separate file.
by Rémi Bernon 03 Sep '21

03 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add a check that the service is started as it should be, or consider that the machine doesn't support test signed drivers. According to https://testbot.winehq.org/JobDetails.pl?Key=96764 it should be fine now. dlls/ntoskrnl.exe/tests/driver_tests.h | 577 ++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 632 +------------------------ 2 files changed, 595 insertions(+), 614 deletions(-) create mode 100644 dlls/ntoskrnl.exe/tests/driver_tests.h diff --git a/dlls/ntoskrnl.exe/tests/driver_tests.h b/dlls/ntoskrnl.exe/tests/driver_tests.h new file mode 100644 index 00000000000..b3a25e4d563 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver_tests.h @@ -0,0 +1,577 @@ +/* + * ntoskrnl.exe testing framework + * + * Copyright 2015 Sebastian Lackner + * Copyright 2015 Michael Müller + * Copyright 2015 Christian Costa + * Copyright 2020-2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stddef.h> +#include <time.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winioctl.h" +#include "winternl.h" +#include "winuser.h" +#include "winnls.h" +#include "winsvc.h" +#include "winreg.h" +#include "wincrypt.h" + +#include "mscat.h" +#include "newdev.h" +#include "ntsecapi.h" +#include "objbase.h" +#include "setupapi.h" + +#include "wine/mssign.h" +#include "wine/test.h" + +#include "driver.h" + +static HANDLE test_data_mapping; +static struct test_data *test_data; + +static HRESULT (WINAPI *pSignerSign)(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, + SIGNER_SIGNATURE_INFO *signature, SIGNER_PROVIDER_INFO *provider, + const WCHAR *timestamp, CRYPT_ATTRIBUTES *attr, void *sip_data); + +#define load_resource (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : load_resource_ +static void load_resource_(const WCHAR *name, WCHAR *filename) +{ + static WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(path), path); + GetTempFileNameW(path, name, 0, filename); + + file = CreateFileW(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + winetest_ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %u\n", debugstr_w(filename), GetLastError()); + + res = FindResourceW(NULL, name, L"TESTDLL"); + winetest_ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + winetest_ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +struct testsign_context +{ + HCRYPTPROV provider; + const CERT_CONTEXT *cert, *root_cert, *publisher_cert; + HCERTSTORE root_store, publisher_store; +}; + +static BOOL testsign_create_cert(struct testsign_context *ctx) +{ + BYTE encoded_name[100], encoded_key_id[200], public_key_info_buffer[1000]; + WCHAR container_name[26]; + BYTE hash_buffer[16], cert_buffer[1000], provider_nameA[100], serial[16]; + CERT_PUBLIC_KEY_INFO *public_key_info = (CERT_PUBLIC_KEY_INFO *)public_key_info_buffer; + CRYPT_KEY_PROV_INFO provider_info = {0}; + CRYPT_ALGORITHM_IDENTIFIER algid = {0}; + CERT_AUTHORITY_KEY_ID_INFO key_info; + CERT_INFO cert_info = {0}; + WCHAR provider_nameW[100]; + CERT_EXTENSION extension; + HCRYPTKEY key; + DWORD size; + BOOL ret; + + memset(ctx, 0, sizeof(*ctx)); + + srand(time(NULL)); + swprintf(container_name, ARRAY_SIZE(container_name), L"wine_testsign%u", rand()); + + ret = CryptAcquireContextW(&ctx->provider, container_name, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); + winetest_ok(ret, "Failed to create container, error %#x\n", GetLastError()); + + ret = CryptGenKey(ctx->provider, AT_SIGNATURE, CRYPT_EXPORTABLE, &key); + winetest_ok(ret, "Failed to create key, error %#x\n", GetLastError()); + ret = CryptDestroyKey(key); + winetest_ok(ret, "Failed to destroy key, error %#x\n", GetLastError()); + ret = CryptGetUserKey(ctx->provider, AT_SIGNATURE, &key); + winetest_ok(ret, "Failed to get user key, error %#x\n", GetLastError()); + ret = CryptDestroyKey(key); + winetest_ok(ret, "Failed to destroy key, error %#x\n", GetLastError()); + + size = sizeof(encoded_name); + ret = CertStrToNameA(X509_ASN_ENCODING, "CN=winetest_cert", CERT_X500_NAME_STR, NULL, encoded_name, &size, NULL); + winetest_ok(ret, "Failed to convert name, error %#x\n", GetLastError()); + key_info.CertIssuer.cbData = size; + key_info.CertIssuer.pbData = encoded_name; + + size = sizeof(public_key_info_buffer); + ret = CryptExportPublicKeyInfo(ctx->provider, AT_SIGNATURE, X509_ASN_ENCODING, public_key_info, &size); + winetest_ok(ret, "Failed to export public key, error %#x\n", GetLastError()); + cert_info.SubjectPublicKeyInfo = *public_key_info; + + size = sizeof(hash_buffer); + ret = CryptHashPublicKeyInfo(ctx->provider, CALG_MD5, 0, X509_ASN_ENCODING, public_key_info, hash_buffer, &size); + winetest_ok(ret, "Failed to hash public key, error %#x\n", GetLastError()); + + key_info.KeyId.cbData = size; + key_info.KeyId.pbData = hash_buffer; + + RtlGenRandom(serial, sizeof(serial)); + key_info.CertSerialNumber.cbData = sizeof(serial); + key_info.CertSerialNumber.pbData = serial; + + size = sizeof(encoded_key_id); + ret = CryptEncodeObject(X509_ASN_ENCODING, X509_AUTHORITY_KEY_ID, &key_info, encoded_key_id, &size); + winetest_ok(ret, "Failed to convert name, error %#x\n", GetLastError()); + + extension.pszObjId = (char *)szOID_AUTHORITY_KEY_IDENTIFIER; + extension.fCritical = TRUE; + extension.Value.cbData = size; + extension.Value.pbData = encoded_key_id; + + cert_info.dwVersion = CERT_V3; + cert_info.SerialNumber = key_info.CertSerialNumber; + cert_info.SignatureAlgorithm.pszObjId = (char *)szOID_RSA_SHA1RSA; + cert_info.Issuer = key_info.CertIssuer; + GetSystemTimeAsFileTime(&cert_info.NotBefore); + GetSystemTimeAsFileTime(&cert_info.NotAfter); + cert_info.NotAfter.dwHighDateTime += 1; + cert_info.Subject = key_info.CertIssuer; + cert_info.cExtension = 1; + cert_info.rgExtension = &extension; + algid.pszObjId = (char *)szOID_RSA_SHA1RSA; + size = sizeof(cert_buffer); + ret = CryptSignAndEncodeCertificate(ctx->provider, AT_SIGNATURE, X509_ASN_ENCODING, + X509_CERT_TO_BE_SIGNED, &cert_info, &algid, NULL, cert_buffer, &size); + winetest_ok(ret, "Failed to create certificate, error %#x\n", GetLastError()); + + ctx->cert = CertCreateCertificateContext(X509_ASN_ENCODING, cert_buffer, size); + winetest_ok(!!ctx->cert, "Failed to create context, error %#x\n", GetLastError()); + + size = sizeof(provider_nameA); + ret = CryptGetProvParam(ctx->provider, PP_NAME, provider_nameA, &size, 0); + winetest_ok(ret, "Failed to get prov param, error %#x\n", GetLastError()); + MultiByteToWideChar(CP_ACP, 0, (char *)provider_nameA, -1, provider_nameW, ARRAY_SIZE(provider_nameW)); + + provider_info.pwszContainerName = (WCHAR *)container_name; + provider_info.pwszProvName = provider_nameW; + provider_info.dwProvType = PROV_RSA_FULL; + provider_info.dwKeySpec = AT_SIGNATURE; + ret = CertSetCertificateContextProperty(ctx->cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &provider_info); + winetest_ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); + + ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + winetest_skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + winetest_ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + winetest_ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } + winetest_ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); + ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + winetest_skip("Failed to add self-signed certificate to store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + winetest_ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); + winetest_ok(ret, "Failed to close store, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + winetest_ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } + winetest_ok(ret, "Failed to add certificate, error %u\n", GetLastError()); + + ctx->publisher_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, + CERT_SYSTEM_STORE_LOCAL_MACHINE, "trustedpublisher"); + winetest_ok(!!ctx->publisher_store, "Failed to open store, error %u\n", GetLastError()); + ret = CertAddCertificateContextToStore(ctx->publisher_store, ctx->cert, + CERT_STORE_ADD_ALWAYS, &ctx->publisher_cert); + winetest_ok(ret, "Failed to add certificate, error %u\n", GetLastError()); + + return TRUE; +} + +static void testsign_cleanup(struct testsign_context *ctx) +{ + BOOL ret; + + ret = CertFreeCertificateContext(ctx->cert); + winetest_ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + + ret = CertDeleteCertificateFromStore(ctx->root_cert); + winetest_ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); + winetest_ok(ret, "Failed to close store, error %u\n", GetLastError()); + + ret = CertDeleteCertificateFromStore(ctx->publisher_cert); + winetest_ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); + winetest_ok(ret, "Failed to close store, error %u\n", GetLastError()); + + ret = CryptReleaseContext(ctx->provider, 0); + winetest_ok(ret, "failed to release context, error %u\n", GetLastError()); +} + +#define testsign_sign (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : testsign_sign_ +static void testsign_sign_(struct testsign_context *ctx, const WCHAR *filename) +{ + SIGNER_ATTR_AUTHCODE authcode = {sizeof(authcode)}; + SIGNER_SIGNATURE_INFO signature = {sizeof(signature)}; + SIGNER_SUBJECT_INFO subject = {sizeof(subject)}; + SIGNER_CERT_STORE_INFO store = {sizeof(store)}; + SIGNER_CERT cert_info = {sizeof(cert_info)}; + SIGNER_FILE_INFO file = {sizeof(file)}; + DWORD index = 0; + HRESULT hr; + + subject.dwSubjectChoice = 1; + subject.pdwIndex = &index; + subject.pSignerFileInfo = &file; + file.pwszFileName = (WCHAR *)filename; + cert_info.dwCertChoice = 2; + cert_info.pCertStoreInfo = &store; + store.pSigningCert = ctx->cert; + store.dwCertPolicy = 0; + signature.algidHash = CALG_SHA_256; + signature.dwAttrChoice = SIGNER_AUTHCODE_ATTR; + signature.pAttrAuthcode = &authcode; + authcode.pwszName = L""; + authcode.pwszInfo = L""; + hr = pSignerSign(&subject, &cert_info, &signature, NULL, NULL, NULL, NULL); + todo_wine winetest_ok(hr == S_OK || broken(hr == NTE_BAD_ALGID) /* < 7 */, "Failed to sign, hr %#x\n", hr); +} + +#define unload_driver (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : unload_driver_ +static void unload_driver_(SC_HANDLE service) +{ + SERVICE_STATUS status; + + ControlService(service, SERVICE_CONTROL_STOP, &status); + while (status.dwCurrentState == SERVICE_STOP_PENDING) + { + BOOL ret; + Sleep(100); + ret = QueryServiceStatus(service, &status); + winetest_ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + } + winetest_ok(status.dwCurrentState == SERVICE_STOPPED, + "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); + + DeleteService(service); + CloseServiceHandle(service); +} + +static HANDLE okfile; + +static void cat_okfile(void) +{ + char buffer[512]; + DWORD size; + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + + do + { + ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); + printf("%.*s", size, buffer); + } while (size == sizeof(buffer)); + + SetFilePointer(okfile, 0, NULL, FILE_BEGIN); + SetEndOfFile(okfile); + + winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); +} + +#ifdef __i386__ +#define EXT "x86" +#elif defined(__x86_64__) +#define EXT "amd64" +#elif defined(__arm__) +#define EXT "arm" +#elif defined(__aarch64__) +#define EXT "arm64" +#else +#define EXT +#endif + +static const char inf_text[] = + "[Version]\n" + "Signature=$Chicago$\n" + "ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318}\n" + "CatalogFile=winetest.cat\n" + "DriverVer=09/21/2006,6.0.5736.1\n" + + "[Manufacturer]\n" + "Wine=mfg_section,NT" EXT "\n" + + "[mfg_section.NT" EXT "]\n" + "Wine test root driver=device_section,test_hardware_id\n" + + "[device_section.NT" EXT "]\n" + "CopyFiles=file_section\n" + + "[device_section.NT" EXT ".Services]\n" + "AddService=winetest,0x2,svc_section\n" + + "[file_section]\n" + "winetest.sys\n" + + "[SourceDisksFiles]\n" + "winetest.sys=1\n" + + "[SourceDisksNames]\n" + "1=,winetest.sys\n" + + "[DestinationDirs]\n" + "DefaultDestDir=12\n" + + "[svc_section]\n" + "ServiceBinary=%12%\\winetest.sys\n" + "ServiceType=1\n" + "StartType=3\n" + "ErrorControl=1\n" + "LoadOrderGroup=Extended Base\n" + "DisplayName=\"winetest bus driver\"\n" + "; they don't sleep anymore, on the beach\n"; + +static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) +{ + SIP_SUBJECTINFO subject_info = {sizeof(SIP_SUBJECTINFO)}; + SIP_INDIRECT_DATA *indirect_data; + const WCHAR *filepart = file; + CRYPTCATMEMBER *member; + WCHAR hash_buffer[100]; + GUID subject_guid; + unsigned int i; + DWORD size; + BOOL ret; + + ret = CryptSIPRetrieveSubjectGuidForCatalogFile(file, NULL, &subject_guid); + todo_wine winetest_ok(ret, "Failed to get subject guid, error %u\n", GetLastError()); + + size = 0; + subject_info.pgSubjectType = &subject_guid; + subject_info.pwsFileName = file; + subject_info.DigestAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + subject_info.dwFlags = SPC_INC_PE_RESOURCES_FLAG | SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG | SPC_EXC_PE_PAGE_HASHES_FLAG | 0x10000; + ret = CryptSIPCreateIndirectData(&subject_info, &size, NULL); + todo_wine winetest_ok(ret, "Failed to get indirect data size, error %u\n", GetLastError()); + + indirect_data = malloc(size); + ret = CryptSIPCreateIndirectData(&subject_info, &size, indirect_data); + todo_wine winetest_ok(ret, "Failed to get indirect data, error %u\n", GetLastError()); + if (ret) + { + memset(hash_buffer, 0, sizeof(hash_buffer)); + for (i = 0; i < indirect_data->Digest.cbData; ++i) + swprintf(&hash_buffer[i * 2], 2, L"%02X", indirect_data->Digest.pbData[i]); + + member = CryptCATPutMemberInfo(catalog, (WCHAR *)file, + hash_buffer, &subject_guid, 0, size, (BYTE *)indirect_data); + winetest_ok(!!member, "Failed to write member, error %u\n", GetLastError()); + + if (wcsrchr(file, '\\')) + filepart = wcsrchr(file, '\\') + 1; + + ret = !!CryptCATPutAttrInfo(catalog, member, (WCHAR *)L"File", + CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, + (wcslen(filepart) + 1) * 2, (BYTE *)filepart); + winetest_ok(ret, "Failed to write attr, error %u\n", GetLastError()); + + ret = !!CryptCATPutAttrInfo(catalog, member, (WCHAR *)L"OSAttr", + CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, + sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); + winetest_ok(ret, "Failed to write attr, error %u\n", GetLastError()); + } +} + +typedef void (*driver_test_callback)(void *); + +#define run_driver_test (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : run_driver_test_ +static void run_driver_test_(struct testsign_context *ctx, const WCHAR *name, + driver_test_callback callback, void *args) +{ + static const char hardware_id[] = "test_hardware_id\0"; + char path[MAX_PATH], dest[MAX_PATH], *filepart; + SP_DEVINFO_DATA device = {sizeof(device)}; + char cwd[MAX_PATH], tempdir[MAX_PATH]; + WCHAR driver_filename[MAX_PATH]; + SC_HANDLE manager, service; + BOOL ret, need_reboot; + HANDLE catalog, file; + HDEVINFO set; + FILE *f; + + GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); + GetTempPathA(ARRAY_SIZE(tempdir), tempdir); + SetCurrentDirectoryA(tempdir); + + load_resource_(name, driver_filename); + ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); + winetest_ok(ret, "failed to move file, error %u\n", GetLastError()); + + f = fopen("winetest.inf", "w"); + winetest_ok(!!f, "failed to open winetest.inf: %s\n", strerror(errno)); + fputs(inf_text, f); + fclose(f); + + /* Create the catalog file. */ + + catalog = CryptCATOpen((WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0); + winetest_ok(catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %#x\n", GetLastError()); + + add_file_to_catalog(catalog, L"winetest.sys"); + add_file_to_catalog(catalog, L"winetest.inf"); + + ret = CryptCATPersistStore(catalog); + todo_wine winetest_ok(ret, "Failed to write catalog, error %u\n", GetLastError()); + + ret = CryptCATClose(catalog); + winetest_ok(ret, "Failed to close catalog, error %u\n", GetLastError()); + + testsign_sign_(ctx, L"winetest.cat"); + + /* Install the driver. */ + + set = SetupDiCreateDeviceInfoList(NULL, NULL); + winetest_ok(set != INVALID_HANDLE_VALUE, "failed to create device list, error %#x\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device); + winetest_ok(ret, "failed to create device, error %#x\n", GetLastError()); + + ret = SetupDiSetDeviceRegistryPropertyA( set, &device, SPDRP_HARDWAREID, + (const BYTE *)hardware_id, sizeof(hardware_id) ); + winetest_ok(ret, "failed to create set hardware ID, error %#x\n", GetLastError()); + + ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); + winetest_ok(ret, "failed to register device, error %#x\n", GetLastError()); + + GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); + ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); + winetest_ok(ret, "failed to install device, error %#x\n", GetLastError()); + winetest_ok(!need_reboot, "expected no reboot necessary\n"); + + /* Check that the service is created and started. */ + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + winetest_ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); + service = OpenServiceA(manager, "winetest", SERVICE_START | SERVICE_STOP | DELETE); + winetest_ok(!!service, "failed to open service, error %u\n", GetLastError()); + + ret = StartServiceA(service, 0, NULL); + winetest_ok(!ret, "service didn't start automatically\n"); + if (ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) + callback(args); + else + { + /* If Secure Boot is enabled or the machine is 64-bit, it will reject an unsigned driver. */ + winetest_ok(GetLastError() == ERROR_DRIVER_BLOCKED || GetLastError() == ERROR_INVALID_IMAGE_HASH, + "unexpected error %u\n", GetLastError()); + winetest_skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n"); + } + + ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); + winetest_ok(ret, "failed to remove device, error %#x\n", GetLastError()); + + file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + winetest_ok(file == INVALID_HANDLE_VALUE, "expected failure\n"); + winetest_ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + ret = SetupDiDestroyDeviceInfoList(set); + winetest_ok(ret, "failed to destroy set, error %#x\n", GetLastError()); + + /* Windows stops the service but does not delete it. */ + unload_driver_(service); + CloseServiceHandle(manager); + + cat_okfile(); + + GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); + ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); + winetest_ok(ret, "Failed to copy INF, error %#x\n", GetLastError()); + ret = SetupUninstallOEMInfA(filepart, 0, NULL); + winetest_ok(ret, "Failed to uninstall INF, error %u\n", GetLastError()); + + ret = DeleteFileA("winetest.cat"); + winetest_ok(ret, "Failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA("winetest.inf"); + winetest_ok(ret, "Failed to delete file, error %u\n", GetLastError()); + ret = DeleteFileA("winetest.sys"); + winetest_ok(ret, "Failed to delete file, error %u\n", GetLastError()); + /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ + ret = DeleteFileA("C:/windows/system32/drivers/winetest.sys"); + winetest_ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %u\n", GetLastError()); + + SetCurrentDirectoryA(cwd); +} + +#define driver_test_init(a) driver_test_init_(__FILE__, __LINE__, a) +static BOOL driver_test_init_(char const *file, int line, struct testsign_context *ctx) +{ + BOOL is_wow64; + + winetest_set_location(file, line); + + pSignerSign = (void *)GetProcAddress(LoadLibraryA("mssign32"), "SignerSign"); + + if (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64) + { + winetest_skip("Running in WoW64.\n"); + return FALSE; + } + + if (!testsign_create_cert(ctx)) + return FALSE; + + test_data_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, + 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); + winetest_ok(!!test_data_mapping, "got error %u\n", GetLastError()); + test_data = MapViewOfFile(test_data_mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + test_data->running_under_wine = !strcmp(winetest_platform, "wine"); + test_data->winetest_report_success = winetest_report_success; + test_data->winetest_debug = winetest_debug; + + okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + winetest_ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); + + return TRUE; +} + +#define driver_test_cleanup (winetest_set_location(__FILE__, __LINE__), 0) ? (void)0 : driver_test_cleanup_ +static void driver_test_cleanup_(struct testsign_context *ctx) +{ + testsign_cleanup(ctx); + UnmapViewOfFile(test_data); + CloseHandle(test_data_mapping); + CloseHandle(okfile); + DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); +} diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..b98c551ad4c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -44,15 +44,12 @@ #include "ddk/hidpi.h" #include "wine/test.h" #include "wine/heap.h" -#include "wine/mssign.h" - -#include "driver.h" static const GUID GUID_NULL; -static HANDLE device; +#include "driver_tests.h" -static struct test_data *test_data; +static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); @@ -63,237 +60,6 @@ static HRESULT (WINAPI *pSignerSign)(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT * SIGNER_SIGNATURE_INFO *signature, SIGNER_PROVIDER_INFO *provider, const WCHAR *timestamp, CRYPT_ATTRIBUTES *attr, void *sip_data); -static void load_resource(const WCHAR *name, WCHAR *filename) -{ - static WCHAR path[MAX_PATH]; - DWORD written; - HANDLE file; - HRSRC res; - void *ptr; - - GetTempPathW(ARRAY_SIZE(path), path); - GetTempFileNameW(path, name, 0, filename); - - file = CreateFileW(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "failed to create %s, error %u\n", debugstr_w(filename), GetLastError()); - - res = FindResourceW(NULL, name, L"TESTDLL"); - ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); - CloseHandle( file ); -} - -struct testsign_context -{ - HCRYPTPROV provider; - const CERT_CONTEXT *cert, *root_cert, *publisher_cert; - HCERTSTORE root_store, publisher_store; -}; - -static BOOL testsign_create_cert(struct testsign_context *ctx) -{ - BYTE encoded_name[100], encoded_key_id[200], public_key_info_buffer[1000]; - WCHAR container_name[26]; - BYTE hash_buffer[16], cert_buffer[1000], provider_nameA[100], serial[16]; - CERT_PUBLIC_KEY_INFO *public_key_info = (CERT_PUBLIC_KEY_INFO *)public_key_info_buffer; - CRYPT_KEY_PROV_INFO provider_info = {0}; - CRYPT_ALGORITHM_IDENTIFIER algid = {0}; - CERT_AUTHORITY_KEY_ID_INFO key_info; - CERT_INFO cert_info = {0}; - WCHAR provider_nameW[100]; - CERT_EXTENSION extension; - HCRYPTKEY key; - DWORD size; - BOOL ret; - - memset(ctx, 0, sizeof(*ctx)); - - srand(time(NULL)); - swprintf(container_name, ARRAY_SIZE(container_name), L"wine_testsign%u", rand()); - - ret = CryptAcquireContextW(&ctx->provider, container_name, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(ret, "Failed to create container, error %#x\n", GetLastError()); - - ret = CryptGenKey(ctx->provider, AT_SIGNATURE, CRYPT_EXPORTABLE, &key); - ok(ret, "Failed to create key, error %#x\n", GetLastError()); - ret = CryptDestroyKey(key); - ok(ret, "Failed to destroy key, error %#x\n", GetLastError()); - ret = CryptGetUserKey(ctx->provider, AT_SIGNATURE, &key); - ok(ret, "Failed to get user key, error %#x\n", GetLastError()); - ret = CryptDestroyKey(key); - ok(ret, "Failed to destroy key, error %#x\n", GetLastError()); - - size = sizeof(encoded_name); - ret = CertStrToNameA(X509_ASN_ENCODING, "CN=winetest_cert", CERT_X500_NAME_STR, NULL, encoded_name, &size, NULL); - ok(ret, "Failed to convert name, error %#x\n", GetLastError()); - key_info.CertIssuer.cbData = size; - key_info.CertIssuer.pbData = encoded_name; - - size = sizeof(public_key_info_buffer); - ret = CryptExportPublicKeyInfo(ctx->provider, AT_SIGNATURE, X509_ASN_ENCODING, public_key_info, &size); - ok(ret, "Failed to export public key, error %#x\n", GetLastError()); - cert_info.SubjectPublicKeyInfo = *public_key_info; - - size = sizeof(hash_buffer); - ret = CryptHashPublicKeyInfo(ctx->provider, CALG_MD5, 0, X509_ASN_ENCODING, public_key_info, hash_buffer, &size); - ok(ret, "Failed to hash public key, error %#x\n", GetLastError()); - - key_info.KeyId.cbData = size; - key_info.KeyId.pbData = hash_buffer; - - RtlGenRandom(serial, sizeof(serial)); - key_info.CertSerialNumber.cbData = sizeof(serial); - key_info.CertSerialNumber.pbData = serial; - - size = sizeof(encoded_key_id); - ret = CryptEncodeObject(X509_ASN_ENCODING, X509_AUTHORITY_KEY_ID, &key_info, encoded_key_id, &size); - ok(ret, "Failed to convert name, error %#x\n", GetLastError()); - - extension.pszObjId = (char *)szOID_AUTHORITY_KEY_IDENTIFIER; - extension.fCritical = TRUE; - extension.Value.cbData = size; - extension.Value.pbData = encoded_key_id; - - cert_info.dwVersion = CERT_V3; - cert_info.SerialNumber = key_info.CertSerialNumber; - cert_info.SignatureAlgorithm.pszObjId = (char *)szOID_RSA_SHA1RSA; - cert_info.Issuer = key_info.CertIssuer; - GetSystemTimeAsFileTime(&cert_info.NotBefore); - GetSystemTimeAsFileTime(&cert_info.NotAfter); - cert_info.NotAfter.dwHighDateTime += 1; - cert_info.Subject = key_info.CertIssuer; - cert_info.cExtension = 1; - cert_info.rgExtension = &extension; - algid.pszObjId = (char *)szOID_RSA_SHA1RSA; - size = sizeof(cert_buffer); - ret = CryptSignAndEncodeCertificate(ctx->provider, AT_SIGNATURE, X509_ASN_ENCODING, - X509_CERT_TO_BE_SIGNED, &cert_info, &algid, NULL, cert_buffer, &size); - ok(ret, "Failed to create certificate, error %#x\n", GetLastError()); - - ctx->cert = CertCreateCertificateContext(X509_ASN_ENCODING, cert_buffer, size); - ok(!!ctx->cert, "Failed to create context, error %#x\n", GetLastError()); - - size = sizeof(provider_nameA); - ret = CryptGetProvParam(ctx->provider, PP_NAME, provider_nameA, &size, 0); - ok(ret, "Failed to get prov param, error %#x\n", GetLastError()); - MultiByteToWideChar(CP_ACP, 0, (char *)provider_nameA, -1, provider_nameW, ARRAY_SIZE(provider_nameW)); - - provider_info.pwszContainerName = (WCHAR *)container_name; - provider_info.pwszProvName = provider_nameW; - provider_info.dwProvType = PROV_RSA_FULL; - provider_info.dwKeySpec = AT_SIGNATURE; - ret = CertSetCertificateContextProperty(ctx->cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &provider_info); - ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); - - ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); - if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) - { - skip("Failed to open root store.\n"); - - ret = CertFreeCertificateContext(ctx->cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); - ret = CryptReleaseContext(ctx->provider, 0); - ok(ret, "failed to release context, error %u\n", GetLastError()); - - return FALSE; - } - ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); - ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) - { - skip("Failed to add self-signed certificate to store.\n"); - - ret = CertFreeCertificateContext(ctx->cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); - ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); - ok(ret, "Failed to close store, error %u\n", GetLastError()); - ret = CryptReleaseContext(ctx->provider, 0); - ok(ret, "failed to release context, error %u\n", GetLastError()); - - return FALSE; - } - ok(ret, "Failed to add certificate, error %u\n", GetLastError()); - - ctx->publisher_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, - CERT_SYSTEM_STORE_LOCAL_MACHINE, "trustedpublisher"); - ok(!!ctx->publisher_store, "Failed to open store, error %u\n", GetLastError()); - ret = CertAddCertificateContextToStore(ctx->publisher_store, ctx->cert, - CERT_STORE_ADD_ALWAYS, &ctx->publisher_cert); - ok(ret, "Failed to add certificate, error %u\n", GetLastError()); - - return TRUE; -} - -static void testsign_cleanup(struct testsign_context *ctx) -{ - BOOL ret; - - ret = CertFreeCertificateContext(ctx->cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); - - ret = CertDeleteCertificateFromStore(ctx->root_cert); - ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); - ok(ret, "Failed to close store, error %u\n", GetLastError()); - - ret = CertDeleteCertificateFromStore(ctx->publisher_cert); - ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); - ok(ret, "Failed to close store, error %u\n", GetLastError()); - - ret = CryptReleaseContext(ctx->provider, 0); - ok(ret, "failed to release context, error %u\n", GetLastError()); -} - -static void testsign_sign(struct testsign_context *ctx, const WCHAR *filename) -{ - SIGNER_ATTR_AUTHCODE authcode = {sizeof(authcode)}; - SIGNER_SIGNATURE_INFO signature = {sizeof(signature)}; - SIGNER_SUBJECT_INFO subject = {sizeof(subject)}; - SIGNER_CERT_STORE_INFO store = {sizeof(store)}; - SIGNER_CERT cert_info = {sizeof(cert_info)}; - SIGNER_FILE_INFO file = {sizeof(file)}; - DWORD index = 0; - HRESULT hr; - - subject.dwSubjectChoice = 1; - subject.pdwIndex = &index; - subject.pSignerFileInfo = &file; - file.pwszFileName = (WCHAR *)filename; - cert_info.dwCertChoice = 2; - cert_info.pCertStoreInfo = &store; - store.pSigningCert = ctx->cert; - store.dwCertPolicy = 0; - signature.algidHash = CALG_SHA_256; - signature.dwAttrChoice = SIGNER_AUTHCODE_ATTR; - signature.pAttrAuthcode = &authcode; - authcode.pwszName = L""; - authcode.pwszInfo = L""; - hr = pSignerSign(&subject, &cert_info, &signature, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_OK || broken(hr == NTE_BAD_ALGID) /* < 7 */, "Failed to sign, hr %#x\n", hr); -} - -static void unload_driver(SC_HANDLE service) -{ - SERVICE_STATUS status; - - ControlService(service, SERVICE_CONTROL_STOP, &status); - while (status.dwCurrentState == SERVICE_STOP_PENDING) - { - BOOL ret; - Sleep(100); - ret = QueryServiceStatus(service, &status); - ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); - } - ok(status.dwCurrentState == SERVICE_STOPPED, - "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); - - DeleteService(service); - CloseServiceHandle(service); -} - static SC_HANDLE load_driver(struct testsign_context *ctx, WCHAR *filename, const WCHAR *resname, const WCHAR *driver_name) { @@ -367,28 +133,6 @@ static BOOL start_driver(HANDLE service, BOOL vista_plus) return TRUE; } -static HANDLE okfile; - -static void cat_okfile(void) -{ - char buffer[512]; - DWORD size; - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - - do - { - ReadFile(okfile, buffer, sizeof(buffer), &size, NULL); - printf("%.*s", size, buffer); - } while (size == sizeof(buffer)); - - SetFilePointer(okfile, 0, NULL, FILE_BEGIN); - SetEndOfFile(okfile); - - winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); - winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); -} - static ULONG64 modified_value; static void main_test(void) @@ -1239,109 +983,6 @@ static void test_driver_netio(struct testsign_context *ctx) cat_okfile(); } -#ifdef __i386__ -#define EXT "x86" -#elif defined(__x86_64__) -#define EXT "amd64" -#elif defined(__arm__) -#define EXT "arm" -#elif defined(__aarch64__) -#define EXT "arm64" -#else -#define EXT -#endif - -static const char inf_text[] = - "[Version]\n" - "Signature=$Chicago$\n" - "ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318}\n" - "CatalogFile=winetest.cat\n" - "DriverVer=09/21/2006,6.0.5736.1\n" - - "[Manufacturer]\n" - "Wine=mfg_section,NT" EXT "\n" - - "[mfg_section.NT" EXT "]\n" - "Wine test root driver=device_section,test_hardware_id\n" - - "[device_section.NT" EXT "]\n" - "CopyFiles=file_section\n" - - "[device_section.NT" EXT ".Services]\n" - "AddService=winetest,0x2,svc_section\n" - - "[file_section]\n" - "winetest.sys\n" - - "[SourceDisksFiles]\n" - "winetest.sys=1\n" - - "[SourceDisksNames]\n" - "1=,winetest.sys\n" - - "[DestinationDirs]\n" - "DefaultDestDir=12\n" - - "[svc_section]\n" - "ServiceBinary=%12%\\winetest.sys\n" - "ServiceType=1\n" - "StartType=3\n" - "ErrorControl=1\n" - "LoadOrderGroup=Extended Base\n" - "DisplayName=\"winetest bus driver\"\n" - "; they don't sleep anymore, on the beach\n"; - -static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) -{ - SIP_SUBJECTINFO subject_info = {sizeof(SIP_SUBJECTINFO)}; - SIP_INDIRECT_DATA *indirect_data; - const WCHAR *filepart = file; - CRYPTCATMEMBER *member; - WCHAR hash_buffer[100]; - GUID subject_guid; - unsigned int i; - DWORD size; - BOOL ret; - - ret = CryptSIPRetrieveSubjectGuidForCatalogFile(file, NULL, &subject_guid); - todo_wine ok(ret, "Failed to get subject guid, error %u\n", GetLastError()); - - size = 0; - subject_info.pgSubjectType = &subject_guid; - subject_info.pwsFileName = file; - subject_info.DigestAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; - subject_info.dwFlags = SPC_INC_PE_RESOURCES_FLAG | SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG | SPC_EXC_PE_PAGE_HASHES_FLAG | 0x10000; - ret = CryptSIPCreateIndirectData(&subject_info, &size, NULL); - todo_wine ok(ret, "Failed to get indirect data size, error %u\n", GetLastError()); - - indirect_data = malloc(size); - ret = CryptSIPCreateIndirectData(&subject_info, &size, indirect_data); - todo_wine ok(ret, "Failed to get indirect data, error %u\n", GetLastError()); - if (ret) - { - memset(hash_buffer, 0, sizeof(hash_buffer)); - for (i = 0; i < indirect_data->Digest.cbData; ++i) - swprintf(&hash_buffer[i * 2], 2, L"%02X", indirect_data->Digest.pbData[i]); - - member = CryptCATPutMemberInfo(catalog, (WCHAR *)file, - hash_buffer, &subject_guid, 0, size, (BYTE *)indirect_data); - ok(!!member, "Failed to write member, error %u\n", GetLastError()); - - if (wcsrchr(file, '\\')) - filepart = wcsrchr(file, '\\') + 1; - - ret = !!CryptCATPutAttrInfo(catalog, member, (WCHAR *)L"File", - CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, - (wcslen(filepart) + 1) * 2, (BYTE *)filepart); - ok(ret, "Failed to write attr, error %u\n", GetLastError()); - - ret = !!CryptCATPutAttrInfo(catalog, member, (WCHAR *)L"OSAttr", - CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, - sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); - ok(ret, "Failed to write attr, error %u\n", GetLastError()); - } -} - static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; static const GUID child_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc2}}; @@ -1434,7 +1075,7 @@ static void pump_messages(void) } } -static void test_pnp_devices(void) +static void test_pnp_devices(void *args) { static const char expect_hardware_id[] = "winetest_hardware\0winetest_hardware_1\0"; static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0"; @@ -1698,133 +1339,6 @@ static void test_pnp_devices(void) UnregisterClassA("ntoskrnl_test_wc", GetModuleHandleA(NULL)); } -static void test_pnp_driver(struct testsign_context *ctx) -{ - static const char hardware_id[] = "test_hardware_id\0"; - char path[MAX_PATH], dest[MAX_PATH], *filepart; - SP_DEVINFO_DATA device = {sizeof(device)}; - char cwd[MAX_PATH], tempdir[MAX_PATH]; - WCHAR driver_filename[MAX_PATH]; - SC_HANDLE manager, service; - BOOL ret, need_reboot; - HANDLE catalog, file; - unsigned int i; - HDEVINFO set; - FILE *f; - - GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); - GetTempPathA(ARRAY_SIZE(tempdir), tempdir); - SetCurrentDirectoryA(tempdir); - - load_resource(L"driver_pnp.dll", driver_filename); - ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); - ok(ret, "failed to move file, error %u\n", GetLastError()); - - f = fopen("winetest.inf", "w"); - ok(!!f, "failed to open winetest.inf: %s\n", strerror(errno)); - fputs(inf_text, f); - fclose(f); - - /* Create the catalog file. */ - - catalog = CryptCATOpen((WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0); - ok(catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %#x\n", GetLastError()); - - ret = !!CryptCATPutCatAttrInfo(catalog, (WCHAR *)L"HWID1", - CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, - sizeof(L"test_hardware_id"), (BYTE *)L"test_hardware_id"); - todo_wine ok(ret, "failed to add attribute, error %#x\n", GetLastError()); - - ret = !!CryptCATPutCatAttrInfo(catalog, (WCHAR *)L"OS", - CRYPTCAT_ATTR_NAMEASCII | CRYPTCAT_ATTR_DATAASCII | CRYPTCAT_ATTR_AUTHENTICATED, - sizeof(L"VistaX64"), (BYTE *)L"VistaX64"); - todo_wine ok(ret, "failed to add attribute, error %#x\n", GetLastError()); - - add_file_to_catalog(catalog, L"winetest.sys"); - add_file_to_catalog(catalog, L"winetest.inf"); - - ret = CryptCATPersistStore(catalog); - todo_wine ok(ret, "Failed to write catalog, error %u\n", GetLastError()); - - ret = CryptCATClose(catalog); - ok(ret, "Failed to close catalog, error %u\n", GetLastError()); - - testsign_sign(ctx, L"winetest.cat"); - - /* Install the driver. */ - - set = SetupDiCreateDeviceInfoList(NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "failed to create device list, error %#x\n", GetLastError()); - - ret = SetupDiCreateDeviceInfoA(set, "root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device); - ok(ret, "failed to create device, error %#x\n", GetLastError()); - - ret = SetupDiSetDeviceRegistryPropertyA( set, &device, SPDRP_HARDWAREID, - (const BYTE *)hardware_id, sizeof(hardware_id) ); - ok(ret, "failed to create set hardware ID, error %#x\n", GetLastError()); - - ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); - ok(ret, "failed to register device, error %#x\n", GetLastError()); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); - ok(ret, "failed to install device, error %#x\n", GetLastError()); - ok(!need_reboot, "expected no reboot necessary\n"); - - /* Tests. */ - - test_pnp_devices(); - - /* Clean up. */ - - ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); - ok(ret, "failed to remove device, error %#x\n", GetLastError()); - - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file == INVALID_HANDLE_VALUE, "expected failure\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); - - ret = SetupDiDestroyDeviceInfoList(set); - ok(ret, "failed to destroy set, error %#x\n", GetLastError()); - - set = SetupDiGetClassDevsA(NULL, "wine", NULL, DIGCF_ALLCLASSES); - ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); - - for (i = 0; SetupDiEnumDeviceInfo(set, i, &device); ++i) - { - ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); - ok(ret, "failed to remove device, error %#x\n", GetLastError()); - } - - /* Windows stops the service but does not delete it. */ - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); - ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); - service = OpenServiceA(manager, "winetest", SERVICE_STOP | DELETE); - ok(!!service, "failed to open service, error %u\n", GetLastError()); - unload_driver(service); - CloseServiceHandle(manager); - - cat_okfile(); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); - ok(ret, "Failed to copy INF, error %#x\n", GetLastError()); - ret = SetupUninstallOEMInfA(filepart, 0, NULL); - ok(ret, "Failed to uninstall INF, error %u\n", GetLastError()); - - ret = DeleteFileA("winetest.cat"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.inf"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.sys"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ - ret = DeleteFileA("C:/windows/system32/drivers/winetest.sys"); - ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %u\n", GetLastError()); - - SetCurrentDirectoryA(cwd); -} - #define check_member_(file, line, val, exp, fmt, member) \ ok_(file, line)((val).member == (exp).member, \ "got " #member " " fmt ", expected " fmt "\n", \ @@ -3131,8 +2645,16 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled HidD_FreePreparsedData(preparsed_data); } -static void test_hid_device(DWORD report_id, DWORD polled) +struct test_hid_params { + BOOL report_id; + BOOL polled; +}; + +static void test_hid_device(void *args) +{ + struct test_hid_params *params = args; + BOOL report_id = params->report_id, polled = params->polled; char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -3297,18 +2819,11 @@ static void test_hid_device(DWORD report_id, DWORD polled) static void test_hid_driver(struct testsign_context *ctx, DWORD report_id, DWORD polled) { - static const char hardware_id[] = "test_hardware_id\0"; - char path[MAX_PATH], dest[MAX_PATH], *filepart; + struct test_hid_params params = {.report_id = report_id, .polled = polled}; SP_DEVINFO_DATA device = {sizeof(device)}; char cwd[MAX_PATH], tempdir[MAX_PATH]; - WCHAR driver_filename[MAX_PATH]; - SC_HANDLE manager, service; - BOOL ret, need_reboot; - HANDLE catalog, file; LSTATUS status; - HDEVINFO set; HKEY hkey; - FILE *f; GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); GetTempPathA(ARRAY_SIZE(tempdir), tempdir); @@ -3323,94 +2838,7 @@ static void test_hid_driver(struct testsign_context *ctx, DWORD report_id, DWORD status = RegSetValueExW(hkey, L"PolledMode", 0, REG_DWORD, (void *)&polled, sizeof(polled)); ok(!status, "RegSetValueExW returned %#x\n", status); - load_resource(L"driver_hid.dll", driver_filename); - ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); - ok(ret, "failed to move file, error %u\n", GetLastError()); - - f = fopen("winetest.inf", "w"); - ok(!!f, "failed to open winetest.inf: %s\n", strerror(errno)); - fputs(inf_text, f); - fclose(f); - - /* Create the catalog file. */ - - catalog = CryptCATOpen((WCHAR *)L"winetest.cat", CRYPTCAT_OPEN_CREATENEW, 0, CRYPTCAT_VERSION_1, 0); - ok(catalog != INVALID_HANDLE_VALUE, "Failed to create catalog, error %#x\n", GetLastError()); - - add_file_to_catalog(catalog, L"winetest.sys"); - add_file_to_catalog(catalog, L"winetest.inf"); - - ret = CryptCATPersistStore(catalog); - todo_wine ok(ret, "Failed to write catalog, error %u\n", GetLastError()); - - ret = CryptCATClose(catalog); - ok(ret, "Failed to close catalog, error %u\n", GetLastError()); - - testsign_sign(ctx, L"winetest.cat"); - - /* Install the driver. */ - - set = SetupDiCreateDeviceInfoList(NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "failed to create device list, error %#x\n", GetLastError()); - - ret = SetupDiCreateDeviceInfoA(set, "root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device); - ok(ret, "failed to create device, error %#x\n", GetLastError()); - - ret = SetupDiSetDeviceRegistryPropertyA( set, &device, SPDRP_HARDWAREID, - (const BYTE *)hardware_id, sizeof(hardware_id) ); - ok(ret, "failed to create set hardware ID, error %#x\n", GetLastError()); - - ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); - ok(ret, "failed to register device, error %#x\n", GetLastError()); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); - ok(ret, "failed to install device, error %#x\n", GetLastError()); - ok(!need_reboot, "expected no reboot necessary\n"); - - /* Tests. */ - - test_hid_device(report_id, polled); - - /* Clean up. */ - - ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); - ok(ret, "failed to remove device, error %#x\n", GetLastError()); - - file = CreateFileA("\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file == INVALID_HANDLE_VALUE, "expected failure\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); - - ret = SetupDiDestroyDeviceInfoList(set); - ok(ret, "failed to destroy set, error %#x\n", GetLastError()); - - /* Windows stops the service but does not delete it. */ - manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); - ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); - service = OpenServiceA(manager, "winetest", SERVICE_STOP | DELETE); - ok(!!service, "failed to open service, error %u\n", GetLastError()); - unload_driver(service); - CloseServiceHandle(manager); - - cat_okfile(); - - GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); - ret = SetupCopyOEMInfA(path, NULL, 0, 0, dest, sizeof(dest), NULL, &filepart); - ok(ret, "Failed to copy INF, error %#x\n", GetLastError()); - ret = SetupUninstallOEMInfA(filepart, 0, NULL); - ok(ret, "Failed to uninstall INF, error %u\n", GetLastError()); - - ret = DeleteFileA("winetest.cat"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.inf"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - ret = DeleteFileA("winetest.sys"); - ok(ret, "Failed to delete file, error %u\n", GetLastError()); - /* Windows 10 apparently deletes the image in SetupUninstallOEMInf(). */ - ret = DeleteFileA("C:/windows/system32/drivers/winetest.sys"); - ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, "Failed to delete file, error %u\n", GetLastError()); - - SetCurrentDirectoryA(cwd); + run_driver_test(ctx, L"driver_hid.dll", test_hid_device, &params); } START_TEST(ntoskrnl) @@ -3418,9 +2846,8 @@ START_TEST(ntoskrnl) WCHAR filename[MAX_PATH], filename2[MAX_PATH]; struct testsign_context ctx; SC_HANDLE service, service2; - BOOL ret, is_wow64; - HANDLE mapping; DWORD written; + BOOL ret; pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlFreeUnicodeString"); @@ -3428,29 +2855,10 @@ START_TEST(ntoskrnl) pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); - pSignerSign = (void *)GetProcAddress(LoadLibraryA("mssign32"), "SignerSign"); - - if (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64) - { - skip("Running in WoW64.\n"); - return; - } - if (!testsign_create_cert(&ctx)) + if (!driver_test_init(&ctx)) return; - mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, - 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); - ok(!!mapping, "got error %u\n", GetLastError()); - test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); - test_data->running_under_wine = !strcmp(winetest_platform, "wine"); - test_data->winetest_report_success = winetest_report_success; - test_data->winetest_debug = winetest_debug; - - okfile = CreateFileA("C:\\windows\\winetest_ntoskrnl_okfile", GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); - ok(okfile != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError()); - subtest("driver"); if (!(service = load_driver(&ctx, filename, L"driver.dll", L"WineTestDriver"))) goto out; @@ -3497,7 +2905,7 @@ START_TEST(ntoskrnl) test_driver_netio(&ctx); subtest("driver_pnp"); - test_pnp_driver(&ctx); + run_driver_test(&ctx, L"driver_pnp.dll", test_pnp_devices, NULL); subtest("driver_hid"); test_hid_driver(&ctx, 0, FALSE); @@ -3506,9 +2914,5 @@ START_TEST(ntoskrnl) test_hid_driver(&ctx, 1, TRUE); out: - testsign_cleanup(&ctx); - UnmapViewOfFile(test_data); - CloseHandle(mapping); - CloseHandle(okfile); - DeleteFileA("C:\\windows\\winetest_ntoskrnl_okfile"); + driver_test_cleanup(&ctx); } -- 2.33.0

3 6

[PATCH 4/6] gdi32: Get stock objects directly from GDI_SHARED_MEMORY in GetStockObject.
by Jacek Caban 03 Sep '21

03 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 131 ++++++++++++++++++------------------------- dlls/gdi32/objects.c | 52 +++++++++++++++++ 2 files changed, 107 insertions(+), 76 deletions(-)

2 1

[PATCH v2 6/6] gdi32: Use NtGdiDeleteObjectApp instead of DeleteObject in ntgdi functions.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 12 ++++++------ dlls/gdi32/bitmap.c | 4 ++-- dlls/gdi32/clipping.c | 14 ++++++------- dlls/gdi32/dc.c | 12 ++++++------ dlls/gdi32/dib.c | 14 ++++++------- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 38 ++++++++++++++++++------------------ dlls/gdi32/dibdrv/objects.c | 8 ++++---- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/painting.c | 2 +- dlls/gdi32/path.c | 2 +- dlls/gdi32/region.c | 2 +- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ec117199a86..aa1ba0dda1e 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -488,7 +488,7 @@ BOOL CDECL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert ret = !dev->funcs->pPutImage( dev, rgn, info, &bits, &src, &dst, SRCCOPY ); if (bits.free) bits.free( &bits ); - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); done: HeapFree( GetProcessHeap(), 0, pts ); @@ -823,9 +823,9 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, NtGdiSelectBitmap(hDC2, hOldBitmap2); /* delete all temp objects */ - DeleteObject(hBitmap1); - DeleteObject(hBitmap2); - DeleteObject(hbrMask); + NtGdiDeleteObjectApp( hBitmap1 ); + NtGdiDeleteObjectApp( hBitmap2 ); + NtGdiDeleteObjectApp( hbrMask ); NtGdiDeleteObjectApp( hDC1 ); NtGdiDeleteObjectApp( hDC2 ); @@ -926,12 +926,12 @@ error: NtGdiSelectBitmap(hdcWork, oldWork); NtGdiDeleteObjectApp( hdcWork ); } - if(bmpWork) DeleteObject(bmpWork); + if(bmpWork) NtGdiDeleteObjectApp( bmpWork ); if(hdcMask) { NtGdiSelectBitmap(hdcMask, oldMask); NtGdiDeleteObjectApp( hdcMask ); } - if(bmpMask) DeleteObject(bmpMask); + if(bmpMask) NtGdiDeleteObjectApp( bmpMask ); return ret; } diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index cc9b106de0b..ad04603bf69 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -303,7 +303,7 @@ LONG WINAPI NtGdiSetBitmapBits( last_row = NtGdiCreateRectRgn( src.visrect.left, src.visrect.bottom - 1, src.visrect.left + extra_pixels, src.visrect.bottom ); NtGdiCombineRgn( clip, clip, last_row, RGN_OR ); - DeleteObject( last_row ); + NtGdiDeleteObjectApp( last_row ); } TRACE("(%p, %d, %p) %dx%d %d bpp fetched height: %d\n", @@ -354,7 +354,7 @@ LONG WINAPI NtGdiSetBitmapBits( } if (err) count = 0; - if (clip) DeleteObject( clip ); + if (clip) NtGdiDeleteObjectApp( clip ); if (src_bits.free) src_bits.free( &src_bits ); GDI_ReleaseObj( hbitmap ); return count; diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 02247f03620..e051b1c012c 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -111,7 +111,7 @@ void update_dc_clipping( DC * dc ) } else /* only one region, we don't need the total region */ { - if (dc->region) DeleteObject( dc->region ); + if (dc->region) NtGdiDeleteObjectApp( dc->region ); dc->region = 0; } physdev->funcs->pSetDeviceClipping( physdev, get_dc_region( dc )); @@ -153,7 +153,7 @@ INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN rgn, INT mode ) switch (mode) { case RGN_COPY: - if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); + if (dc->hClipRgn) NtGdiDeleteObjectApp( dc->hClipRgn ); dc->hClipRgn = 0; ret = SIMPLEREGION; break; @@ -189,7 +189,7 @@ INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN rgn, INT mode ) else ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, mode ); - if (mirrored) DeleteObject( mirrored ); + if (mirrored) NtGdiDeleteObjectApp( mirrored ); } if (ret != ERROR) update_dc_clipping( dc ); release_dc_ptr( dc ); @@ -212,7 +212,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect, /* map region to DC coordinates */ NtGdiOffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); - if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); dc->dirty = 0; dc->attr->vis_rect = *vis_rect; dc->device_rect = *device_rect; @@ -269,7 +269,7 @@ INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bott { if (!dc->hClipRgn) create_default_clip_region( dc ); ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); if (ret != ERROR) update_dc_clipping( dc ); } release_dc_ptr( dc ); @@ -299,7 +299,7 @@ INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bo else if ((rgn = CreateRectRgnIndirect( &rect ))) { ret = NtGdiCombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_AND ); - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); } if (ret != ERROR) update_dc_clipping( dc ); release_dc_ptr( dc ); @@ -476,7 +476,7 @@ INT WINAPI NtGdiSetMetaRgn( HDC hdc ) { /* the intersection becomes the new meta region */ NtGdiCombineRgn( dc->hMetaRgn, dc->hMetaRgn, dc->hClipRgn, RGN_AND ); - DeleteObject( dc->hClipRgn ); + NtGdiDeleteObjectApp( dc->hClipRgn ); dc->hClipRgn = 0; } else diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 42217681b17..d8eaa1093f3 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -164,10 +164,10 @@ DC *alloc_dc_ptr( DWORD magic ) */ static void free_dc_state( DC *dc ) { - if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); - if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); - if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); - if (dc->region) DeleteObject( dc->region ); + if (dc->hClipRgn) NtGdiDeleteObjectApp( dc->hClipRgn ); + if (dc->hMetaRgn) NtGdiDeleteObjectApp( dc->hMetaRgn ); + if (dc->hVisRgn) NtGdiDeleteObjectApp( dc->hVisRgn ); + if (dc->region) NtGdiDeleteObjectApp( dc->region ); if (dc->path) free_gdi_path( dc->path ); HeapFree( GetProcessHeap(), 0, dc->attr ); HeapFree( GetProcessHeap(), 0, dc ); @@ -403,8 +403,8 @@ static BOOL reset_dc_state( HDC hdc ) NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); NtGdiAbortPath( hdc ); - if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); - if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); + if (dc->hClipRgn) NtGdiDeleteObjectApp( dc->hClipRgn ); + if (dc->hMetaRgn) NtGdiDeleteObjectApp( dc->hMetaRgn ); dc->hClipRgn = 0; dc->hMetaRgn = 0; update_dc_clipping( dc ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index f00d5cf13e2..b504e8c1a01 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -439,7 +439,7 @@ static BOOL build_rle_bitmap( BITMAPINFO *info, struct gdi_image_bits *bits, HRG } done: - if (run) DeleteObject( run ); + if (run) NtGdiDeleteObjectApp( run ); if (bits->free) bits->free( bits ); bits->ptr = out_bits; @@ -450,8 +450,8 @@ done: return TRUE; fail: - if (run) DeleteObject( run ); - if (clip && *clip) DeleteObject( *clip ); + if (run) NtGdiDeleteObjectApp( run ); + if (clip && *clip) NtGdiDeleteObjectApp( *clip ); HeapFree( GetProcessHeap(), 0, out_bits ); return FALSE; } @@ -600,7 +600,7 @@ INT CDECL nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, done: if (src_bits.free) src_bits.free( &src_bits ); - if (clip) DeleteObject( clip ); + if (clip) NtGdiDeleteObjectApp( clip ); return ret; } @@ -756,7 +756,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, done: if (src_bits.free) src_bits.free( &src_bits ); - if (clip) DeleteObject( clip ); + if (clip) NtGdiDeleteObjectApp( clip ); GDI_ReleaseObj( hbitmap ); return result; } @@ -874,7 +874,7 @@ INT CDECL nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx done: if (src_bits.free) src_bits.free( &src_bits ); - if (clip) DeleteObject( clip ); + if (clip) NtGdiDeleteObjectApp( clip ); return lines; } @@ -1691,7 +1691,7 @@ NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY if (GetObjectType( desc->hDc ) != OBJ_MEMDC || GetObjectType( desc->hBitmap ) != OBJ_BITMAP) return STATUS_INVALID_PARAMETER; - DeleteObject( desc->hBitmap ); + NtGdiDeleteObjectApp( desc->hBitmap ); NtGdiDeleteObjectApp( desc->hDc ); return STATUS_SUCCESS; diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index dabdf01a591..86390663f29 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1034,7 +1034,7 @@ DWORD CDECL dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, free_clipped_rects( &clipped_rects ); } free_dib_info( &src_dib ); - if (tmp_rgn) DeleteObject( tmp_rgn ); + if (tmp_rgn) NtGdiDeleteObjectApp( tmp_rgn ); return ret; update_format: diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index c6f11ae6a69..9bd6dc557a5 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -375,7 +375,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, !(interior = create_polypolygon_region( points, &count, 1, WINDING, &rc ))) { HeapFree( GetProcessHeap(), 0, points ); - if (outline) DeleteObject( outline ); + if (outline) NtGdiDeleteObjectApp( outline ); return FALSE; } @@ -383,7 +383,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if (interior && !outline) { ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); interior = 0; } @@ -395,12 +395,12 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, { NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } if (outline) { if (ret) ret = pen_region( pdev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } HeapFree( GetProcessHeap(), 0, points ); return ret; @@ -428,7 +428,7 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) if (interior && !outline) { ret = brush_region( dev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); interior = 0; } @@ -460,12 +460,12 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) { NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); ret = brush_region( dev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } if (outline) { if (ret) ret = pen_region( dev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } done: @@ -1074,7 +1074,7 @@ BOOL CDECL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT add_clipped_bounds( pdev, NULL, rgn ); brush_region( pdev, rgn ); - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); return TRUE; } @@ -1156,7 +1156,7 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) if (region) { ret = pen_region( pdev, region ); - DeleteObject( region ); + NtGdiDeleteObjectApp( region ); } return ret; } @@ -1284,7 +1284,7 @@ BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, if (interior && !outline) { ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); interior = 0; } @@ -1300,12 +1300,12 @@ BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, { NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } if (outline) { if (ret) ret = pen_region( pdev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } done: @@ -1357,7 +1357,7 @@ BOOL CDECL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* count if (outline) { ret = pen_region( pdev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } done: @@ -1425,10 +1425,10 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } ret = pen_region( pdev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } else { @@ -1480,7 +1480,7 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott ellipse_width, ellipse_height ))) { HeapFree( GetProcessHeap(), 0, points ); - if (outline) DeleteObject( outline ); + if (outline) NtGdiDeleteObjectApp( outline ); return FALSE; } @@ -1488,7 +1488,7 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott if (interior && !outline) { ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); interior = 0; } @@ -1543,12 +1543,12 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott { NtGdiCombineRgn( interior, interior, outline, RGN_DIFF ); ret = brush_region( pdev, interior ); - DeleteObject( interior ); + NtGdiDeleteObjectApp( interior ); } if (outline) { if (ret) ret = pen_region( pdev, outline ); - DeleteObject( outline ); + NtGdiDeleteObjectApp( outline ); } HeapFree( GetProcessHeap(), 0, points ); return ret; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 452b2705e51..e7eff6fdd03 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1367,7 +1367,7 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P NtGdiGetRgnBox( join, &rect ); if (clip_rect_to_dib( &pdev->dib, &rect )) NtGdiCombineRgn( region, region, join, RGN_OR ); - DeleteObject( join ); + NtGdiDeleteObjectApp( join ); return; } @@ -1499,7 +1499,7 @@ static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, { segment = CreatePolygonRgn( seg_pts, 4, ALTERNATE ); NtGdiCombineRgn( total, total, segment, RGN_OR ); - DeleteObject( segment ); + NtGdiDeleteObjectApp( segment ); } face_1->start = seg_pts[0]; @@ -1583,7 +1583,7 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close else wide_line_segments( pdev, num, pts, FALSE, 0, num - 1, &pts[0], &pts[num - 1], round_cap, total ); - if (round_cap) DeleteObject( round_cap ); + if (round_cap) NtGdiDeleteObjectApp( round_cap ); return TRUE; } @@ -1702,7 +1702,7 @@ static BOOL dashed_wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOO &pts[0], &initial_point, round_cap, total ); } - if (round_cap) DeleteObject( round_cap ); + if (round_cap) NtGdiDeleteObjectApp( round_cap ); return TRUE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 792ba803257..6c5bc9ced94 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4839,7 +4839,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT dp_to_lp( dc, (POINT *)&rc, 2 ); NtGdiPatBlt( dev->hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); NtGdiSelectBrush( dev->hdc, orig ); - DeleteObject( brush ); + NtGdiDeleteObjectApp( brush ); } } @@ -4954,7 +4954,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT } NtGdiSelectPen( dev->hdc, orig ); - DeleteObject( pen ); + NtGdiDeleteObjectApp( pen ); return TRUE; } @@ -5351,7 +5351,7 @@ done: NtGdiSelectPen(hdc, hpen); hbrush = NtGdiSelectBrush(hdc, hbrush); - DeleteObject(hbrush); + NtGdiDeleteObjectApp( hbrush ); } release_dc_ptr( dc ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index c12ff98c058..70148cdcb77 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -504,7 +504,7 @@ BOOL GDI_dec_ref_count( HGDIOBJ handle ) entry_obj( entry )->deleted = 0; LeaveCriticalSection( &gdi_section ); TRACE( "executing delayed DeleteObject for %p\n", handle ); - DeleteObject( handle ); + NtGdiDeleteObjectApp( handle ); return TRUE; } } diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index acb3a95f30f..a7f06ea7df3 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -92,7 +92,7 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT { if (REGION_FrameRgn( tmp, rgn, width, height )) ret = NtGdiFillRgn( dev->hdc, tmp, brush ); - DeleteObject( tmp ); + NtGdiDeleteObjectApp( tmp ); } return ret; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index b3735f60b0b..74c972df1dd 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -721,7 +721,7 @@ BOOL WINAPI NtGdiSelectClipPath( HDC hdc, INT mode ) if ((rgn = NtGdiPathToRegion( hdc ))) { ret = NtGdiExtSelectClipRgn( hdc, rgn, mode ) != ERROR; - DeleteObject( rgn ); + NtGdiDeleteObjectApp( rgn ); } return ret; } diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4df48209de5..757efc0ac1a 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -929,7 +929,7 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA translate( pt, 4, xform ); poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); NtGdiCombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); - DeleteObject( poly_hrgn ); + NtGdiDeleteObjectApp( poly_hrgn ); } return hrgn; } -- 2.23.0

1 0

[PATCH v2 5/6] gdi32: Use internal get_stock_object in ntgdi functions.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dc.c | 20 ++++++++++---------- dlls/gdi32/dibdrv/objects.c | 8 ++++---- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdiobj.c | 23 +++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/painting.c | 2 +- dlls/gdi32/palette.c | 8 ++++---- dlls/gdi32/pen.c | 2 +- 10 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e6a846c3d74..ec117199a86 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -785,7 +785,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, return BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FRGND_ROP3(dwRop)); hbrMask = CreatePatternBrush(hbmMask); - hbrDst = NtGdiSelectBrush(hdcDest, GetStockObject(NULL_BRUSH)); + hbrDst = NtGdiSelectBrush( hdcDest, get_stock_object(NULL_BRUSH) ); /* make bitmap */ hDC1 = NtGdiCreateCompatibleDC( hdcDest ); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 1ce0e940235..cc9b106de0b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -387,7 +387,7 @@ HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) goto done; } - if (handle != GetStockObject(DEFAULT_BITMAP) && GDI_get_ref_count( handle )) + if (handle != get_stock_object( DEFAULT_BITMAP ) && GDI_get_ref_count( handle )) { WARN( "Bitmap already selected in another DC\n" ); GDI_ReleaseObj( handle ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 739dc53d31d..42217681b17 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -133,10 +133,10 @@ DC *alloc_dc_ptr( DWORD magic ) dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; - dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); - dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); - dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); - dc->hPalette = GetStockObject( DEFAULT_PALETTE ); + dc->hPen = GDI_inc_ref_count( get_stock_object( BLACK_PEN )); + dc->hBrush = GDI_inc_ref_count( get_stock_object( WHITE_BRUSH )); + dc->hFont = GDI_inc_ref_count( get_stock_object( SYSTEM_FONT )); + dc->hPalette = get_stock_object( DEFAULT_PALETTE ); set_initial_dc_state( dc ); @@ -395,11 +395,11 @@ static BOOL reset_dc_state( HDC hdc ) set_initial_dc_state( dc ); set_bk_color( dc, RGB( 255, 255, 255 )); set_text_color( dc, RGB( 0, 0, 0 )); - NtGdiSelectBrush( hdc, GetStockObject( WHITE_BRUSH )); - NtGdiSelectFont( hdc, GetStockObject( SYSTEM_FONT )); - NtGdiSelectPen( hdc, GetStockObject( BLACK_PEN )); + NtGdiSelectBrush( hdc, get_stock_object( WHITE_BRUSH )); + NtGdiSelectFont( hdc, get_stock_object( SYSTEM_FONT )); + NtGdiSelectPen( hdc, get_stock_object( BLACK_PEN )); NtGdiSetVirtualResolution( hdc, 0, 0, 0, 0 ); - GDISelectPalette( hdc, GetStockObject( DEFAULT_PALETTE ), FALSE ); + GDISelectPalette( hdc, get_stock_object( DEFAULT_PALETTE ), FALSE ); NtGdiSetBoundsRect( hdc, NULL, DCB_DISABLE ); NtGdiAbortPath( hdc ); @@ -659,7 +659,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( NTGDI_OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + dc->hBitmap = GDI_inc_ref_count( get_stock_object( DEFAULT_BITMAP )); TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); @@ -727,7 +727,7 @@ HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) TRACE("(%p): returning %p\n", hdc, dc->hSelf ); - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + dc->hBitmap = GDI_inc_ref_count( get_stock_object( DEFAULT_BITMAP )); dc->attr->vis_rect.left = 0; dc->attr->vis_rect.top = 0; dc->attr->vis_rect.right = 1; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4e24de0b3aa..452b2705e51 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1770,7 +1770,7 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); - if (dc->hPen == GetStockObject( DC_PEN )) + if (dc->hPen == get_stock_object( DC_PEN )) pdev->pen_brush.colorref = color; return color; @@ -2136,7 +2136,7 @@ HBRUSH CDECL dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_ GetObjectW( hbrush, sizeof(logbrush), &logbrush ); - if (hbrush == GetStockObject( DC_BRUSH )) + if (hbrush == get_stock_object( DC_BRUSH )) logbrush.lbColor = dc->attr->brush_color; select_brush( pdev, &pdev->brush, &logbrush, pattern, TRUE ); @@ -2188,7 +2188,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); - if (hpen == GetStockObject( DC_PEN )) + if (hpen == get_stock_object( DC_PEN )) logbrush.lbColor = dc->attr->pen_color; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); @@ -2256,7 +2256,7 @@ COLORREF CDECL dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); - if (dc->hBrush == GetStockObject( DC_BRUSH )) + if (dc->hBrush == get_stock_object( DC_BRUSH )) { LOGBRUSH logbrush = { BS_SOLID, color, 0 }; select_brush( pdev, &pdev->brush, &logbrush, NULL, TRUE ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1bbab661c95..792ba803257 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5289,7 +5289,7 @@ done: UINT size = NtGdiGetOutlineTextMetricsInternalW( hdc, 0, NULL, 0 ); OUTLINETEXTMETRICW* otm = NULL; POINT pts[5]; - HPEN hpen = NtGdiSelectPen(hdc, GetStockObject(NULL_PEN)); + HPEN hpen = NtGdiSelectPen( hdc, get_stock_object(NULL_PEN) ); HBRUSH hbrush = CreateSolidBrush( dc->attr->text_color ); hbrush = NtGdiSelectBrush(hdc, hbrush); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 50c337cd6c4..c12ff98c058 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -610,6 +610,29 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } +HGDIOBJ get_stock_object( INT obj ) +{ + assert( obj >= 0 && obj <= STOCK_LAST + 1 && obj != 9 ); + + switch (obj) + { + case OEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = 9; + break; + case SYSTEM_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 2; + break; + case SYSTEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 3; + break; + case DEFAULT_GUI_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 4; + break; + } + + return entry_to_handle( handle_entry( ULongToHandle( obj + FIRST_GDI_HANDLE ))); +} + static void init_stock_objects(void) { const struct DefaultFontInfo *deffonts; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 73870fcd2f8..ec3db21a2bd 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -403,6 +403,7 @@ extern HGDIOBJ GDI_inc_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern DWORD get_dpi(void) DECLSPEC_HIDDEN; extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; +extern HGDIOBJ get_stock_object( INT obj ) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1ab977595f8..acb3a95f30f 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -100,7 +100,7 @@ BOOL CDECL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT BOOL CDECL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) { INT prev_rop = SetROP2( dev->hdc, R2_NOT ); - BOOL ret = NtGdiFillRgn( dev->hdc, rgn, GetStockObject(BLACK_BRUSH) ); + BOOL ret = NtGdiFillRgn( dev->hdc, rgn, get_stock_object(BLACK_BRUSH) ); SetROP2( dev->hdc, prev_rop ); return ret; } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 0451adbdf80..a14ba9aeb08 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -202,7 +202,7 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, TRACE("hpal=%p,start=%i,count=%i\n",hpalette,start,count ); hpalette = get_full_gdi_handle( hpalette ); - if (hpalette == GetStockObject(DEFAULT_PALETTE)) return 0; + if (hpalette == get_stock_object(DEFAULT_PALETTE)) return 0; palPtr = GDI_GetObjPtr( hpalette, NTGDI_OBJ_PAL ); if (!palPtr) return 0; @@ -255,7 +255,7 @@ static BOOL animate_palette( HPALETTE hPal, UINT StartIndex, UINT NumEntries, TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); hPal = get_full_gdi_handle( hPal ); - if( hPal != GetStockObject(DEFAULT_PALETTE) ) + if( hPal != get_stock_object(DEFAULT_PALETTE) ) { PALETTEOBJ * palPtr; UINT pal_entries; @@ -412,7 +412,7 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) PALETTEENTRY entry; HPALETTE hpal = dc->hPalette; - if (!hpal) hpal = GetStockObject( DEFAULT_PALETTE ); + if (!hpal) hpal = get_stock_object( DEFAULT_PALETTE ); if (spec_type == 2) /* PALETTERGB */ index = NtGdiGetNearestPaletteIndex( hpal, color ); else /* PALETTEINDEX */ @@ -549,7 +549,7 @@ UINT WINAPI GDIRealizePalette( HDC hdc ) TRACE("%p...\n", hdc ); - if( dc->hPalette == GetStockObject( DEFAULT_PALETTE )) + if( dc->hPalette == get_stock_object( DEFAULT_PALETTE )) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizeDefaultPalette ); realized = physdev->funcs->pRealizeDefaultPalette( physdev ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index f79eaca4185..fa8b138229e 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -92,7 +92,7 @@ HPEN create_pen( INT style, INT width, COLORREF color ) HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) { if (brush) FIXME( "brush not supported\n" ); - if (style == PS_NULL) return GetStockObject( NULL_PEN ); + if (style == PS_NULL) return get_stock_object( NULL_PEN ); return create_pen( style, width, color ); } -- 2.23.0

1 0

[PATCH v2 4/6] gdi32: Get stock objects directly from GDI_SHARED_MEMORY in GetStockObject.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 131 ++++++++++++++++++------------------------- dlls/gdi32/objects.c | 52 +++++++++++++++++ 2 files changed, 107 insertions(+), 76 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index ffb42ab88e2..50c337cd6c4 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -82,13 +82,6 @@ static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -/* reserve one extra entry for the stock default bitmap */ -/* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) - -static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; -static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; - static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -617,14 +610,62 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } -static HGDIOBJ make_stock_object( HGDIOBJ obj ) +static void init_stock_objects(void) { - GDI_HANDLE_ENTRY *entry; + const struct DefaultFontInfo *deffonts; + unsigned int i; + HGDIOBJ obj; + + /* Create stock objects in order matching stock object macros, + * so that they use predictable handle slots. Our GetStockObject + * depends on it. */ + create_brush( &WhiteBrush ); + create_brush( &LtGrayBrush ); + create_brush( &GrayBrush ); + create_brush( &DkGrayBrush ); + create_brush( &BlackBrush ); + create_brush( &NullBrush ); + + create_pen( PS_SOLID, 0, RGB(255,255,255) ); + create_pen( PS_SOLID, 0, RGB(0,0,0) ); + create_pen( PS_NULL, 0, RGB(0,0,0) ); + + /* slot 9 is not used for non-scaled stock objects */ + create_scaled_font( &OEMFixedFont ); + + /* language-independent stock fonts */ + create_font( &OEMFixedFont ); + create_font( &AnsiFixedFont ); + create_font( &AnsiVarFont ); + + /* language-dependent stock fonts */ + deffonts = get_default_fonts(get_default_charset()); + create_font( &deffonts->SystemFont ); + create_font( &deffonts->DeviceDefaultFont ); + + PALETTE_Init(); + + create_font( &deffonts->SystemFixedFont ); + create_font( &deffonts->DefaultGuiFont ); - if (!(entry = handle_entry( obj ))) return 0; - entry_obj( entry )->system = TRUE; - entry->StockFlag = 1; - return entry_to_handle( entry ); + create_brush( &DCBrush ); + NtGdiCreatePen( PS_SOLID, 0, RGB(0,0,0), NULL ); + + obj = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); + + assert( (HandleToULong( obj ) & 0xffff) == FIRST_GDI_HANDLE + DEFAULT_BITMAP ); + + create_scaled_font( &deffonts->SystemFont ); + create_scaled_font( &deffonts->SystemFixedFont ); + create_scaled_font( &deffonts->DefaultGuiFont ); + + /* clear the NOSYSTEM bit on all stock objects*/ + for (i = 0; i < STOCK_LAST + 5; i++) + { + GDI_HANDLE_ENTRY *entry = &gdi_shared.Handles[FIRST_GDI_HANDLE + i]; + entry_obj( entry )->system = TRUE; + entry->StockFlag = 1; + } } /*********************************************************************** @@ -634,57 +675,13 @@ static HGDIOBJ make_stock_object( HGDIOBJ obj ) */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { - const struct DefaultFontInfo* deffonts; - int i; - if (reason != DLL_PROCESS_ATTACH) return TRUE; gdi32_module = inst; DisableThreadLibraryCalls( inst ); set_gdi_shared(); font_init(); - - /* create stock objects */ - stock_objects[WHITE_BRUSH] = create_brush( &WhiteBrush ); - stock_objects[LTGRAY_BRUSH] = create_brush( &LtGrayBrush ); - stock_objects[GRAY_BRUSH] = create_brush( &GrayBrush ); - stock_objects[DKGRAY_BRUSH] = create_brush( &DkGrayBrush ); - stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); - stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); - - stock_objects[WHITE_PEN] = create_pen( PS_SOLID, 0, RGB(255,255,255) ); - stock_objects[BLACK_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); - stock_objects[NULL_PEN] = create_pen( PS_NULL, 0, RGB(0,0,0) ); - - stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); - stock_objects[DEFAULT_BITMAP] = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); - - /* language-independent stock fonts */ - stock_objects[OEM_FIXED_FONT] = create_font( &OEMFixedFont ); - stock_objects[ANSI_FIXED_FONT] = create_font( &AnsiFixedFont ); - stock_objects[ANSI_VAR_FONT] = create_font( &AnsiVarFont ); - - /* language-dependent stock fonts */ - deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = create_font( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = create_font( &deffonts->DeviceDefaultFont ); - stock_objects[SYSTEM_FIXED_FONT] = create_font( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = create_font( &deffonts->DefaultGuiFont ); - - scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); - scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); - scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); - scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); - - stock_objects[DC_BRUSH] = create_brush( &DCBrush ); - stock_objects[DC_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); - - /* clear the NOSYSTEM bit on all stock objects*/ - for (i = 0; i < NB_STOCK_OBJECTS; i++) - { - stock_objects[i] = make_stock_object( stock_objects[i] ); - scaled_stock_objects[i] = make_stock_object( scaled_stock_objects[i] ); - } + init_stock_objects(); return TRUE; } @@ -960,24 +957,6 @@ BOOL WINAPI NtGdiDeleteClientObj( HGDIOBJ handle ) return TRUE; } -/*********************************************************************** - * GetStockObject (GDI32.@) - */ -HGDIOBJ WINAPI GetStockObject( INT obj ) -{ - if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; - switch (obj) - { - case OEM_FIXED_FONT: - case SYSTEM_FONT: - case SYSTEM_FIXED_FONT: - case DEFAULT_GUI_FONT: - if (get_system_dpi() != 96) return scaled_stock_objects[obj]; - break; - } - return stock_objects[obj]; -} - /*********************************************************************** * NtGdiExtGetObjectW (win32u.@) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b656c2a3f1e..5b1145c52a2 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +#define FIRST_GDI_HANDLE 32 + struct hdc_list { HDC hdc; @@ -95,6 +97,12 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) return NULL; } +static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) +{ + unsigned int idx = entry - get_gdi_shared()->Handles; + return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); +} + static DWORD get_object_type( HGDIOBJ obj ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); @@ -379,6 +387,50 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) return NtGdiGetDCObject( hdc, obj_type ); } +/****************************************************************************** + * get_system_dpi + * + * Get the system DPI, based on the DPI awareness mode. + */ +static DWORD get_system_dpi(void) +{ + static UINT (WINAPI *pGetDpiForSystem)(void); + + if (!pGetDpiForSystem) + { + HMODULE user = GetModuleHandleW( L"user32.dll" ); + if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); + } + return pGetDpiForSystem ? pGetDpiForSystem() : 96; +} + +/*********************************************************************** + * GetStockObject (GDI32.@) + */ +HGDIOBJ WINAPI GetStockObject( INT obj ) +{ + if (obj < 0 || obj > STOCK_LAST + 1 || obj == 9) return 0; + + /* Wine stores stock objects in predictable order, see init_stock_objects */ + switch (obj) + { + case OEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = 9; + break; + case SYSTEM_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 2; + break; + case SYSTEM_FIXED_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 3; + break; + case DEFAULT_GUI_FONT: + if (get_system_dpi() != 96) obj = STOCK_LAST + 4; + break; + } + + return entry_to_handle( handle_entry( ULongToHandle( obj + FIRST_GDI_HANDLE ))); +} + /*********************************************************************** * GetObjectA (GDI32.@) */ -- 2.23.0

1 0

[PATCH v2 3/6] gdi32: Use ntgdi functions to create stock objects.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 40 +++++++++++++++++++++----------------- dlls/gdi32/ntgdi_private.h | 3 +++ dlls/gdi32/palette.c | 2 +- dlls/gdi32/pen.c | 18 ++++++++++------- 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 14b65429d4a..ffb42ab88e2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -80,12 +80,7 @@ static const LOGBRUSH LtGrayBrush = { BS_SOLID, RGB(192,192,192), 0 }; static const LOGBRUSH GrayBrush = { BS_SOLID, RGB(128,128,128), 0 }; static const LOGBRUSH DkGrayBrush = { BS_SOLID, RGB(64,64,64), 0 }; -static const LOGPEN WhitePen = { PS_SOLID, { 0, 0 }, RGB(255,255,255) }; -static const LOGPEN BlackPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; - static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; -static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; /* reserve one extra entry for the stock default bitmap */ /* this is what Windows does too */ @@ -582,6 +577,15 @@ DWORD get_system_dpi(void) return pGetDpiForSystem ? pGetDpiForSystem() : 96; } +static HFONT create_font( const LOGFONTW *deffont ) +{ + ENUMLOGFONTEXDVW lf; + + memset( &lf, 0, sizeof(lf) ); + lf.elfEnumLogfontEx.elfLogFont = *deffont; + return NtGdiHfontCreate( &lf, sizeof(lf), 0, 0, NULL ); +} + static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; @@ -595,7 +599,7 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) lf = *deffont; lf.lfHeight = MulDiv( lf.lfHeight, dpi, 96 ); - return CreateFontIndirectW( &lf ); + return create_font( &lf ); } static void set_gdi_shared(void) @@ -648,24 +652,24 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); - stock_objects[WHITE_PEN] = CreatePenIndirect( &WhitePen ); - stock_objects[BLACK_PEN] = CreatePenIndirect( &BlackPen ); - stock_objects[NULL_PEN] = CreatePenIndirect( &NullPen ); + stock_objects[WHITE_PEN] = create_pen( PS_SOLID, 0, RGB(255,255,255) ); + stock_objects[BLACK_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); + stock_objects[NULL_PEN] = create_pen( PS_NULL, 0, RGB(0,0,0) ); stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); - stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DEFAULT_BITMAP] = NtGdiCreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ - stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); - stock_objects[ANSI_FIXED_FONT] = CreateFontIndirectW( &AnsiFixedFont ); - stock_objects[ANSI_VAR_FONT] = CreateFontIndirectW( &AnsiVarFont ); + stock_objects[OEM_FIXED_FONT] = create_font( &OEMFixedFont ); + stock_objects[ANSI_FIXED_FONT] = create_font( &AnsiFixedFont ); + stock_objects[ANSI_VAR_FONT] = create_font( &AnsiVarFont ); /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); - stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + stock_objects[SYSTEM_FONT] = create_font( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = create_font( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FIXED_FONT] = create_font( &deffonts->SystemFixedFont ); + stock_objects[DEFAULT_GUI_FONT] = create_font( &deffonts->DefaultGuiFont ); scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); @@ -673,7 +677,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = create_brush( &DCBrush ); - stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); + stock_objects[DC_PEN] = create_pen( PS_SOLID, 0, RGB(0,0,0) ); /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index a438a3f93ae..73870fcd2f8 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -453,6 +453,9 @@ extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; +/* pen.c */ +extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN; + /* region.c */ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; extern INT mirror_region( HRGN dst, HRGN src, INT width ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index aa7745dc65f..0451adbdf80 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -89,7 +89,7 @@ HPALETTE PALETTE_Init(void) palPtr->palPalEntry[i].peBlue = entries[i < 10 ? i : 236 + i].rgbBlue; palPtr->palPalEntry[i].peFlags = 0; } - return CreatePalette( palPtr ); + return NtGdiCreatePaletteInternal( palPtr, palPtr->palNumEntries ); } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index ff2a766d40c..f79eaca4185 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -50,17 +50,12 @@ static const struct gdi_obj_funcs pen_funcs = PEN_DeleteObject /* pDeleteObject */ }; - -/*********************************************************************** - * NtGdiCreatePen (win32u.@) - */ -HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) +HPEN create_pen( INT style, INT width, COLORREF color ) { PENOBJ *penPtr; HPEN hpen; TRACE( "%d %d %06x\n", style, width, color ); - if (brush) FIXME( "brush not supported\n" ); switch (style) { @@ -72,7 +67,6 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) case PS_INSIDEFRAME: break; case PS_NULL: - if ((hpen = GetStockObject( NULL_PEN ))) return hpen; width = 1; color = 0; break; @@ -92,6 +86,16 @@ HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) return hpen; } +/*********************************************************************** + * NtGdiCreatePen (win32u.@) + */ +HPEN WINAPI NtGdiCreatePen( INT style, INT width, COLORREF color, HBRUSH brush ) +{ + if (brush) FIXME( "brush not supported\n" ); + if (style == PS_NULL) return GetStockObject( NULL_PEN ); + return create_pen( style, width, color ); +} + /*********************************************************************** * NtGdiExtCreatePen (win32u.@) */ -- 2.23.0

1 0

[PATCH v2 2/6] gdi32: Use NtGdiGetDCObject for GetCurrentObject.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 3 ++- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/dib.c | 5 ++-- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 53 ++++++++++++++---------------------------- dlls/gdi32/objects.c | 26 +++++++++++++++++++++ include/ntgdi.h | 2 ++ 7 files changed, 53 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c10b9d37199..e6a846c3d74 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -866,7 +866,8 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = NtGdiCreateCompatibleDC( hdcDest ); if ((GetObjectType( hdcDest ) != OBJ_MEMDC || - GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && + GetObjectW( NtGdiGetDCObject( hdcDest, NTGDI_OBJ_SURF ), + sizeof(dib), &dib ) == sizeof(BITMAP)) && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index db6a4c44c84..1ce0e940235 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -63,7 +63,8 @@ HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) NtGdiGetDeviceCaps( hdc, PLANES ), NtGdiGetDeviceCaps( hdc, BITSPIXEL ), NULL ); - switch (NtGdiExtGetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + switch (NtGdiExtGetObjectW( NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ), + sizeof(dib), &dib )) { case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ return NtGdiCreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 68ca1c31664..f00d5cf13e2 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -253,7 +253,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; - HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); + HPALETTE palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ); int i, colors = 1 << info->bmiHeader.biBitCount; info->bmiHeader.biClrUsed = colors; @@ -284,7 +284,8 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) int i, count, colors = info->bmiHeader.biClrUsed; if (!colors) return TRUE; - if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; + if (!(palette = NtGdiGetDCObject( hdc, NTGDI_OBJ_PAL ))) + return FALSE; if (!(count = get_palette_entries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index c31845d30a9..6336e3f23fe 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -534,7 +534,7 @@ static BOOL WINAPI dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) if (!osmesa_funcs) return FALSE; if (!context) return osmesa_funcs->make_current( NULL, NULL, 0, 0, 0, 0 ); - bitmap = GetCurrentObject( hdc, OBJ_BITMAP ); + bitmap = NtGdiGetDCObject( hdc, NTGDI_OBJ_SURF ); bmp = GDI_GetObjPtr( bitmap, NTGDI_OBJ_BITMAP ); if (!bmp) return FALSE; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index cc68070674a..14b65429d4a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1005,47 +1005,28 @@ INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ) } /*********************************************************************** - * GetCurrentObject (GDI32.@) + * NtGdiGetDCObject (win32u.@) * * Get the currently selected object of a given type in a device context. - * - * PARAMS - * hdc [I] Device context to get the current object from - * type [I] Type of current object to get (OBJ_* defines from "wingdi.h") - * - * RETURNS - * Success: The current object of the given type selected in hdc. - * Failure: A NULL handle. - * - * NOTES - * - only the following object types are supported: - *| OBJ_PEN - *| OBJ_BRUSH - *| OBJ_PAL - *| OBJ_FONT - *| OBJ_BITMAP */ -HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ) { HGDIOBJ ret = 0; - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return 0; - - switch (type) { - case OBJ_EXTPEN: /* fall through */ - case OBJ_PEN: ret = dc->hPen; break; - case OBJ_BRUSH: ret = dc->hBrush; break; - case OBJ_PAL: ret = dc->hPalette; break; - case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; - - /* tests show that OBJ_REGION is explicitly ignored */ - case OBJ_REGION: break; - default: - /* the SDK only mentions those above */ - FIXME("(%p,%d): unknown type.\n",hdc,type); - break; + DC *dc; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + switch (type) + { + case NTGDI_OBJ_EXTPEN: /* fall through */ + case NTGDI_OBJ_PEN: ret = dc->hPen; break; + case NTGDI_OBJ_BRUSH: ret = dc->hBrush; break; + case NTGDI_OBJ_PAL: ret = dc->hPalette; break; + case NTGDI_OBJ_FONT: ret = dc->hFont; break; + case NTGDI_OBJ_SURF: ret = dc->hBitmap; break; + default: + FIXME( "(%p, %d): unknown type.\n", hdc, type ); + break; } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b989a83daa1..b656c2a3f1e 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -353,6 +353,32 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, void *buffer ) return result; } +/*********************************************************************** + * GetCurrentObject (GDI32.@) + */ +HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) +{ + unsigned int obj_type; + + switch (type) + { + case OBJ_EXTPEN: obj_type = NTGDI_OBJ_EXTPEN; break; + case OBJ_PEN: obj_type = NTGDI_OBJ_PEN; break; + case OBJ_BRUSH: obj_type = NTGDI_OBJ_BRUSH; break; + case OBJ_PAL: obj_type = NTGDI_OBJ_PAL; break; + case OBJ_FONT: obj_type = NTGDI_OBJ_FONT; break; + case OBJ_BITMAP: obj_type = NTGDI_OBJ_SURF; break; + case OBJ_REGION: + /* tests show that OBJ_REGION is explicitly ignored */ + return 0; + default: + FIXME( "(%p,%d): unknown type.\n", hdc, type ); + return 0; + } + + return NtGdiGetDCObject( hdc, obj_type ); +} + /*********************************************************************** * GetObjectA (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 2ee70cf3971..9e07268a307 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -57,6 +57,7 @@ typedef struct _GDI_HANDLE_ENTRY #define NTGDI_OBJ_DC 0x010000 #define NTGDI_OBJ_ENHMETADC 0x210000 #define NTGDI_OBJ_REGION 0x040000 +#define NTGDI_OBJ_SURF 0x050000 #define NTGDI_OBJ_METAFILE 0x260000 #define NTGDI_OBJ_ENHMETAFILE 0x460000 #define NTGDI_OBJ_METADC 0x660000 @@ -296,6 +297,7 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WC ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); +HANDLE WINAPI NtGdiGetDCObject( HDC hdc, UINT type ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDIBitsInternal( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, void *bits, BITMAPINFO *info, UINT coloruse, -- 2.23.0

1 0

[PATCH v2 1/6] gdi32: Use shifted values for NTGDI_OBJ_* constants.
by Huw Davies 03 Sep '21

03 Sep '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 4 ++-- dlls/gdi32/gdi_private.h | 6 +++--- dlls/gdi32/gdidc.c | 4 ++-- dlls/gdi32/gdiobj.c | 24 ++++++++++++------------ dlls/gdi32/ntgdi_private.h | 8 ++++---- dlls/gdi32/objects.c | 8 ++++---- dlls/gdi32/pen.c | 4 ++-- dlls/gdi32/tests/gdiobj.c | 9 ++++++--- include/ntgdi.h | 26 +++++++++++++------------- 9 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 73b2e74174a..739dc53d31d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -47,7 +47,7 @@ static const struct gdi_obj_funcs dc_funcs = static inline DC *get_dc_obj( HDC hdc ) { - WORD type; + DWORD type; DC *dc = get_any_obj_ptr( hdc, &type ); if (!dc) return NULL; @@ -118,7 +118,7 @@ static void set_initial_dc_state( DC *dc ) /*********************************************************************** * alloc_dc_ptr */ -DC *alloc_dc_ptr( WORD magic ) +DC *alloc_dc_ptr( DWORD magic ) { DC *dc; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ce89dbc6ff5..675a2990215 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -29,16 +29,16 @@ #include "ntgdi.h" void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; -void *get_gdi_client_ptr( HGDIOBJ handle, WORD type ) DECLSPEC_HIDDEN; +void *get_gdi_client_ptr( HGDIOBJ handle, DWORD type ) DECLSPEC_HIDDEN; DC_ATTR *get_dc_attr( HDC hdc ) DECLSPEC_HIDDEN; void GDI_hdc_using_object( HGDIOBJ obj, HDC hdc, void (*delete)( HDC hdc, HGDIOBJ handle )) DECLSPEC_HIDDEN; void GDI_hdc_not_using_object( HGDIOBJ obj, HDC hdc ) DECLSPEC_HIDDEN; -static inline WORD gdi_handle_type( HGDIOBJ obj ) +static inline DWORD gdi_handle_type( HGDIOBJ obj ) { unsigned int handle = HandleToULong( obj ); - return (handle & NTGDI_HANDLE_TYPE_MASK) >> NTGDI_HANDLE_TYPE_SHIFT; + return handle & NTGDI_HANDLE_TYPE_MASK; } static inline BOOL is_meta_dc( HDC hdc ) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0f9c8ede8c9..7f1a5a9cd24 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -31,9 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); DC_ATTR *get_dc_attr( HDC hdc ) { - WORD type = gdi_handle_type( hdc ); + DWORD type = gdi_handle_type( hdc ); DC_ATTR *dc_attr; - if ((type & 0x1f) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) + if ((type & 0x1f0000) != NTGDI_OBJ_DC || !(dc_attr = get_gdi_client_ptr( hdc, 0 ))) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index ff3dd9807c2..cc68070674a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -47,7 +47,7 @@ HMODULE gdi32_module = 0; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared.Handles; - return LongToHandle( idx | (entry->Unique << 16) ); + return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) @@ -720,8 +720,8 @@ static void dump_gdi_objects( void ) else TRACE( "handle %p obj %s type %s selcount %u deleted %u\n", entry_to_handle( entry ), wine_dbgstr_longlong( entry->Object ), - gdi_obj_type( entry->ExtType ), entry_obj( entry )->selcount, - entry_obj( entry )->deleted ); + gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), + entry_obj( entry )->selcount, entry_obj( entry )->deleted ); } LeaveCriticalSection( &gdi_section ); } @@ -731,7 +731,7 @@ static void dump_gdi_objects( void ) * * Allocate a GDI handle for an object, which must have been allocated on the process heap. */ -HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gdi_obj_funcs *funcs ) +HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) { GDI_HANDLE_ENTRY *entry; HGDIOBJ ret; @@ -757,8 +757,8 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, const struct gd obj->system = 0; obj->deleted = 0; entry->Object = (UINT_PTR)obj; - entry->Type = type & 0x1f; - entry->ExtType = type; + entry->ExtType = type >> NTGDI_HANDLE_TYPE_SHIFT; + entry->Type = entry->ExtType & 0x1f; if (++entry->Generation == 0xff) entry->Generation = 1; ret = entry_to_handle( entry ); LeaveCriticalSection( &gdi_section ); @@ -781,8 +781,8 @@ void *free_gdi_handle( HGDIOBJ handle ) EnterCriticalSection( &gdi_section ); if ((entry = handle_entry( handle ))) { - TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType ), handle, - InterlockedDecrement( &debug_count ) + 1, GDI_MAX_HANDLE_COUNT ); + TRACE( "freed %s %p %u/%u\n", gdi_obj_type( entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT ), + handle, InterlockedDecrement( &debug_count ) + 1, GDI_MAX_HANDLE_COUNT ); object = entry_obj( entry ); entry->Type = 0; entry->Object = (UINT_PTR)next_free; @@ -818,7 +818,7 @@ HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) * associated with the handle. * The object must be released with GDI_ReleaseObj. */ -void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) +void *get_any_obj_ptr( HGDIOBJ handle, DWORD *type ) { void *ptr = NULL; GDI_HANDLE_ENTRY *entry; @@ -828,7 +828,7 @@ void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) if ((entry = handle_entry( handle ))) { ptr = entry_obj( entry ); - *type = entry->ExtType; + *type = entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT; } if (!ptr) LeaveCriticalSection( &gdi_section ); @@ -842,9 +842,9 @@ void *get_any_obj_ptr( HGDIOBJ handle, WORD *type ) * Return NULL if the object has the wrong type. * The object must be released with GDI_ReleaseObj. */ -void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) +void *GDI_GetObjPtr( HGDIOBJ handle, DWORD type ) { - WORD ret_type; + DWORD ret_type; void *ptr = get_any_obj_ptr( handle, &ret_type ); if (ptr && ret_type != type) { diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index c2e45ab7ce0..a438a3f93ae 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -187,7 +187,7 @@ static inline HRGN get_dc_region( DC *dc ) } /* dc.c */ -extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; +extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; @@ -390,12 +390,12 @@ extern BOOL opentype_get_properties( const void *data, size_t size, const struct extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) DECLSPEC_HIDDEN; /* gdiobj.c */ -extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, WORD type, +extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern void *GDI_GetObjPtr( HGDIOBJ, WORD ) DECLSPEC_HIDDEN; -extern void *get_any_obj_ptr( HGDIOBJ, WORD * ) DECLSPEC_HIDDEN; +extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; +extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; extern void GDI_CheckNotLock(void) DECLSPEC_HIDDEN; extern UINT GDI_get_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 96ab3271034..b989a83daa1 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -95,10 +95,10 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) return NULL; } -static WORD get_object_type( HGDIOBJ obj ) +static DWORD get_object_type( HGDIOBJ obj ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - return entry ? entry->ExtType : 0; + return entry ? entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT : 0; } void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) @@ -107,10 +107,10 @@ void set_gdi_client_ptr( HGDIOBJ obj, void *ptr ) if (entry) entry->UserPointer = (UINT_PTR)ptr; } -void *get_gdi_client_ptr( HGDIOBJ obj, WORD type ) +void *get_gdi_client_ptr( HGDIOBJ obj, DWORD type ) { GDI_HANDLE_ENTRY *entry = handle_entry( obj ); - if (!entry || (type && entry->ExtType != type) || !entry->UserPointer) + if (!entry || (type && entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT != type)) return NULL; return (void *)(UINT_PTR)entry->UserPointer; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 684cc8375d1..ff2a766d40c 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -199,7 +199,7 @@ HGDIOBJ WINAPI NtGdiSelectPen( HDC hdc, HGDIOBJ handle ) { PENOBJ *pen; HGDIOBJ ret = 0; - WORD type; + DWORD type; DC *dc; if (!(dc = get_dc_ptr( hdc ))) return 0; @@ -262,7 +262,7 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) */ static INT PEN_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { - WORD type; + DWORD type; PENOBJ *pen = get_any_obj_ptr( handle, &type ); INT ret = 0; diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 64d37e39ab6..e6efce8e552 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -389,15 +389,18 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st entry->Unique, handle >> 16); if (type != NTGDI_OBJ_MEMDC) { - ok(entry->ExtType == type, "ExtType = %x, expected %x\n", entry->ExtType, type); + ok(entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT == type, "ExtType = %x, expected %x\n", + entry->ExtType, type); } else { todo_wine - ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); + ok(entry->ExtType << NTGDI_HANDLE_TYPE_SHIFT == NTGDI_OBJ_DC, + "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); } ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); - ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); + ok(entry->Type << NTGDI_HANDLE_TYPE_SHIFT == (type & 0x1f0000), + "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count); } diff --git a/include/ntgdi.h b/include/ntgdi.h index 23247c09e4a..2ee70cf3971 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -54,21 +54,21 @@ typedef struct _GDI_HANDLE_ENTRY #define GDI_MAX_HANDLE_COUNT 0x10000 -#define NTGDI_OBJ_DC 0x01 -#define NTGDI_OBJ_ENHMETADC 0x21 -#define NTGDI_OBJ_REGION 0x04 -#define NTGDI_OBJ_METAFILE 0x26 -#define NTGDI_OBJ_ENHMETAFILE 0x46 -#define NTGDI_OBJ_METADC 0x66 -#define NTGDI_OBJ_PAL 0x08 -#define NTGDI_OBJ_BITMAP 0x09 -#define NTGDI_OBJ_FONT 0x0a -#define NTGDI_OBJ_BRUSH 0x10 -#define NTGDI_OBJ_PEN 0x30 -#define NTGDI_OBJ_EXTPEN 0x50 +#define NTGDI_OBJ_DC 0x010000 +#define NTGDI_OBJ_ENHMETADC 0x210000 +#define NTGDI_OBJ_REGION 0x040000 +#define NTGDI_OBJ_METAFILE 0x260000 +#define NTGDI_OBJ_ENHMETAFILE 0x460000 +#define NTGDI_OBJ_METADC 0x660000 +#define NTGDI_OBJ_PAL 0x080000 +#define NTGDI_OBJ_BITMAP 0x090000 +#define NTGDI_OBJ_FONT 0x0a0000 +#define NTGDI_OBJ_BRUSH 0x100000 +#define NTGDI_OBJ_PEN 0x300000 +#define NTGDI_OBJ_EXTPEN 0x500000 /* Wine extension, native uses NTGDI_OBJ_DC */ -#define NTGDI_OBJ_MEMDC 0x41 +#define NTGDI_OBJ_MEMDC 0x410000 #define NTGDI_HANDLE_TYPE_SHIFT 16 #define NTGDI_HANDLE_TYPE_MASK 0x007f0000 -- 2.23.0

1 0

[PATCH 6/6] gdi32: Use NtGdiDeleteObjectApp instead of DeleteObject in ntgdi functions.
by Jacek Caban 03 Sep '21

03 Sep '21

1 0

[PATCH 5/6] gdi32: Use internal get_stock_object in ntgdi functions.
by Jacek Caban 03 Sep '21

03 Sep '21

1 0

[PATCH 3/6] gdi32: Use ntgdi functions to create stock objects.
by Jacek Caban 03 Sep '21

03 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 40 +++++++++++++++++++++----------------- dlls/gdi32/ntgdi_private.h | 3 +++ dlls/gdi32/palette.c | 2 +- dlls/gdi32/pen.c | 18 ++++++++++------- 4 files changed, 37 insertions(+), 26 deletions(-)

1 0

[PATCH 2/6] gdi32: Use NtGdiGetDCObject for GetCurrentObject.
by Jacek Caban 03 Sep '21

03 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 3 ++- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/dib.c | 5 ++-- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdiobj.c | 53 ++++++++++++++---------------------------- dlls/gdi32/objects.c | 26 +++++++++++++++++++++ include/ntgdi.h | 2 ++ 7 files changed, 53 insertions(+), 41 deletions(-)

1 0

[PATCH 1/6] gdi32: Use shifted values for NTGDI_OBJ_* constants.
by Jacek Caban 03 Sep '21

03 Sep '21

1 0

[PATCH] riched20/tests: Check clipboard content after destroying the editor window.
by Francois Gouget 03 Sep '21

03 Sep '21

Destroying the editor window should render all the formats so they are still available after. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Iirc there's a CoUninitialize() that gets called too early so that the riched20 content is lost before it had a chance to be rendered. --- dlls/riched20/tests/editor.c | 53 ++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ab74e0ef1ab..8b193eed6e5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4743,6 +4743,36 @@ static DWORD CALLBACK test_EM_GETMODIFY_esCallback(DWORD_PTR dwCookie, return 0; } +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + static void test_EM_GETMODIFY(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -4759,6 +4789,8 @@ static void test_EM_GETMODIFY(void) CHARFORMAT2A cf2; PARAFORMAT2 pf2; EDITSTREAM es; + BOOL r; + HANDLE hclip; HFONT testFont = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | @@ -4905,7 +4937,28 @@ static void test_EM_GETMODIFY(void) ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); + /* Check that the clipboard data is still available after destroying the + * editor window. + */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"Stayin' alive"); + SendMessageA(hwndRichEdit, EM_SETSEL, 8, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + DestroyWindow(hwndRichEdit); + + r = open_clipboard(NULL); + ok(r, "OpenClipboard failed le=%u\n", GetLastError()); + + hclip = GetClipboardData(CF_TEXT); + todo_wine ok(hclip != NULL, "GetClipboardData() failed le=%u\n", GetLastError()); + if (hclip) + { + const char* str = GlobalLock(hclip); + ok(strcmp(str, "alive") == 0, "unexpected clipboard content: %s\n", str); + GlobalUnlock(hclip); + } + + CloseClipboard(); } struct exsetsel_s { -- 2.30.2

2 1

[PATCH] wininet/tests: Remove some unnecessary traces from the http test.
by Francois Gouget 03 Sep '21

03 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Saves a bit over 2kB of traces. --- dlls/wininet/tests/http.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4f3ffa89971..25c3ab327ff 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -596,11 +596,9 @@ static void InternetReadFile_test(int flags, const test_data_t *test) trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -608,18 +606,15 @@ static void InternetReadFile_test(int flags, const test_data_t *test) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, test->post_data ? "POST" : "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -633,7 +628,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -684,7 +678,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) test_status_code(hor, 0); - trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); post_data = HeapAlloc(GetProcessHeap(), 0, post_len); @@ -698,7 +691,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) else ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (flags & INTERNET_FLAG_ASYNC) { WaitForSingleObject(complete_event, INFINITE); @@ -968,22 +960,17 @@ static void InternetReadFile_chunked_test(void) trace("Starting InternetReadFile chunked test\n"); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -997,16 +984,13 @@ static void InternetReadFile_chunked_test(void) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); res = HttpSendRequestA(hor, "", -1, NULL, 0); ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); test_request_flags(hor, 0); @@ -1092,10 +1076,8 @@ static void InternetReadFileExA_test(int flags) trace("Starting InternetReadFileExA test with flags 0x%x\n",flags); reset_events(); - trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); - trace("InternetOpenA -->\n"); if (hi == 0x0) goto abort; @@ -1103,18 +1085,15 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("InternetConnectA <--\n"); hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); - trace("InternetConnectA -->\n"); if (hic == 0x0) goto abort; CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - trace("HttpOpenRequestA <--\n"); hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RELOAD, 0xdeadbead); @@ -1128,7 +1107,6 @@ static void InternetReadFileExA_test(int flags) } else { ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); } - trace("HttpOpenRequestA -->\n"); if (hor == 0x0) goto abort; @@ -1157,7 +1135,6 @@ static void InternetReadFileExA_test(int flags) else SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); - trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); rc = HttpSendRequestA(hor, "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) @@ -1166,7 +1143,6 @@ static void InternetReadFileExA_test(int flags) else ok((rc != 0) || GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED, "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); - trace("HttpSendRequestA <--\n"); if (!rc && (GetLastError() == ERROR_IO_PENDING)) { WaitForSingleObject(complete_event, INFINITE); -- 2.30.2

2 1

[PATCH] nsi/tests: Improve the error messages.
by Francois Gouget 03 Sep '21

03 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- nsi:nsi has a bunch of random failures which I have so far been unable to reproduce and the current failure messages are pretty useless, e.g. "nsi.c:355: Test failed: 7: mismatch". https://test.winehq.org/data/patterns.html#nsi:nsi The context could probably also use some more information about the current row but I'm not sure what and it should go in a separate patch anyway. --- dlls/nsi/tests/nsi.c | 132 ++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 72 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 042fe790f2c..ca5d5abce2a 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -28,9 +28,12 @@ #include "wine/nsi.h" #include "wine/test.h" -static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) + +#define expect_bounded(name,val,lo,hi) expect_bounded_(__LINE__,name,val,lo,hi) +static void expect_bounded_( int line, const char* name, ULONG64 val, ULONG64 lo, ULONG64 hi ) { - return lo <= val && val <= hi; + ok_(__FILE__, line)( lo <= val && val <= hi, "%s: %I64d not in [%I64d %I64d]\n", + name, val, lo, hi ); } static int unstable( int val ) @@ -337,25 +340,27 @@ static void test_ndis_ifinfo( void ) ok( row->TransmitLinkSpeed == dyn->xmit_speed, "mismatch\n" ); if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "mismatch\n" ); - ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "mismatch\n" ); - ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "mismatch\n" ); - ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, - dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "mismatch\n" ); - ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "mismatch\n" ); - ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "mismatch\n" ); + expect_bounded( "InOctets", row->InOctets, dyn->in_octets, dyn_2->in_octets ); + expect_bounded( "InUcastPkts", row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ); + expect_bounded( "InNUcastPkts", row->InNUcastPkts, + dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ); + expect_bounded( "InDiscards", row->InDiscards, dyn->in_discards, dyn_2->in_discards ); + expect_bounded( "InErrors", row->InErrors, dyn->in_errors, dyn_2->in_errors ); /* InUnknownProtos */ - ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "mismatch\n" ); - ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "mismatch\n" ); - ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "mismatch\n" ); - ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "mismatch\n" ); - ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "mismatch\n" ); - ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, - dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "mismatch\n" ); - ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "mismatch\n" ); - ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "mismatch\n" ); - ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "mismatch\n" ); - ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "mismatch\n" ); - ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "mismatch\n" ); + expect_bounded( "InUcastOctets", row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ); + expect_bounded( "InMulticastOctets", row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ); + expect_bounded( "InBroadcastOctets", row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ); + expect_bounded( "OutOctets", row->OutOctets, dyn->out_octets, dyn_2->out_octets ); + expect_bounded( "OutUcastPkts", row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ); + expect_bounded( "OutNUcastPkts", row->OutNUcastPkts, + dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ); + expect_bounded( "OutDiscards", row->OutDiscards, dyn->out_discards, dyn_2->out_discards ); + expect_bounded( "OutErrors", row->OutErrors, dyn->out_errors, dyn_2->out_errors ); + expect_bounded( "OutUcastOctets", row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ); + expect_bounded( "OutMulticastOctets", row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ); + expect_bounded( "OutBroadcastOctets", row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ); /* OutQLen */ winetest_pop_context(); } @@ -471,21 +476,15 @@ static void test_ip_icmpstats( int family ) err = NsiGetAllParameters( 1, mod, NSI_IP_ICMPSTATS_TABLE, NULL, 0, NULL, 0, &nsi_stats2, sizeof(nsi_stats2), NULL, 0 ); ok( !err, "got %d\n", err ); - ok( bounded( table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ), - "%d vs [%d %d]\n", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); - ok( bounded( table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ), - "%d vs [%d %d]\n", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); - ok( bounded( table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ), - "%d vs [%d %d]\n", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); - ok( bounded( table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ), - "%d vs [%d %d]\n", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); + expect_bounded( "icmpInStats.dwMsgs", table.icmpInStats.dwMsgs, nsi_stats.in_msgs, nsi_stats2.in_msgs ); + expect_bounded( "icmpInStats.dwErrors", table.icmpInStats.dwErrors, nsi_stats.in_errors, nsi_stats2.in_errors ); + expect_bounded( "icmpOutStats.dwMsgs", table.icmpOutStats.dwMsgs, nsi_stats.out_msgs, nsi_stats2.out_msgs ); + expect_bounded( "icmpOutStats.dwErrors", table.icmpOutStats.dwErrors, nsi_stats.out_errors, nsi_stats2.out_errors ); for (i = 0; i < ARRAY_SIZE(nsi_stats.in_type_counts); i++) { winetest_push_context( "%d", i ); - ok( bounded( table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ), - "%d vs [%d %d]\n", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); - ok( bounded( table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ), - "%d vs [%d %d]\n", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); + expect_bounded( "icmpInStats.rgdwTypeCount", table.icmpInStats.rgdwTypeCount[i], nsi_stats.in_type_counts[i], nsi_stats2.in_type_counts[i] ); + expect_bounded( "icmpOutStats.rgdwTypeCount", table.icmpOutStats.rgdwTypeCount[i], nsi_stats.out_type_counts[i], nsi_stats2.out_type_counts[i] ); winetest_pop_context(); } err: @@ -516,24 +515,24 @@ static void test_ip_ipstats( int family ) ok( !err, "got %x\n", err ); /* dwForwarding and dwDefaultTTL come from the compartment table */ - ok( bounded( table.dwInReceives, dyn.in_recv, dyn2.in_recv ), "mismatch\n" ); - ok( bounded( table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ), "mismatch\n" ); - ok( bounded( table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ), "mismatch\n" ); - ok( bounded( table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ), "mismatch\n" ); - ok( bounded( table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ), "mismatch\n" ); - ok( bounded( table.dwInDiscards, dyn.in_discards, dyn2.in_discards ), "mismatch\n" ); - ok( bounded( table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ), "mismatch\n" ); - ok( bounded( table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ), "mismatch\n" ); - ok( bounded( table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ), "mismatch\n" ); - ok( bounded( table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ), "mismatch\n" ); - ok( bounded( table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ), "mismatch\n" ); - ok( table.dwReasmTimeout == stat.reasm_timeout, "mismatch\n" ); - ok( bounded( table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ), "mismatch\n" ); - ok( bounded( table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ), "mismatch\n" ); - ok( bounded( table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ), "mismatch\n" ); - ok( bounded( table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ), "mismatch\n" ); - ok( bounded( table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ), "mismatch\n" ); - ok( bounded( table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ), "mismatch\n" ); + expect_bounded( "dwInReceives", table.dwInReceives, dyn.in_recv, dyn2.in_recv ); + expect_bounded( "dwInHdrErrors", table.dwInHdrErrors, dyn.in_hdr_errs, dyn2.in_hdr_errs ); + expect_bounded( "dwInAddrErrors", table.dwInAddrErrors, dyn.in_addr_errs, dyn2.in_addr_errs ); + expect_bounded( "dwForwDatagrams", table.dwForwDatagrams, dyn.fwd_dgrams, dyn2.fwd_dgrams ); + expect_bounded( "dwInUnknownProtos", table.dwInUnknownProtos, dyn.in_unk_protos, dyn2.in_unk_protos ); + expect_bounded( "dwInDiscards", table.dwInDiscards, dyn.in_discards, dyn2.in_discards ); + expect_bounded( "dwInDelivers", table.dwInDelivers, dyn.in_delivers, dyn2.in_delivers ); + expect_bounded( "dwOutRequests", table.dwOutRequests, dyn.out_reqs, dyn2.out_reqs ); + expect_bounded( "dwRoutingDiscards", table.dwRoutingDiscards, dyn.routing_discards, dyn2.routing_discards ); + expect_bounded( "dwOutDiscards", table.dwOutDiscards, dyn.out_discards, dyn2.out_discards ); + expect_bounded( "dwOutNoRoutes", table.dwOutNoRoutes, dyn.out_no_routes, dyn2.out_no_routes ); + ok( table.dwReasmTimeout == stat.reasm_timeout, "bad timeout %d != %d\n", table.dwReasmTimeout, stat.reasm_timeout ); + expect_bounded( "dwReasmReqds", table.dwReasmReqds, dyn.reasm_reqds, dyn2.reasm_reqds ); + expect_bounded( "dwReasmOks", table.dwReasmOks, dyn.reasm_oks, dyn2.reasm_oks ); + expect_bounded( "dwReasmFails", table.dwReasmFails, dyn.reasm_fails, dyn2.reasm_fails ); + expect_bounded( "dwFragOks", table.dwFragOks, dyn.frag_oks, dyn2.frag_oks ); + expect_bounded( "dwFragFails", table.dwFragFails, dyn.frag_fails, dyn2.frag_fails ); + expect_bounded( "dwFragCreates", table.dwFragCreates, dyn.frag_creates, dyn2.frag_creates ); /* dwNumIf, dwNumAddr and dwNumRoutes come from the compartment table */ err: @@ -835,21 +834,14 @@ static void test_tcp_stats( int family ) ok( unstable( table.dwActiveOpens == dyn.active_opens ), "%d vs %d\n", table.dwActiveOpens, dyn.active_opens ); ok( unstable( table.dwPassiveOpens == dyn.passive_opens ), "%d vs %d\n", table.dwPassiveOpens, dyn.passive_opens ); - ok( bounded( table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ), "%d vs [%d %d]\n", - table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); - ok( bounded( table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ), "%d vs [%d %d]\n", - table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); + expect_bounded( "dwAttemptFails", table.dwAttemptFails, dyn.attempt_fails, dyn2.attempt_fails ); + expect_bounded( "dwEstabResets", table.dwEstabResets, dyn.est_rsts, dyn2.est_rsts ); ok( unstable( table.dwCurrEstab == dyn.cur_est ), "%d vs %d\n", table.dwCurrEstab, dyn.cur_est ); - ok( bounded( table.dwInSegs, dyn.in_segs, dyn2.in_segs ), "%d vs [%I64d %I64d]\n", - table.dwInSegs, dyn.in_segs, dyn2.in_segs ); - ok( bounded( table.dwOutSegs, dyn.out_segs, dyn2.out_segs ), "%d vs [%I64d %I64d]\n", - table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); - ok( bounded( table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ), "%d vs [%d %d]\n", - table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); - ok( bounded( table.dwInErrs, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", - table.dwInErrs, dyn.in_errs, dyn2.in_errs ); - ok( bounded( table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ), "%d vs [%d %d]\n", - table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); + expect_bounded( "dwInSegs", table.dwInSegs, dyn.in_segs, dyn2.in_segs ); + expect_bounded( "dwOutSegs", table.dwOutSegs, dyn.out_segs, dyn2.out_segs ); + expect_bounded( "dwRetransSegs", table.dwRetransSegs, dyn.retrans_segs, dyn2.retrans_segs ); + expect_bounded( "dwInErrs", table.dwInErrs, dyn.in_errs, dyn2.in_errs ); + expect_bounded( "dwOutRsts", table.dwOutRsts, dyn.out_rsts, dyn2.out_rsts ); ok( unstable( table.dwNumConns == dyn.num_conns ), "%d vs %d\n", table.dwNumConns, dyn.num_conns ); winetest_pop_context(); @@ -965,14 +957,10 @@ static void test_udp_stats( int family ) &dyn2, sizeof(dyn2), NULL, 0 ); ok( !err, "got %x\n", err ); - ok( bounded( table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ), "%d vs [%I64d %I64d]\n", - table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); - ok( bounded( table.dwNoPorts, dyn.no_ports, dyn2.no_ports ), "%d vs [%d %d]\n", - table.dwNoPorts, dyn.no_ports, dyn2.no_ports); - ok( bounded( table.dwInErrors, dyn.in_errs, dyn2.in_errs ), "%d vs [%d %d]\n", - table.dwInErrors, dyn.in_errs, dyn2.in_errs ); - ok( bounded( table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ), "%d vs [%I64d %I64d]\n", - table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); + expect_bounded( "dwInDatagrams", table.dwInDatagrams, dyn.in_dgrams, dyn2.in_dgrams ); + expect_bounded( "dwNoPorts", table.dwNoPorts, dyn.no_ports, dyn2.no_ports ); + expect_bounded( "dwInErrors", table.dwInErrors, dyn.in_errs, dyn2.in_errs ); + expect_bounded( "dwOutDatagrams", table.dwOutDatagrams, dyn.out_dgrams, dyn2.out_dgrams ); ok( unstable( table.dwNumAddrs == dyn.num_addrs ), "%d %d\n", table.dwNumAddrs, dyn.num_addrs ); winetest_pop_context(); -- 2.30.2

2 1

[PATCH 1/2] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov 03 Sep '21

03 Sep '21

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EEID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 ++- dlls/winex11.drv/display.c | 13 ++++++-- dlls/winex11.drv/x11drv.h | 6 +++- dlls/winex11.drv/x11drv_main.c | 3 +- dlls/winex11.drv/xinerama.c | 4 ++- dlls/winex11.drv/xrandr.c | 58 +++++++++++++++++++++++++++++++++- 6 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..16769021aa8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,7 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +258,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +612,12 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + if(monitor->edid) { + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + RegCloseKey(hkey); + } + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +775,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +795,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..78aaf4f5a01 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,8 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRListOutputProperties) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +114,8 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRListOutputProperties); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +470,50 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static BOOL get_edid(XRROutputInfo *info, RROutput output, unsigned char **prop, unsigned long *len) +{ + BOOL prop_found = FALSE; + Atom *properties; + int i, nprops; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + *prop = NULL; + *len = 0; + + properties = pXRRListOutputProperties(gdi_display, output, &nprops); + for(i = 0; i < nprops; i++) { + + if(properties[i] == x11drv_atom(EDID)) { + prop_found = TRUE; + break; + } + } + XFree(properties); + + if(!prop_found) { + WARN("EDID property not found.\n"); + return FALSE; + } + + pXRRGetOutputProperty(gdi_display, + output, + x11drv_atom(EDID), + 0, + 128, + FALSE, + FALSE, + AnyPropertyType, + &actual_type, + &actual_format, + len, + &bytes_after, + prop + ); + return TRUE; +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1084,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid(output_info, adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1140,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid(enum_output_info, screen_resources->outputs[i], + &monitors[monitor_count].edid, &monitors[monitor_count].edid_len); monitor_count++; } @@ -1137,8 +1189,12 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for(i = 0; i < count; i++) { + XFree(monitors[i].edid); + } heap_free( monitors ); } -- 2.25.1

2 4

[PATCH v1] opengl32: Fix unexpected format PIPE_FORMAT_R8G8B8_UNORM
by Shen Fusheng 03 Sep '21

03 Sep '21

By reading the mesa source code, a value not in the enumeration is used in the mesa code to create a rendering memory. It is found that the value is derived from the result of matching using wglChoosePixel, so I modified this piece by referring to the wglChoosePixelFormat in mesa. Signed-off-by: Shen Fusheng <shenfusheng(a)uniontech.com> --- dlls/opengl32/wgl.c | 110 ++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cf46c6dfa8a..0b15c6fce89 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -453,6 +453,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) PIXELFORMATDESCRIPTOR format, best; int i, count, best_format; int bestDBuffer = -1, bestStereo = -1; + uint bestdelta = ~0U; TRACE_(wgl)( "%p %p: size %u version %u flags %u type %u color %u %u,%u,%u,%u " "accum %u depth %u stencil %u aux %u\n", @@ -473,6 +474,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) for (i = 1; i <= count; i++) { + uint delta = 0; if (!wglDescribePixelFormat( hdc, i, sizeof(format), &format )) continue; if ((ppfd->iPixelType == PFD_TYPE_COLORINDEX) != (format.iPixelType == PFD_TYPE_COLORINDEX)) @@ -512,24 +514,34 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) { if (((ppfd->dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) && ((format.dwFlags & PFD_DOUBLEBUFFER) == (ppfd->dwFlags & PFD_DOUBLEBUFFER))) - goto found; + { + delta = 0; + goto found; + } if (bestDBuffer != -1 && (format.dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) continue; } else if (!best_format) + { goto found; + } /* Stereo, see the comments above. */ if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) { if (((ppfd->dwFlags & PFD_STEREO) != bestStereo) && ((format.dwFlags & PFD_STEREO) == (ppfd->dwFlags & PFD_STEREO))) - goto found; + { + delta = 0; + goto found; + } if (bestStereo != -1 && (format.dwFlags & PFD_STEREO) != bestStereo) continue; } else if (!best_format) + { goto found; + } /* Below we will do a number of checks to select the 'best' pixelformat. * We assume the precedence cColorBits > cAlphaBits > cDepthBits > cStencilBits -> cAuxBuffers. @@ -541,74 +553,62 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (ppfd->cColorBits) { - if (((ppfd->cColorBits > best.cColorBits) && (format.cColorBits > best.cColorBits)) || - ((format.cColorBits >= ppfd->cColorBits) && (format.cColorBits < best.cColorBits))) - goto found; - - if (best.cColorBits != format.cColorBits) /* Do further checks if the format is compatible */ - { - TRACE( "color mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cColorBits && format.cColorBits) + delta += 10000; + else if (ppfd->cColorBits > format.cColorBits) + delta += 100; + else if (ppfd->cColorBits < format.cColorBits) + delta++; } + if (ppfd->cAlphaBits) { - if (((ppfd->cAlphaBits > best.cAlphaBits) && (format.cAlphaBits > best.cAlphaBits)) || - ((format.cAlphaBits >= ppfd->cAlphaBits) && (format.cAlphaBits < best.cAlphaBits))) - goto found; - - if (best.cAlphaBits != format.cAlphaBits) - { - TRACE( "alpha mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cAlphaBits && !format.cAlphaBits) + delta += 10000; + else if (ppfd->cAlphaBits > format.cAlphaBits) + delta += 100; + else if (ppfd->cAlphaBits < format.cAlphaBits) + delta++; } + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { - if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || - ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) - goto found; - - if (best.cDepthBits != format.cDepthBits) - { - TRACE( "depth mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cDepthBits && !format.cDepthBits) + delta += 10000; + else if (ppfd->cDepthBits > format.cDepthBits) + delta += 200; + else if (ppfd->cDepthBits < format.cDepthBits) + delta += 2; } + if (ppfd->cStencilBits) { - if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || - ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) - goto found; - - if (best.cStencilBits != format.cStencilBits) - { - TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cStencilBits && !format.cStencilBits) + delta += 10000; + else if (ppfd->cStencilBits > format.cStencilBits) + delta += 400; + else if (ppfd->cStencilBits < format.cStencilBits) + delta++; } + if (ppfd->cAuxBuffers) { - if (((ppfd->cAuxBuffers > best.cAuxBuffers) && (format.cAuxBuffers > best.cAuxBuffers)) || - ((format.cAuxBuffers >= ppfd->cAuxBuffers) && (format.cAuxBuffers < best.cAuxBuffers))) - goto found; - - if (best.cAuxBuffers != format.cAuxBuffers) - { - TRACE( "aux mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cAuxBuffers && !format.cAuxBuffers) + delta += 10000; + else if (ppfd->cAuxBuffers > format.cAuxBuffers) + delta += 400; + else if (ppfd->cAuxBuffers < format.cAuxBuffers) + delta++; } - if (ppfd->dwFlags & PFD_DEPTH_DONTCARE && format.cDepthBits < best.cDepthBits) - goto found; - - continue; found: - best_format = i; - best = format; - bestDBuffer = format.dwFlags & PFD_DOUBLEBUFFER; - bestStereo = format.dwFlags & PFD_STEREO; + if (delta < bestdelta) + { + best_format = i; + bestdelta = delta; + if (bestdelta == 0) + break; + } } TRACE( "returning %u\n", best_format ); -- 2.20.1

3 2

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by Aurélien Inacio 03 Sep '21

03 Sep '21

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..a1017def5b6 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -323,6 +323,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case OPENTYPE_PLATFORM_MAC: switch (encoding) { + case TT_NAME_MAC_ENCODING_KHMER: + return 0; case TT_NAME_MAC_ENCODING_ROMAN: return 10000; case TT_NAME_MAC_ENCODING_JAPANESE: -- 2.30.2

2 1

[PATCH] dbghelp: Limit module name lookup to 32 characters.
by Alistair Leslie-Hughes 03 Sep '21

03 Sep '21

When a module like ext-ms-win-kernel32-package-current-l1-1-0 is loaded, it is never matched since the Module buffer is only 32 cahracters. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c278a627d37..c7b0f59ca4c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -249,7 +249,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { - if (!wcsicmp(name, module->module.ModuleName)) return module; + if (!wcsnicmp(name, module->module.ModuleName, ARRAYSIZE(module->module.ModuleName))) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; -- 2.33.0

2 1

Re: [PATCH 1/2 v6] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi-Hoareau 03 Sep '21

03 Sep '21

I'm a bit confused, how the code is supposed to work if the generated files that are part of the repository are not committed? Le 3 sept. 2021 09:05, Dmitry Timoshkov <dmitry(a)baikal.ru> a écrit : > > Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > > > --- a/server/sock.c > > +++ b/server/sock.c > > @@ -128,12 +128,14 @@ struct poll_req > > struct async *async; > > struct iosb *iosb; > > struct timeout_user *timeout; > > + char exclusive; > > This one should probably be 'int' as well. Also, the size of the patch > could be reduced by avoiding generated parts. > > -- > Dmitry.

2 1

[PATCH 1/8] winexinput.sys: Don't set RawDeviceOk in IRP_MN_QUERY_CAPABILITIES.
by Rémi Bernon 03 Sep '21

03 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index a0b6c9bf0eb..386b4bbb228 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -220,12 +220,8 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_QUERY_CAPABILITIES: - { - DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; - caps->RawDeviceOK = 1; status = STATUS_SUCCESS; break; - } default: FIXME("code %#x, not implemented!\n", code); -- 2.33.0

1 8

[PATCH 1/4] winebus.sys: Create devices using a struct device_desc descriptor.
by Rémi Bernon 03 Sep '21

03 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 5 +-- dlls/winebus.sys/bus_iohid.c | 34 ++++++++------- dlls/winebus.sys/bus_sdl.c | 44 +++++++++---------- dlls/winebus.sys/bus_udev.c | 73 +++++++++++++++---------------- dlls/winebus.sys/main.c | 84 ++++++++++++------------------------ dlls/winebus.sys/unixlib.c | 16 +++++++ dlls/winebus.sys/unixlib.h | 22 ++++++++++ 7 files changed, 143 insertions(+), 135 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 8f36959d4e1..05f53daab3c 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -45,9 +45,8 @@ typedef struct struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ -DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, - DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const platform_vtbl *vtbl, struct unix_device *unix_device) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, const platform_vtbl *vtbl, + struct unix_device *unix_device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 9531607f16d..6256e0d7f80 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -294,25 +294,26 @@ static const platform_vtbl iohid_vtbl = static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) { + struct device_desc desc = + { + .busid = busidW, + .input = -1, + .serial = {'0','0','0','0',0}, + }; struct platform_private *private; DEVICE_OBJECT *device; - DWORD vid, pid, version, uid; CFStringRef str = NULL; - WCHAR serial_string[256]; - BOOL is_gamepad = FALSE; - - TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); - vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); - pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); - version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); + desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); + desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); + desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); - uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (str) CFStringToWSTR(str, desc.serial, ARRAY_SIZE(desc.serial)); + desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) { - ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, desc.vid, desc.pid); return; } IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); @@ -320,8 +321,8 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { - if (is_xbox_gamepad(vid, pid)) - is_gamepad = TRUE; + if (is_xbox_gamepad(desc.vid, desc.pid)) + desc.is_gamepad = TRUE; else { int axes=0, buttons=0; @@ -358,15 +359,16 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } CFRelease(element_array); } - is_gamepad = (axes == 6 && buttons >= 14); + desc.is_gamepad = (axes == 6 && buttons >= 14); } } + TRACE("dev %p, desc %s.\n", IOHIDDevice, debugstr_device_desc(&desc)); + if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; - device = bus_create_hid_device(busidW, vid, pid, -1, version, uid, str ? serial_string : NULL, - is_gamepad, &iohid_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &iohid_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else { diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e8ae69633c0..120b7a2d966 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -731,14 +731,17 @@ static BOOL set_mapped_report_from_event(DEVICE_OBJECT *device, SDL_Event *event return FALSE; } -static void try_add_device(unsigned int index) +static void sdl_add_device(unsigned int index) { - DWORD vid = 0, pid = 0, version = 0; + struct device_desc desc = + { + .busid = sdl_busidW, + .input = -1, + .serial = {'0','0','0','0',0}, + }; struct platform_private *private; DEVICE_OBJECT *device = NULL; - WCHAR serial[34] = {0}; char guid_str[34]; - BOOL is_xbox_gamepad; SDL_Joystick* joystick; SDL_JoystickID id; @@ -757,43 +760,36 @@ static void try_add_device(unsigned int index) id = pSDL_JoystickInstanceID(joystick); if (pSDL_JoystickGetProductVersion != NULL) { - vid = pSDL_JoystickGetVendor(joystick); - pid = pSDL_JoystickGetProduct(joystick); - version = pSDL_JoystickGetProductVersion(joystick); + desc.vid = pSDL_JoystickGetVendor(joystick); + desc.pid = pSDL_JoystickGetProduct(joystick); + desc.version = pSDL_JoystickGetProductVersion(joystick); } else { - vid = 0x01; - pid = pSDL_JoystickInstanceID(joystick) + 1; - version = 0; + desc.vid = 0x01; + desc.pid = pSDL_JoystickInstanceID(joystick) + 1; + desc.version = 0; } guid = pSDL_JoystickGetGUID(joystick); pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); - MultiByteToWideChar(CP_ACP, 0, guid_str, -1, serial, sizeof(guid_str)); + MultiByteToWideChar(CP_ACP, 0, guid_str, -1, desc.serial, sizeof(guid_str)); - if (controller) - { - TRACE("Found sdl game controller %i (vid %04x, pid %04x, version %u, serial %s)\n", - id, vid, pid, version, debugstr_w(serial)); - is_xbox_gamepad = TRUE; - } + if (controller) desc.is_gamepad = TRUE; else { int button_count, axis_count; - TRACE("Found sdl device %i (vid %04x, pid %04x, version %u, serial %s)\n", - id, vid, pid, version, debugstr_w(serial)); - axis_count = pSDL_JoystickNumAxes(joystick); button_count = pSDL_JoystickNumButtons(joystick); - is_xbox_gamepad = (axis_count == 6 && button_count >= 14); + desc.is_gamepad = (axis_count == 6 && button_count >= 14); } + TRACE("%s id %d, desc %s.\n", controller ? "controller" : "joystick", id, debugstr_device_desc(&desc)); + if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; - device = bus_create_hid_device(sdl_busidW, vid, pid, -1, version, index, serial, is_xbox_gamepad, - &sdl_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &sdl_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else { @@ -812,7 +808,7 @@ static void process_device_event(SDL_Event *event) TRACE_(hid_report)("Received action %x\n", event->type); if (event->type == SDL_JOYDEVICEADDED) - try_add_device(((SDL_JoyDeviceEvent*)event)->which); + sdl_add_device(((SDL_JoyDeviceEvent *)event)->which); else if (event->type == SDL_JOYDEVICEREMOVED) { id = ((SDL_JoyDeviceEvent *)event)->which; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c954e6b2128..4329e54a0b9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1014,8 +1014,7 @@ static int check_device_syspath(DEVICE_OBJECT *device, void* context) return strcmp(get_device_syspath(private->udev_device), context); } -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, DWORD *vendor_id, - DWORD *product_id, DWORD *input, DWORD *version, WCHAR **serial_number) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; @@ -1035,41 +1034,42 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) != 1 || !*buffer) continue; - if (!*serial_number) *serial_number = strdupAtoW(buffer); + if (!desc->serial[0]) MultiByteToWideChar(CP_UNIXCP, 0, buffer, -1, desc->serial, ARRAY_SIZE(desc->serial)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6)) { if (!(tmp = strstr(ptr, "/input")) || tmp >= next) continue; - if (*input == -1) sscanf(tmp, "/input%d\n", input); + if (desc->input == -1) sscanf(tmp, "/input%d\n", &desc->input); } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || *vendor_id || *product_id) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, vendor_id, product_id); + if (bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); } if (!strncmp(ptr, "PRODUCT=", 8)) { - if (*version) continue; + if (desc->version) continue; if (!strcmp(subsystem, "usb")) - sscanf(ptr, "PRODUCT=%x/%x/%x\n", vendor_id, product_id, version); + sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, vendor_id, product_id, version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); } } } } -static void try_add_device(struct udev_device *dev) +static void udev_add_device(struct udev_device *dev) { - DWORD vid = 0, pid = 0, version = 0, input = -1; + static const WCHAR base_serial[] = {'0','0','0','0',0}; + struct device_desc desc = + { + .input = -1, + }; struct platform_private *private; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; - WCHAR *serial = NULL; - BOOL is_gamepad = FALSE; int fd; - static const CHAR *base_serial = "0000"; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1093,55 +1093,59 @@ static void try_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &vid, &pid, &input, &version, &serial); - get_device_subsystem_info(dev, "input", &vid, &pid, &input, &version, &serial); - get_device_subsystem_info(dev, "usb", &vid, &pid, &input, &version, &serial); + get_device_subsystem_info(dev, "hid", &desc); + get_device_subsystem_info(dev, "input", &desc); + get_device_subsystem_info(dev, "usb", &desc); subsystem = udev_device_get_subsystem(dev); + if (!strcmp(subsystem, "hidraw")) + { + desc.busid = hidraw_busidW; + } #ifdef HAS_PROPER_INPUT_HEADER - if (!strcmp(subsystem, "input")) + else if (!strcmp(subsystem, "input")) { struct input_id device_id = {0}; char device_uid[255]; + desc.busid = lnxev_busidW; + if (ioctl(fd, EVIOCGID, &device_id) < 0) WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); else { - vid = device_id.vendor; - pid = device_id.product; - version = device_id.version; + desc.vid = device_id.vendor; + desc.pid = device_id.product; + desc.version = device_id.version; } device_uid[0] = 0; if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) - serial = strdupAtoW(device_uid); + MultiByteToWideChar(CP_UNIXCP, 0, device_uid, -1, desc.serial, ARRAY_SIZE(desc.serial)); } #endif - if (serial == NULL) serial = strdupAtoW(base_serial); + if (!desc.serial[0]) lstrcpyW(desc.serial, base_serial); - if (is_xbox_gamepad(vid, pid)) - is_gamepad = TRUE; + if (is_xbox_gamepad(desc.vid, desc.pid)) + desc.is_gamepad = TRUE; #ifdef HAS_PROPER_INPUT_HEADER else { int axes=0, buttons=0; axes = count_abs_axis(fd); buttons = count_buttons(fd, NULL); - is_gamepad = (axes == 6 && buttons >= 14); + desc.is_gamepad = (axes == 6 && buttons >= 14); } #endif - TRACE("Found udev device %s (vid %04x, pid %04x, version %04x, input %d, serial %s)\n", - debugstr_a(devnode), vid, pid, version, input, debugstr_w(serial)); + TRACE("dev %p, node %s, desc %s.\n", dev, debugstr_a(devnode), debugstr_device_desc(&desc)); if (strcmp(subsystem, "hidraw") == 0) { if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; - device = bus_create_hid_device(hidraw_busidW, vid, pid, input, version, 0, serial, - is_gamepad, &hidraw_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &hidraw_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); } #ifdef HAS_PROPER_INPUT_HEADER @@ -1149,8 +1153,7 @@ static void try_add_device(struct udev_device *dev) { if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wine_input_private)))) return; - device = bus_create_hid_device(lnxev_busidW, vid, pid, input, version, 0, serial, - is_gamepad, &lnxev_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &lnxev_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); } #endif @@ -1166,8 +1169,6 @@ static void try_add_device(struct udev_device *dev) WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); close(fd); } - - HeapFree(GetProcessHeap(), 0, serial); } static void try_remove_device(struct udev_device *dev) @@ -1213,7 +1214,7 @@ static void build_initial_deviceset(void) path = udev_list_entry_get_name(dev_list_entry); if ((dev = udev_device_new_from_syspath(udev_context, path))) { - try_add_device(dev); + udev_add_device(dev); udev_device_unref(dev); } } @@ -1286,7 +1287,7 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); else if (strcmp(action, "add") == 0) - try_add_device(dev); + udev_add_device(dev); else if (strcmp(action, "remove") == 0) try_remove_device(dev); else diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0f92f64dea2..4727c4b043d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -118,11 +118,8 @@ struct device_extension CRITICAL_SECTION cs; enum device_state state; - WORD vid, pid, input; - DWORD uid, version, index; - BOOL is_gamepad; - WCHAR *serial; - const WCHAR *busid; /* Expected to be a static constant */ + struct device_desc desc; + DWORD index; const platform_vtbl *vtbl; @@ -146,36 +143,25 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); -static const WCHAR zero_serialW[]= {'0','0','0','0',0}; - static NTSTATUS winebus_call(unsigned int code, void *args) { return __wine_unix_call_funcs[code]( args ); } -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst; - if (!src) return NULL; - dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1)*sizeof(WCHAR)); - if (dst) strcpyW(dst, src); - return dst; -} - struct unix_device *get_unix_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; return ext->unix_device; } -static DWORD get_device_index(WORD vid, WORD pid, WORD input) +static DWORD get_device_index(struct device_desc *desc) { struct device_extension *ext; DWORD index = 0; LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - if (ext->vid == vid && ext->pid == pid && ext->input == input) + if (ext->desc.vid == desc->vid && ext->desc.pid == desc->pid && ext->desc.input == desc->input) index = max(ext->index + 1, index); } @@ -186,12 +172,11 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) { static const WCHAR formatW[] = {'%','i','&','%','s','&','%','x','&','%','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - const WCHAR *serial = ext->serial ? ext->serial : zero_serialW; - DWORD len = strlenW(serial) + 33; + DWORD len = strlenW(ext->desc.serial) + 33; WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - sprintfW(dst, formatW, ext->version, serial, ext->uid, ext->index); + sprintfW(dst, formatW, ext->desc.version, ext->desc.serial, ext->desc.uid, ext->index); return dst; } @@ -202,13 +187,13 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', '&','p','i','d','_','%','0','4','x',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->busid) + 34; + DWORD len = strlenW(ext->desc.busid) + 34; WCHAR *dst, *tmp; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { - tmp = dst + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); - if (ext->input != (WORD)-1) sprintfW(tmp, input_formatW, ext->input); + tmp = dst + sprintfW(dst, formatW, ext->desc.busid, ext->desc.vid, ext->desc.pid); + if (ext->desc.input != -1) sprintfW(tmp, input_formatW, ext->desc.input); } return dst; @@ -219,9 +204,9 @@ static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; - if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->desc.busid) + 2) * sizeof(WCHAR)))) { - strcpyW(dst, ext->busid); + strcpyW(dst, ext->desc.busid); dst[strlenW(dst) + 1] = 0; } @@ -242,11 +227,11 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) DWORD size = sizeof(hid_compat); WCHAR *dst; - if (ext->is_gamepad) size += sizeof(xinput_compat); + if (ext->desc.is_gamepad) size += sizeof(xinput_compat); if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) { - if (ext->is_gamepad) memcpy(dst, xinput_compat, sizeof(xinput_compat)); + if (ext->desc.is_gamepad) memcpy(dst, xinput_compat, sizeof(xinput_compat)); memcpy((char *)dst + size - sizeof(hid_compat), hid_compat, sizeof(hid_compat)); dst[size / sizeof(WCHAR)] = 0; } @@ -268,9 +253,8 @@ static void remove_pending_irps(DEVICE_OBJECT *device) } } -DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, - DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const platform_vtbl *vtbl, struct unix_device *unix_device) +DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, const platform_vtbl *vtbl, + struct unix_device *unix_device) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; struct device_extension *ext; @@ -279,11 +263,9 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO WCHAR dev_name[256]; NTSTATUS status; - TRACE("bus_id %s, vid %04x, pid %04x, input %04x, version %u, uid %u, serial %s, " - "is_gamepad %u, vtbl %p, unix_device %p\n", debugstr_w(busidW), vid, pid, input, - version, uid, debugstr_w(serialW), is_gamepad, vtbl, unix_device); + TRACE("desc %s, vtbl %p, unix_device %p\n", debugstr_device_desc(desc), vtbl, unix_device); - sprintfW(dev_name, device_name_fmtW, busidW, unix_device); + sprintfW(dev_name, device_name_fmtW, desc->busid, unix_device); RtlInitUnicodeString(&nameW, dev_name); status = IoCreateDevice(driver_obj, sizeof(struct device_extension), &nameW, 0, 0, FALSE, &device); if (status) @@ -297,15 +279,8 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO /* fill out device_extension struct */ ext = (struct device_extension *)device->DeviceExtension; ext->device = device; - ext->vid = vid; - ext->pid = pid; - ext->input = input; - ext->uid = uid; - ext->version = version; - ext->index = get_device_index(vid, pid, input); - ext->is_gamepad = is_gamepad; - ext->serial = strdupW(serialW); - ext->busid = busidW; + ext->desc = *desc; + ext->index = get_device_index(desc); ext->vtbl = vtbl; ext->last_report = NULL; ext->last_report_size = 0; @@ -334,7 +309,7 @@ DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - if (strcmpW(ext->busid, bus_id)) continue; + if (strcmpW(ext->desc.busid, bus_id)) continue; if (ext->vtbl->compare_platform_device(ext->device, platform_dev) == 0) { ret = ext->device; @@ -358,7 +333,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) { - if (strcmpW(ext->busid, bus_id)) continue; + if (strcmpW(ext->desc.busid, bus_id)) continue; LeaveCriticalSection(&device_list_cs); cont = function(ext->device, context); EnterCriticalSection(&device_list_cs); @@ -483,21 +458,19 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) static void mouse_device_create(void) { - static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; struct device_create_params params = {0}; if (winebus_call(mouse_create, &params)) return; - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, params.device); + mouse_obj = bus_create_hid_device(&params.desc, &mouse_vtbl, params.device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static void keyboard_device_create(void) { - static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; struct device_create_params params = {0}; if (winebus_call(keyboard_create, &params)) return; - keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, params.device); + keyboard_obj = bus_create_hid_device(&params.desc, &keyboard_vtbl, params.device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -737,7 +710,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); - HeapFree(GetProcessHeap(), 0, ext->serial); HeapFree(GetProcessHeap(), 0, ext->last_report); irp->IoStatus.Status = STATUS_SUCCESS; @@ -788,7 +760,7 @@ static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR const struct product_desc *vendor_products; unsigned int i, vendor_products_size = 0; - if (ext->vid == VID_MICROSOFT) + if (ext->desc.vid == VID_MICROSOFT) { vendor_products = XBOX_CONTROLLERS; vendor_products_size = ARRAY_SIZE(XBOX_CONTROLLERS); @@ -796,7 +768,7 @@ static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR for (i = 0; i < vendor_products_size; i++) { - if (ext->pid == vendor_products[i].pid) + if (ext->desc.pid == vendor_products[i].pid) break; } @@ -871,9 +843,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memset(attr, 0, sizeof(*attr)); attr->Size = sizeof(*attr); - attr->VendorID = ext->vid; - attr->ProductID = ext->pid; - attr->VersionNumber = ext->version; + attr->VendorID = ext->desc.vid; + attr->ProductID = ext->desc.pid; + attr->VersionNumber = ext->desc.version; irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = sizeof(*attr); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index fdfdcc52dcb..9759bf9d911 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -108,11 +108,19 @@ const platform_vtbl mouse_vtbl = .set_feature_report = mouse_set_feature_report, }; +static const WCHAR mouse_bus_id[] = {'W','I','N','E','M','O','U','S','E',0}; +static const struct device_desc mouse_device_desc = +{ + .busid = mouse_bus_id, + .input = -1, + .serial = {'0','0','0','0',0}, +}; static struct unix_device mouse_device; static NTSTATUS mouse_device_create(void *args) { struct device_create_params *params = args; + params->desc = mouse_device_desc; params->device = &mouse_device; return STATUS_SUCCESS; } @@ -187,11 +195,19 @@ const platform_vtbl keyboard_vtbl = .set_feature_report = keyboard_set_feature_report, }; +static const WCHAR keyboard_bus_id[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; +static const struct device_desc keyboard_device_desc = +{ + .busid = keyboard_bus_id, + .input = -1, + .serial = {'0','0','0','0',0}, +}; static struct unix_device keyboard_device; static NTSTATUS keyboard_device_create(void *args) { struct device_create_params *params = args; + params->desc = keyboard_device_desc; params->device = &keyboard_device; return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index d70dedecb2c..d321c208885 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -27,9 +27,22 @@ #include <ddk/wdm.h> #include <hidusage.h> +#include "wine/debug.h" #include "wine/list.h" #include "wine/unixlib.h" +struct device_desc +{ + const WCHAR *busid; + DWORD vid; + DWORD pid; + DWORD version; + DWORD input; + DWORD uid; + WCHAR serial[256]; + BOOL is_gamepad; +}; + struct sdl_bus_options { BOOL map_controllers; @@ -70,6 +83,7 @@ struct bus_event struct device_create_params { + struct device_desc desc; struct unix_device *device; }; @@ -90,4 +104,12 @@ enum unix_funcs extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +static inline const char *debugstr_device_desc(struct device_desc *desc) +{ + if (!desc) return "(null)"; + return wine_dbg_sprintf("{busid %s, vid %04x, pid %04x, version %04x, input %d, uid %08x, serial %s, is_gamepad %u}", + debugstr_w(desc->busid), desc->vid, desc->pid, desc->version, + desc->input, desc->uid, debugstr_w(desc->serial), desc->is_gamepad); +} + #endif /* __WINEBUS_UNIXLIB_H */ -- 2.33.0

1 3

[PATCH 1/2 v6] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 03 Sep '21

03 Sep '21

v6: Rewrite to match the test results. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++-- include/wine/afd.h | 2 +- include/wine/server_protocol.h | 4 +-- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 54 ++++++++++++++++++++++++++++++++-- server/trace.c | 3 +- 7 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bb4862c9669..fc9c8ed8111 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1761,7 +1761,7 @@ struct poll_socket_output struct poll_socket_request { struct request_header __header; - char __pad_12[4]; + int exclusive; async_data_t async; timeout_t timeout; /* VARARG(sockets,poll_socket_input); */ @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 726 +#define SERVER_PROTOCOL_VERSION 727 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/request.h b/server/request.h index 18a6a2df3c7..f1c8f1c5432 100644 --- a/server/request.h +++ b/server/request.h @@ -1045,6 +1045,7 @@ C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct poll_socket_request, exclusive) == 12 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, timeout) == 56 ); C_ASSERT( sizeof(struct poll_socket_request) == 64 ); diff --git a/server/sock.c b/server/sock.c index 50bfc08e145..a5a96fea722 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + char exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2853,8 +2855,51 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, - unsigned int count, const struct poll_socket_input *input ) +static void poll_handle_exclusive(struct poll_req *req) +{ + struct poll_req *areq; + unsigned int i, j; + + for (i = 0; i < req->count; ++i) + { + int has_main = FALSE; + + LIST_FOR_EACH_ENTRY(areq, &poll_list, struct poll_req, entry) + { + for (j = 0; j < areq->count; ++j) + { + if (areq->sockets[j].sock != req->sockets[i].sock) + continue; + + if (!areq->sockets[j].main) + continue; + + has_main = TRUE; + + if (areq->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll */ + areq->sockets[j].main = FALSE; + + areq->iosb->status = STATUS_SUCCESS; + areq->iosb->out_data = areq->output; + areq->iosb->out_size = areq->count * sizeof(*areq->output); + async_terminate(areq->async, STATUS_ALERTED); + + has_main = FALSE; + } + + goto next; + } + } + + next: + req->sockets[i].main = !has_main; + } +} + +static int poll_socket( struct sock *poll_sock, struct async *async, char exclusive, + timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; struct poll_req *req; @@ -2893,11 +2938,14 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3312,7 +3360,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - reply->wait = async_handoff( async, poll_socket( sock, async, req->timeout, count, input ), NULL, 0 ); + reply->wait = async_handoff( async, poll_socket( sock, async, req->exclusive, req->timeout, count, input ), NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); } diff --git a/server/trace.c b/server/trace.c index 4e91d933a5d..f144d88094f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2122,7 +2122,8 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) static void dump_poll_socket_request( const struct poll_socket_request *req ) { - dump_async_data( " async=", &req->async ); + fprintf( stderr, " exclusive=%d", req->exclusive ); + dump_async_data( ", async=", &req->async ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_poll_socket_input( ", sockets=", cur_size ); } -- 2.33.0

3 3

[PATCH] dbghelp: handle the case where loader isn't what WINELOADER reports
by Eric Pouech 03 Sep '21

03 Sep '21

use case, in a WoW setup: wine programs/winedbg/winedbg.exe.so notepad.exe where both winedbg and notepad are 64bit exec:s in this case, dbghelp (loaded from winedbg) reads '<...>/wine' from WINELOADER windows env block inside notepad (but the unix env block is correctly set to wine64 by the tweak in ntdll/unix/loader.c) as a consequence dbghelp doesn't get the ELF information (it tries to read 32bit ELF entities, and fails); hence misses all the loaded ELF libraries winedbg's command 'info share' only reports the PE modules note: the 'dual' case wine64 programs/winedbg/winedbg.exe.so c:\\windows\\syswow64\\notepad.exe where winedbg is a 64bit exec and notepad a 32bit shows the same failures workaround this in dbghelp by tweaking the value of WINELOADER whether the debuggee is 32 or 64bit V2: - remove const qualifier Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2b0365bc386..c04a82cd46a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -639,7 +639,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern const WCHAR *get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +extern WCHAR* get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index d1a4454e043..7be7e8efce6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1752,10 +1752,16 @@ static const struct loader_ops elf_loader_ops = BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) { struct elf_info elf_info; - BOOL ret; + BOOL ret = FALSE; + WCHAR* loader; elf_info.flags = ELF_INFO_DEBUG_HEADER | ELF_INFO_MODULE; - ret = elf_search_and_load_file(pcs, get_wine_loader_name(pcs), addr, 0, &elf_info); + loader = get_wine_loader_name(pcs); + if (loader) + { + ret = elf_search_and_load_file(pcs, loader, addr, 0, &elf_info); + HeapFree(GetProcessHeap(), 0, loader); + } if (!ret || !elf_info.dbg_hdr_addr) return FALSE; TRACE("Found ELF debug header %#lx\n", elf_info.dbg_hdr_addr); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 602f7e45c14..7b0b80c4900 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1885,7 +1885,15 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } } - if (!ret) ret = macho_search_and_load_file(pcs, get_wine_loader_name(pcs), 0, macho_info); + if (!ret) + { + WCHAR* loader = get_wine_loader_name(pcs); + if (loader) + { + ret = macho_search_and_load_file(pcs, loader, 0, macho_info); + HeapFree(GetProcessHeap(), 0, loader); + } + } return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c278a627d37..3bc2a9e143a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -138,12 +138,34 @@ void module_set_module(struct module* module, const WCHAR* name) } /* Returned string must be freed by caller */ -const WCHAR *get_wine_loader_name(struct process *pcs) +WCHAR *get_wine_loader_name(struct process *pcs) { - const WCHAR *name = process_getenv(pcs, L"WINELOADER"); + const WCHAR *name; + WCHAR* altname; + unsigned len; + + name = process_getenv(pcs, L"WINELOADER"); if (!name) name = pcs->is_64bit ? L"wine64" : L"wine"; - TRACE("returning %s\n", debugstr_w(name)); - return name; + len = lstrlenW(name); + + /* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block + * (it's updated in ELF env block though) + * So do the adaptation ourselves. + */ + altname = HeapAlloc(GetProcessHeap(), 0, (len + 2 + 1) * sizeof(WCHAR)); + if (altname) + { + memcpy(altname, name, len * sizeof(WCHAR)); + if (pcs->is_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + lstrcpyW(altname + len, L"64"); + else if (!pcs->is_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) + altname[len - 2] = '\0'; + else + altname[len] = '\0'; + } + + TRACE("returning %s\n", debugstr_w(altname)); + return altname; } static const char* get_module_type(enum module_type type, BOOL virtual)

1 0

[PATCH 1/9] server: Use a separate function and flag to communicate that the initial status of an async is not known yet.
by Zebediah Figura 03 Sep '21

03 Sep '21

Mostly just to simplify the interface, so that we don't need to use the return value to communicate this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 23 +++++++++++++++++------ server/device.c | 4 ++-- server/file.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/server/async.c b/server/async.c index e8d95a62d4b..4e9f3253759 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ unsigned int terminated :1; /* async has been terminated */ + unsigned int unknown_status :1; /* initial status is not known yet */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -258,6 +259,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->alerted = 0; async->terminated = 0; + async->unknown_status = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -284,6 +286,7 @@ void set_async_pending( struct async *async, int signal ) if (!async->terminated) { async->pending = 1; + async->unknown_status = 0; if (signal && !async->signaled) { async->signaled = 1; @@ -295,14 +298,15 @@ void set_async_pending( struct async *async, int signal ) /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) { + if (async->unknown_status) + { + /* even the initial status is not known yet */ + set_error( STATUS_PENDING ); + return async->wait_handle; + } + if (!success) { - if (get_error() == STATUS_PENDING) - { - /* we don't know the result yet, so client needs to wait */ - async->direct_result = 0; - return async->wait_handle; - } close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; return 0; @@ -381,6 +385,13 @@ void async_request_complete_alloc( struct async *async, unsigned int status, dat async_request_complete( async, status, result, out_size, out_data_copy ); } +/* mark an async as having unknown initial status */ +void async_set_unknown_status( struct async *async ) +{ + async->unknown_status = 1; + async->direct_result = 0; +} + /* set the timeout of an async operation */ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ) { diff --git a/server/device.c b/server/device.c index 29b36845e68..8892651d048 100644 --- a/server/device.c +++ b/server/device.c @@ -605,8 +605,8 @@ static int queue_irp( struct device_file *file, const irp_params_t *params, stru irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); - set_error( STATUS_PENDING ); - return 0; + async_set_unknown_status( async ); + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 8e42cd3704e..9b8a620359e 100644 --- a/server/file.h +++ b/server/file.h @@ -224,6 +224,7 @@ extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); +extern void async_set_unknown_status( struct async *async ); extern void set_async_pending( struct async *async, int signal ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); -- 2.33.0

1 8

[PATCH 1/2 v5] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi 02 Sep '21

02 Sep '21

v2-v5: Fix some corner cases. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 +-- include/wine/afd.h | 2 +- include/wine/server_protocol.h | 5 ++- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 75 ++++++++++++++++++++++++++++++++-- server/trace.c | 3 +- 7 files changed, 83 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bb4862c9669..14518f0bf6f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1761,7 +1761,8 @@ struct poll_socket_output struct poll_socket_request { struct request_header __header; - char __pad_12[4]; + char exclusive; + char __pad_13[3]; async_data_t async; timeout_t timeout; /* VARARG(sockets,poll_socket_input); */ @@ -6252,7 +6253,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 726 +#define SERVER_PROTOCOL_VERSION 727 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..8eefdaae17f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + char exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/request.h b/server/request.h index 18a6a2df3c7..f1c8f1c5432 100644 --- a/server/request.h +++ b/server/request.h @@ -1045,6 +1045,7 @@ C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct poll_socket_request, exclusive) == 12 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, timeout) == 56 ); C_ASSERT( sizeof(struct poll_socket_request) == 64 ); diff --git a/server/sock.c b/server/sock.c index 50bfc08e145..7cdbed940c6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,6 +128,7 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + char exclusive; unsigned int count; struct poll_socket_output *output; struct @@ -2853,8 +2854,8 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, - unsigned int count, const struct poll_socket_input *input ) +static int poll_socket( struct sock *poll_sock, struct async *async, char exclusive, + timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; struct poll_req *req; @@ -2893,11 +2894,79 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + if (exclusive) + { + int has_shared = FALSE; + struct poll_req *areq; + + LIST_FOR_EACH_ENTRY( areq, &poll_list, struct poll_req, entry ) + { + int skip_areq = FALSE; + + for (i = 0; i < areq->count; ++i) + { + struct sock *asock = areq->sockets[i].sock; + + for (j = 0; j < req->count; ++j) + { + if (asock == req->sockets[j].sock) + { + if (!areq->exclusive) + has_shared = TRUE; + + skip_areq = TRUE; + break; + } + } + + if (skip_areq || has_shared) + break; + } + + if (has_shared) + break; + } + + LIST_FOR_EACH_ENTRY( areq, &poll_list, struct poll_req, entry ) + { + int areq_term = FALSE; + + if (has_shared) + break; + + for (i = 0; i < areq->count; ++i) + { + struct sock *asock = areq->sockets[i].sock; + + for (j = 0; j < req->count; ++j) + { + if (asock == req->sockets[j].sock) + { + areq_term = TRUE; + break; + } + } + + if (areq_term) + break; + } + + if (areq_term) + { + areq->iosb->status = STATUS_SUCCESS; + areq->iosb->out_data = areq->output; + areq->iosb->out_size = areq->count * sizeof(*areq->output); + async_terminate( areq->async, STATUS_ALERTED ); + } + } + } + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3312,7 +3381,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - reply->wait = async_handoff( async, poll_socket( sock, async, req->timeout, count, input ), NULL, 0 ); + reply->wait = async_handoff( async, poll_socket( sock, async, req->exclusive, req->timeout, count, input ), NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); } diff --git a/server/trace.c b/server/trace.c index 4e91d933a5d..567c54c4df7 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2122,7 +2122,8 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) static void dump_poll_socket_request( const struct poll_socket_request *req ) { - dump_async_data( " async=", &req->async ); + fprintf( stderr, " exclusive=%c", req->exclusive ); + dump_async_data( ", async=", &req->async ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_poll_socket_input( ", sockets=", cur_size ); } -- 2.33.0

3 8

[PATCH vkd3d 1/5] tests: Test casting to and then from bool
by Giovanni Mascellani 02 Sep '21

02 Sep '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-bool-cast.shader_test | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/hlsl-bool-cast.shader_test diff --git a/Makefile.am b/Makefile.am index c66f7b50..3de58991 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-invalid.shader_test \ @@ -265,6 +266,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test new file mode 100644 index 00000000..8880b2f5 --- /dev/null +++ b/tests/hlsl-bool-cast.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + return float4( + (float)(bool)0.0, + (float)(bool)0, + (float)(bool)2.0, + (float)(bool)2 + ); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0) -- 2.33.0

4 13

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by Aurélien Inacio 02 Sep '21

02 Sep '21

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..a1017def5b6 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -323,6 +323,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case OPENTYPE_PLATFORM_MAC: switch (encoding) { + case TT_NAME_MAC_ENCODING_KHMER: + return 0; case TT_NAME_MAC_ENCODING_ROMAN: return 10000; case TT_NAME_MAC_ENCODING_JAPANESE: -- 2.30.2

1 0

[PATCH 1/7] ntoskrnl.exe/tests: Reduce todo_wine test verbosity.
by Rémi Bernon 02 Sep '21

02 Sep '21

Reducing the failure message and mute driver todos after first failure. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 38 ++++++++++------------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1d5f7563e3f..1a2971a8956 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -388,7 +388,6 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) #undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" - static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); HID_DEVICE_EXTENSION *ext = device->DeviceExtension; struct hid_device *impl = ext->MiniDeviceExtension; @@ -479,12 +478,8 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { ULONG expected_size = 23; ok(!in_size, "got input size %u\n", in_size); - if (!test_failed) - { - todo_wine_if(!report_id) - ok(out_size == expected_size, "got output size %u\n", out_size); - } - if (out_size != expected_size) test_failed = TRUE; + todo_wine_if(!report_id) + ok(out_size == expected_size, "got output size %u\n", out_size); if (polled) { @@ -537,12 +532,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || (polled && report_id && packet->reportId == 0)) - ok(packet->reportId == report_id, "report %d, polled %d got packet report id %u\n", - report_id, polled, packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -559,11 +552,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 1) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; @@ -578,11 +570,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) ok(out_size == sizeof(*packet), "got output size %u\n", out_size); todo_wine_if(packet->reportId == 0x5a || packet->reportId == 0xa5) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); memset(packet->reportBuffer, 0xa5, 3); if (report_id) ((char *)packet->reportBuffer)[0] = report_id; @@ -599,11 +590,10 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) todo_wine ok(!out_size, "got output size %u\n", out_size); todo_wine_if(packet->reportId != report_id) - ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + ok(packet->reportId == report_id, "got id %u\n", packet->reportId); todo_wine_if(packet->reportBufferLen == 0 || packet->reportBufferLen == 16) - ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", - packet->reportBufferLen, expected_size); - ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + ok(packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen); + ok(!!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer); irp->IoStatus.Information = 3; ret = STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 1eab88311ab..148de3b1a6c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2714,7 +2714,7 @@ static void test_hid_device(DWORD report_id, DWORD polled) HDEVINFO set; HANDLE file; - winetest_push_context("report %d, polled %d", report_id, polled); + winetest_push_context("id %d%s", report_id, polled ? " poll" : ""); set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f73f6f938ca..aa84890f6af 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -51,7 +51,7 @@ static int winetest_debug; static int winetest_report_success; /* silence todos and skips above this threshold */ -static int winetest_mute_threshold = 42; +static int winetest_mute_threshold = 1; /* counts how many times a given line printed a message */ static LONG line_counters[16384]; -- 2.32.0

3 8

[PATCH 1/5] d3d10/effect: Set IsInline in GetShaderDesc().
by Nikolay Sivov 02 Sep '21

02 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 4 +++- dlls/d3d10/tests/effect.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 64c445ec07a..4d73121d6ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -118,6 +118,7 @@ struct d3d10_effect_shader_variable unsigned int resource_count; struct d3d10_effect_shader_resource *resources; char *stream_output_declaration; + unsigned int isinline : 1; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81745f7f239..d521684f788 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1409,6 +1409,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ v->type = t; v->effect = e; + v->u.shader.isinline = 1; set_variable_vtbl(v); if (!copy_name("$Anonymous", &v->name)) @@ -7008,7 +7009,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( D3D10_SHADER_DESC shader_desc; HRESULT hr; - FIXME("iface %p, index %u, desc %p semi-stub.\n", iface, index, desc); + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) return hr; @@ -7017,6 +7018,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( if (s->input_signature) desc->pInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); desc->SODecl = s->stream_output_declaration; + desc->IsInline = s->isinline; if (s->bytecode) { desc->pBytecode = ID3D10Blob_GetBufferPointer(s->bytecode); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 70bcf1ea72b..f59686c26a3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3671,8 +3671,8 @@ if (0) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine { ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); +todo_wine { ok(shaderdesc.SODecl && !strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); } -- 2.33.0

3 11

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by aurelien.ina 02 Sep '21

02 Sep '21

Signed-off-by: Aurélien Inacio <aurelien.ina(a)protonmail.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 01/10] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon 02 Sep '21

02 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Looks like my attempt to move driver tests around will need some thought so I'm sending the HID tests changes in ntoskrnl.exe/tests instead, as there'll be exhibiting a few things that need fixing. Also sending a few ntoskrnl.exe tests improvements to fix a few potential spurious failures, especially when running the tests several times, where there's sometimes stale devices laying around. I'll probably then duplicate the code for DInput driver-based tests. The first patch may just be skipped, otherwise Marvin was going to complain on every other patch. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..e3afd46181c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -979,12 +979,15 @@ static void test_return_status(void) params.ret_status = status_tests[i]; params.iosb_status = status_tests[j]; - winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u", - params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n", + params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; do_return_status(method_tests[k], &params); - winetest_pop_context(); + winetest_mute_threshold = old_threshold; + trace("done\n"); } } } -- 2.33.0

3 19

[PATCH v3 1/2] wined3d: Fix the odd line condition in gen_yv12_read().
by Anton Baskanov 02 Sep '21

02 Sep '21

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- The original condition is true for every other line, which is incorrect since the chroma has only half the resolution. Fixes comb artifacts around color transitions. v2: Added a comment. v3: Split condition simplification into a separate patch. --- dlls/wined3d/glsl_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ae90148dc8..c760d519b30 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12621,8 +12621,10 @@ static void gen_yv12_read(struct wined3d_string_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll * get filtering bleeding. */ - /* Read odd lines from the right side (add 0.5 to the x coordinate). */ - shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.5 + 1.0 / 6.0) >= 0.5)\n"); + /* Read odd lines from the right side (add 0.5 to the x coordinate). Keep + * in mind that each line of the chroma plane corresponds to 2 lines of the + * resulting image. */ + shader_addline(buffer, " if (fract(floor(texcoord.y * size.y) * 0.25 + 1.0 / 6.0) >= 0.5)\n"); shader_addline(buffer, " texcoord.x += 0.5;\n"); /* Clamp, keep the half pixel origin in mind. */ -- 2.25.1

3 5

[PATCH] mf: Remove WINAPI on static functions where not needed.
by Francois Gouget 02 Sep '21

02 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 5730a6e769f..a5545c157de 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -638,7 +638,7 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) +static HRESULT video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { HRESULT hr = S_OK; -- 2.30.2

2 1

[PATCH 0/2] Better handling of WoW in winedbg
by Eric Pouech 02 Sep '21

02 Sep '21

a couple of fixes for winedbg (64bit) debugging a Wow64 32bit debuggee A+ --- Eric Pouech (2): winedbg: allow debugging a 32bit target from a 64bit winedbg dbghelp: handle the case where loader isn't what WINELOADER reports dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 28 +++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-)

2 3

[PATCH 1/3] d3dx10/font: Add PreloadTextW().
by Nikolay Sivov 02 Sep '21

02 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/font.c | 28 ++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 9 --------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 2145b1c6f1e..51704e2bbbe 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -210,9 +210,33 @@ static HRESULT WINAPI d3dx_font_PreloadTextA(ID3DX10Font *iface, const char *str static HRESULT WINAPI d3dx_font_PreloadTextW(ID3DX10Font *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_wn(string, count), count); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + WORD *indices; + int i; - return E_NOTIMPL; + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return S_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DX10Font_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return S_OK; } static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8c55dd5810b..65bccb71521 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2263,32 +2263,23 @@ static void test_font(void) hr = ID3DX10Font_PreloadTextA(font, NULL, 1); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "test", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, -1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, testW, -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Font_Release(font); -- 2.33.0

2 5

[PATCH 9/9] gdi32: Move GdiConvertToDevmodeW to gdidc.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 52 +-------------------------------------------- dlls/gdi32/gdidc.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 51 deletions(-)

2 1

[PATCH 8/9] gdi32: Use ntgdi interface for printer driver functions.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 32 ++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 21 +++++++++------------ 2 files changed, 41 insertions(+), 12 deletions(-)

2 1

[PATCH 7/9] gdi32: Use NtGdiStartDoc for StartDoc.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/printdrv.c | 55 ++--------------------------------- include/ntgdi.h | 2 +- 3 files changed, 70 insertions(+), 54 deletions(-)

2 1

[PATCH 6/9] gdi32: Store abort proc in DC_ATTR.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/printdrv.c | 17 +---------------- include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 17 deletions(-)

2 1

[PATCH 5/9] gdi32: Use ntgdi names for spool functions.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-)

2 1

[PATCH 4/9] gdi32: Use NtGdiGetRandomRgn for GetMetaRgn.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 26 ++------------------------ dlls/gdi32/gdidc.c | 8 ++++++++ 2 files changed, 10 insertions(+), 24 deletions(-)

2 1

[PATCH 3/9] gdi32: Use NtGdiGetRandomRgn for GetClipRgn.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I couldn't find a way to get what we need from ntgdi without an extension. Technically, we could mirror the region on gdi32 side, but that seems suboptimal. dlls/gdi32/clipping.c | 36 ++++++++---------------------------- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/tests/clipping.c | 7 ++++++- include/ntgdi.h | 3 +++ 4 files changed, 25 insertions(+), 29 deletions(-)

2 1

[PATCH 2/9] gdi32: Move GdiDllInitialize to objects.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 12 ------------ dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-)

2 1

[PATCH 1/9] gdi32: Move LineDDA to objects.c.
by Jacek Caban 02 Sep '21

02 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/painting.c | 58 ------------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-)

2 1

[PATCH vkd3d 5/5] vkd3d-shader: Introduce shader_sm4_reset().
by Henri Verbeet 02 Sep '21

02 Sep '21

This allows us to drop the "ptr" argument to various functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 21 ++++++++++++++------- libs/vkd3d-shader/glsl.c | 4 ++-- libs/vkd3d-shader/trace.c | 7 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++++----- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 99a085f1..86cd0ec0 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1110,12 +1110,11 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) return &e->param; } -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_version *shader_version) +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version) { struct vkd3d_sm4_data *sm4 = parser->data; - *ptr = sm4->start; + parser->ptr = sm4->start; *shader_version = sm4->shader_version; } @@ -1527,12 +1526,12 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh } } -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_instruction *ins) +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { const struct vkd3d_sm4_opcode_info *opcode_info; uint32_t opcode_token, opcode, previous_token; struct vkd3d_sm4_data *sm4 = parser->data; + const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; const DWORD *p; @@ -1647,10 +1646,18 @@ fail: return; } -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr) +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) { struct vkd3d_sm4_data *sm4 = parser->data; - return *ptr == sm4->end; + + return parser->ptr == sm4->end; +} + +void shader_sm4_reset(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_sm4_data *sm4 = parser->data; + + parser->ptr = sm4->start; } static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 9824840f..b304addc 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -104,9 +104,9 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser, &parser->ptr)) + while (!shader_sm4_is_end(parser)) { - shader_sm4_read_instruction(parser, &parser->ptr, &ins); + shader_sm4_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 409ed550..1dca1ae2 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1781,7 +1781,6 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, struct vkd3d_string_buffer *buffer; unsigned int indent, i; const char *indent_str; - const DWORD *ptr; void *code; static const struct vkd3d_d3d_asm_colours no_colours = @@ -1831,17 +1830,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser, &ptr, shader_version); + shader_sm4_read_header(parser, shader_version); vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(parser, &ptr)) + while (!shader_sm4_is_end(parser)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(parser, &ptr, &ins); + shader_sm4_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b108fa65..5d7cdf01 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -388,7 +388,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(parser, &parser->ptr, &parser->shader_version); + shader_sm4_read_header(parser, &parser->shader_version); return VKD3D_OK; } @@ -952,11 +952,14 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } if (TRACE_ON()) + { vkd3d_shader_trace(&parser); + shader_sm4_reset(&parser); + } - while (!shader_sm4_is_end(&parser, &parser.ptr)) + while (!shader_sm4_is_end(&parser)) { - shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1085,9 +1088,9 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!shader_sm4_is_end(&parser, &parser.ptr)) + while (!shader_sm4_is_end(&parser)) { - shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6d044c51..b9c2ccea 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -891,11 +891,10 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_version *shader_version); -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, - const uint32_t **ptr, struct vkd3d_shader_instruction *ins); -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr); +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version); +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); +void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { -- 2.20.1

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_is_end().
by Henri Verbeet 02 Sep '21

02 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/glsl.c | 2 +- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 99c32ae2..99a085f1 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1647,10 +1647,10 @@ fail: return; } -bool shader_sm4_is_end(void *data, const DWORD **ptr) +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr) { - struct vkd3d_sm4_data *priv = data; - return *ptr == priv->end; + struct vkd3d_sm4_data *sm4 = parser->data; + return *ptr == sm4->end; } static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 04d948c2..9824840f 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -104,7 +104,7 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser->data, &parser->ptr)) + while (!shader_sm4_is_end(parser, &parser->ptr)) { shader_sm4_read_instruction(parser, &parser->ptr, &ins); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3e2b1523..409ed550 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1837,7 +1837,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(parser->data, &ptr)) + while (!shader_sm4_is_end(parser, &ptr)) { struct vkd3d_shader_instruction ins; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 56611772..b108fa65 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -954,7 +954,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (TRACE_ON()) vkd3d_shader_trace(&parser); - while (!shader_sm4_is_end(parser.data, &parser.ptr)) + while (!shader_sm4_is_end(&parser, &parser.ptr)) { shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); @@ -1085,7 +1085,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!shader_sm4_is_end(parser.data, &parser.ptr)) + while (!shader_sm4_is_end(&parser, &parser.ptr)) { shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5e828b6f..6d044c51 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -895,7 +895,7 @@ void shader_sm4_read_header(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_instruction *ins); -bool shader_sm4_is_end(void *data, const DWORD **ptr); +bool shader_sm4_is_end(struct vkd3d_shader_parser *parser, const uint32_t **ptr); struct vkd3d_string_buffer { -- 2.20.1

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_instruction().
by Henri Verbeet 02 Sep '21

02 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that this does also change the way vkd3d_glsl_generator_generate() interacts with parser->ptr; it's inconsequential because the parser is destroyed immediately after the only call to vkd3d_glsl_generator_generate(). libs/vkd3d-shader/dxbc.c | 31 ++++++++++++------------ libs/vkd3d-shader/glsl.c | 9 +++---- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++--- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++---- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 18ccc952..99c32ae2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1527,24 +1527,25 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh } } -void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_instruction *ins) { const struct vkd3d_sm4_opcode_info *opcode_info; - DWORD opcode_token, opcode, previous_token; - struct vkd3d_sm4_data *priv = data; + uint32_t opcode_token, opcode, previous_token; + struct vkd3d_sm4_data *sm4 = parser->data; unsigned int i, len; size_t remaining; const DWORD *p; DWORD precise; - list_move_head(&priv->src_free, &priv->src); + list_move_head(&sm4->src_free, &sm4->src); - if (*ptr >= priv->end) + if (*ptr >= sm4->end) { WARN("End of byte-code, failed to read opcode.\n"); goto fail; } - remaining = priv->end - *ptr; + remaining = sm4->end - *ptr; opcode_token = *(*ptr)++; opcode = opcode_token & VKD3D_SM4_OPCODE_MASK; @@ -1581,9 +1582,9 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha ins->structured = false; ins->predicate = NULL; ins->dst_count = strlen(opcode_info->dst_info); - ins->dst = priv->dst_param; + ins->dst = sm4->dst_param; ins->src_count = strlen(opcode_info->src_info); - ins->src = priv->src_param; + ins->src = sm4->src_param; ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; ins->resource_stride = 0; ins->resource_data_type[0] = VKD3D_DATA_FLOAT; @@ -1597,7 +1598,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha if (opcode_info->read_opcode_func) { - opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, priv); + opcode_info->read_opcode_func(ins, opcode, opcode_token, p, len, sm4); } else { @@ -1618,19 +1619,19 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha for (i = 0; i < ins->dst_count; ++i) { - if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]), - &priv->dst_param[i]))) + if (!(shader_sm4_read_dst_param(sm4, &p, *ptr, map_data_type(opcode_info->dst_info[i]), + &sm4->dst_param[i]))) { ins->handler_idx = VKD3DSIH_INVALID; return; } - priv->dst_param[i].modifiers |= instruction_dst_modifier; + sm4->dst_param[i].modifiers |= instruction_dst_modifier; } for (i = 0; i < ins->src_count; ++i) { - if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]), - &priv->src_param[i]))) + if (!(shader_sm4_read_src_param(sm4, &p, *ptr, map_data_type(opcode_info->src_info[i]), + &sm4->src_param[i]))) { ins->handler_idx = VKD3DSIH_INVALID; return; @@ -1641,7 +1642,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha return; fail: - *ptr = priv->end; + *ptr = sm4->end; ins->handler_idx = VKD3DSIH_INVALID; return; } diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 38d18cce..04d948c2 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -95,9 +95,8 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator return; } -int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, - struct vkd3d_glsl_generator *generator, - struct vkd3d_shader_code *out) +int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out) { void *code; struct vkd3d_shader_instruction ins; @@ -105,9 +104,9 @@ int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser_data, &parser_ptr)) + while (!shader_sm4_is_end(parser->data, &parser->ptr)) { - shader_sm4_read_instruction(parser_data, &parser_ptr, &ins); + shader_sm4_read_instruction(parser, &parser->ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 107554f6..3e2b1523 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1841,7 +1841,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(parser->data, &ptr, &ins); + shader_sm4_read_instruction(parser, &ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 08a1cee1..56611772 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -956,7 +956,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, while (!shader_sm4_is_end(parser.data, &parser.ptr)) { - shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1068,7 +1068,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - ret = vkd3d_glsl_generator_generate(parser.data, parser.ptr, glsl_generator, out); + ret = vkd3d_glsl_generator_generate(glsl_generator, &parser, out); vkd3d_glsl_generator_destroy(glsl_generator); vkd3d_shader_parser_destroy(&parser); @@ -1087,7 +1087,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info while (!shader_sm4_is_end(parser.data, &parser.ptr)) { - shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction); + shader_sm4_read_instruction(&parser, &parser.ptr, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3b1169a1..5e828b6f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -893,8 +893,8 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(struct vkd3d_shader_parser *parser, const uint32_t **ptr, struct vkd3d_shader_version *shader_version); -void shader_sm4_read_instruction(void *data, const DWORD **ptr, - struct vkd3d_shader_instruction *ins); +void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(void *data, const DWORD **ptr); struct vkd3d_string_buffer @@ -998,9 +998,8 @@ struct vkd3d_glsl_generator; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context); -int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, - struct vkd3d_glsl_generator *generator, - struct vkd3d_shader_code *out); +int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out); void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); struct vkd3d_dxbc_compiler; -- 2.20.1

1 0

[PATCH vkd3d 2/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_read_header().
by Henri Verbeet 02 Sep '21

02 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 9 +++++---- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 479cc5b8..18ccc952 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1110,12 +1110,13 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) return &e->param; } -void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_version *shader_version) { - struct vkd3d_sm4_data *priv = data; + struct vkd3d_sm4_data *sm4 = parser->data; - *ptr = priv->start; - *shader_version = priv->shader_version; + *ptr = sm4->start; + *shader_version = sm4->shader_version; } static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3b01b531..107554f6 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1831,7 +1831,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(parser->data, &ptr, shader_version); + shader_sm4_read_header(parser, &ptr, shader_version); vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c439308e..08a1cee1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -388,7 +388,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, return VKD3D_ERROR_INVALID_ARGUMENT; } - shader_sm4_read_header(parser->data, &parser->ptr, &parser->shader_version); + shader_sm4_read_header(parser, &parser->ptr, &parser->shader_version); return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fb449aac..3b1169a1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -891,8 +891,8 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_header(void *data, const DWORD **ptr, - struct vkd3d_shader_version *shader_version); +void shader_sm4_read_header(struct vkd3d_shader_parser *parser, + const uint32_t **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins); bool shader_sm4_is_end(void *data, const DWORD **ptr); -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free().
by Henri Verbeet 02 Sep '21

02 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 83f91960..479cc5b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1075,17 +1075,17 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, return priv; } -void shader_sm4_free(void *data) +void shader_sm4_free(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_src_param_entry *e1, *e2; - struct vkd3d_sm4_data *priv = data; + struct vkd3d_sm4_data *sm4 = parser->data; - list_move_head(&priv->src_free, &priv->src); - LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &priv->src_free, struct vkd3d_shader_src_param_entry, entry) + list_move_head(&sm4->src_free, &sm4->src); + LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &sm4->src_free, struct vkd3d_shader_src_param_entry, entry) { vkd3d_free(e1); } - vkd3d_free(priv); + vkd3d_free(sm4); } static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 36c211e6..c439308e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -394,7 +394,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { - shader_sm4_free(parser->data); + shader_sm4_free(parser); free_shader_desc(&parser->shader_desc); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97c1999b..fb449aac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -890,7 +890,7 @@ struct vkd3d_shader_message_context; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context); -void shader_sm4_free(void *data); +void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version); void shader_sm4_read_instruction(void *data, const DWORD **ptr, -- 2.20.1

1 0

[PATCH v2] shlwapi/tests: Document where SHFormatDateTimeA() crashes for NULL pointers.
by Francois Gouget 02 Sep '21

02 Sep '21

Knowing which Windows versions have been confirmed to crash will make it easier to know whether that information is potentially obsolete if the Windows behavior changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Indented. The if (0) is likely to stay there for a good while so it makes sense to indent the corresponding test. --- dlls/shlwapi/tests/ordinal.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..8a294ec1751 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,11 +1674,8 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ - pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} + if (0) /* crashes on Windows XP to Windows 10 20H2 */ + pSHFormatDateTimeA(NULL, NULL, NULL, 0); GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); -- 2.30.2

5 10

[PATCH] uxtheme/tests: Use the OpenThemeDataForDpi() function pointer.
by Francois Gouget 02 Sep '21

02 Sep '21

OpenThemeDataForDpi() is not available in Windows 10 1607 and older. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f9bf371e6bf..b088a7a050e 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -657,7 +657,7 @@ static void test_OpenThemeDataForDpi(void) is_theme_active = IsThemeActive(); SetLastError(0xdeadbeef); - htheme = OpenThemeDataForDpi(NULL, WC_BUTTONW, 96); + htheme = pOpenThemeDataForDpi(NULL, WC_BUTTONW, 96); if (is_theme_active) { ok(!!htheme, "Got a NULL handle.\n"); -- 2.30.2

2 1

[PATCH v2 1/9] ntoskrnl.exe/tests: Reduce the verbosity of test_return_status.
by Rémi Bernon 02 Sep '21

02 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix an incorrect use of sizeof in the WCHAR / char conversion, in GetFullPathNameW and SetupCopyOEMInfW calls. I also initially overlooked the small differences variations between driver_pnp and driver_hid start/stop sequences, it doesn't seem to make any difference but I used the driver_pnp version which does a few more things. Also edited the subjects. dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dc10497caee..e3afd46181c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -946,7 +946,7 @@ static void do_return_status(ULONG ioctl, struct return_status_params *params) static void test_return_status(void) { struct return_status_params params; - unsigned int i, j, k; + unsigned int i, j, k, old_threshold; static const ULONG method_tests[] = { @@ -979,12 +979,15 @@ static void test_return_status(void) params.ret_status = status_tests[i]; params.iosb_status = status_tests[j]; - winetest_push_context("return 0x%08x, iosb 0x%08x, pending %d, method %u", - params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + trace("testing return 0x%08x, iosb 0x%08x, pending %d, method %u\n", + params.ret_status, params.iosb_status, params.pending, method_tests[k] & 3); + old_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; do_return_status(method_tests[k], &params); - winetest_pop_context(); + winetest_mute_threshold = old_threshold; + trace("done\n"); } } } -- 2.33.0

2 10

[PATCH 00/13] Hardening of Dwarf debug info parsing
by Eric Pouech 02 Sep '21

02 Sep '21

The following serie is the first step toward adding Dwarf3/4 support into dbghelp. It mainly includes: - constant / definition updates - hardening of code regarding error conditions, improper input stream... - a couple of bug fixes A+ --- Eric Pouech (13): dbghelp: fix in dwarf2 subprogram handling dbghelp: dwarf support of DW_FORM_ref_udata dbghelp: more traces while parsing dwarf dbghelp: update dwarf definitions dbghelp: fix dwarf constants dbghelp: dwarf's internals adjustement dbghelp: Mostly get rid of symt_cache in dwarf debug information dbghelp: Added an unknown type in symt_cache for handling bad references to types dbghelp: check correctness of type (esp. in case of unknown ones) dbghelp: No longer call assert() on missing subprogram dwarf's information dbghelp: Harden inspection of Dwarf line number information dbghelp: Fix some erroneous string manipulation when said string is empty "" dbghelp: Properly handle errors when reading first DIE in compilation unit dlls/dbghelp/dbghelp_private.h | 5 + dlls/dbghelp/dwarf.c | 191 ++++++++++++++------------------- dlls/dbghelp/dwarf.h | 44 +++++++- dlls/dbghelp/source.c | 2 +- 4 files changed, 129 insertions(+), 113 deletions(-)

1 13

[PATCH] gdi32: Remove useless calls to CreateICA.
by Jiajin Cui 02 Sep '21

02 Sep '21

We can get funcs without calling CreateICA. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/gdi32/driver.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 340476bca10..2c8feee25e7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1057,16 +1057,13 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); - ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + const struct gdi_dc_funcs *funcs = NULL; + funcs = DRIVER_load_driver(bufW); + if (funcs) { + ret = funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode ); - release_dc_ptr( dc ); } - DeleteDC( hdc ); + return ret; } -- 2.20.1

1 0

[PATCH v4 1/4] winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id.
by Rémi Bernon 01 Sep '21

01 Sep '21

And match it in winehid.sys instead of individual bus ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Add FIXMEs to unimplemented codes in pdo_pnp, add a missing IRP_MN_QUERY_CAPABILITIES, stop passing the irps down. dlls/winebus.sys/main.c | 22 ++++++++++++++++++++-- dlls/winehid.sys/winehid.inf | 7 +------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e9c85deb846..49385576d62 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -226,7 +226,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) return dst; } -static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; @@ -240,6 +240,24 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } +static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +{ + static const WCHAR hid_compat[] = + { + 'W','I','N','E','B','U','S','\\','W','I','N','E','_','C','O','M','P','_','H','I','D',0 + }; + DWORD size = sizeof(hid_compat); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) + { + memcpy(dst, hid_compat, sizeof(hid_compat)); + dst[size / sizeof(WCHAR)] = 0; + } + + return dst; +} + static void remove_pending_irps(DEVICE_OBJECT *device) { struct device_extension *ext = device->DeviceExtension; @@ -444,7 +462,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { case BusQueryHardwareIDs: TRACE("BusQueryHardwareIDs\n"); - irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + irp->IoStatus.Information = (ULONG_PTR)get_hardware_ids(device); break; case BusQueryCompatibleIDs: TRACE("BusQueryCompatibleIDs\n"); diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index f9ed4091217..c1d8a1cf999 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -7,12 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine hidraw device=device_section,HIDRAW -Wine IOHID device=device_section,IOHID -Wine libevent device=device_section,LNXEV -Wine SDL HID device=device_section,SDLJOY -Wine mouse device=device_section,WINEMOUSE -Wine keyboard device=device_section,WINEKEYBOARD +Wine HID compatible device=device_section,WINEBUS\WINE_COMP_HID [device_section.Services] AddService = winehid,0x2,svc_section -- 2.33.0

2 7

[PATCH 1/7] server: Allow calling async_terminate() with STATUS_PENDING.
by Zebediah Figura 01 Sep '21

01 Sep '21

We still don't quite handle this completely correctly, but we should at least avoid crashing the server due to a failed assertion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 2 -- server/device.c | 1 - 2 files changed, 3 deletions(-) diff --git a/server/async.c b/server/async.c index 1c3082083ed..b414604fcd4 100644 --- a/server/async.c +++ b/server/async.c @@ -156,8 +156,6 @@ static void async_destroy( struct object *obj ) /* notifies client thread of new status of its async request */ void async_terminate( struct async *async, unsigned int status ) { - assert( status != STATUS_PENDING ); - if (async->terminated) return; async->terminated = 1; diff --git a/server/device.c b/server/device.c index b669921a003..ef93a0a9024 100644 --- a/server/device.c +++ b/server/device.c @@ -386,7 +386,6 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, if (!file) return; /* already finished */ - /* FIXME: handle the STATUS_PENDING case */ iosb->status = status; iosb->result = result; iosb->out_size = min( iosb->out_size, out_size ); -- 2.33.0

1 6

[PATCH 1/2] avicap32: Build with msvcrt.
by Zebediah Figura 01 Sep '21

01 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- There's a good chance that we'll want to move v4l handling to a kernel streaming infrastructure, which is the main reason I hadn't bothered converting avicap32 yet, but I'm not likely to get the time to do that research in the near future. dlls/avicap32/Makefile.in | 7 +- dlls/avicap32/avicap32_main.c | 135 +++++++-------------------------- dlls/avicap32/unixlib.h | 33 ++++++++ dlls/avicap32/v4l.c | 137 ++++++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+), 111 deletions(-) create mode 100644 dlls/avicap32/unixlib.h create mode 100644 dlls/avicap32/v4l.c diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index 8f5a1089d5c..a899a6207b0 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,4 +1,9 @@ MODULE = avicap32.dll IMPORTLIB = avicap32 +EXTRALIBS = -Wl,--subsystem,unixlib -C_SRCS = avicap32_main.c +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + avicap32_main.c \ + v4l.c diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..d4608138d8b 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -17,45 +17,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> -#include <stdio.h> -#include <fcntl.h> -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#include <errno.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#ifdef HAVE_ASM_TYPES_H -# include <asm/types.h> -#endif -#ifdef HAVE_LINUX_VIDEODEV2_H -# include <linux/videodev2.h> -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "vfw.h" -#include "winnls.h" #include "winternl.h" #include "wine/debug.h" -#define CAP_DESC_MAX 32 +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(avicap); +static unixlib_handle_t unix_handle; /*********************************************************************** * capCreateCaptureWindowW (AVICAP32.@) @@ -88,81 +63,6 @@ HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, return retW; } -#ifdef HAVE_LINUX_VIDEODEV2_H - -static int xioctl(int fd, int request, void * arg) -{ - int r; - - do r = ioctl (fd, request, arg); - while (-1 == r && EINTR == errno); - - return r; -} - -static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) -{ - int fd; - char device[16]; - struct stat st; - struct v4l2_capability caps; - - snprintf(device, sizeof(device), "/dev/video%i", devnum); - - if (stat (device, &st) == -1) { - /* This is probably because the device does not exist */ - WARN("%s: %s\n", device, strerror(errno)); - return FALSE; - } - - if (!S_ISCHR (st.st_mode)) { - ERR("%s: Not a device\n", device); - return FALSE; - } - - fd = open(device, O_RDWR | O_NONBLOCK); - if (fd == -1) { - ERR("%s: Failed to open: %s\n", device, strerror(errno)); - return FALSE; - } - - memset(&caps, 0, sizeof(caps)); - if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) { - BOOL isCaptureDevice; -#ifdef V4L2_CAP_DEVICE_CAPS - if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) - isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; - else -#endif - isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; - if (isCaptureDevice) { - lstrcpynA(name, (char *)caps.card, namesize); - snprintf(version, versionsize, "%s v%u.%u.%u", (char *)caps.driver, (caps.version >> 16) & 0xFF, - (caps.version >> 8) & 0xFF, caps.version & 0xFF); - } - close(fd); - return isCaptureDevice; - } - - if (errno != EINVAL && errno != 515) -/* errno 515 is used by some webcam drivers for unknown IOICTL command */ - ERR("%s: Querying failed: %s\n", device, strerror(errno)); - else ERR("%s: Querying failed: Not a V4L compatible device\n", device); - - close(fd); - return FALSE; -} - -#else /* HAVE_LINUX_VIDEODEV2_H */ - -static BOOL query_video_device(int devnum, char *name, int namesize, char *version, int versionsize) -{ - ERR("Video 4 Linux support not enabled\n"); - return FALSE; -} - -#endif /* HAVE_LINUX_VIDEODEV2_H */ - /*********************************************************************** * capGetDriverDescriptionA (AVICAP32.@) */ @@ -183,15 +83,30 @@ BOOL VFWAPI capGetDriverDescriptionA(WORD wDriverIndex, LPSTR lpszName, /*********************************************************************** * capGetDriverDescriptionW (AVICAP32.@) */ -BOOL VFWAPI capGetDriverDescriptionW(WORD wDriverIndex, LPWSTR lpszName, - INT cbName, LPWSTR lpszVer, INT cbVer) +BOOL VFWAPI capGetDriverDescriptionW(WORD index, WCHAR *name, int name_len, WCHAR *version, int version_len) { - char devname[CAP_DESC_MAX], devver[CAP_DESC_MAX]; + struct get_device_desc_params params; - if (!query_video_device(wDriverIndex, devname, CAP_DESC_MAX, devver, CAP_DESC_MAX)) return FALSE; + params.index = index; + if (__wine_unix_call(unix_handle, unix_get_device_desc, &params)) + return FALSE; - MultiByteToWideChar(CP_UNIXCP, 0, devname, -1, lpszName, cbName); - MultiByteToWideChar(CP_UNIXCP, 0, devver, -1, lpszVer, cbVer); - TRACE("Version: %s - Name: %s\n", debugstr_w(lpszVer), debugstr_w(lpszName)); - return TRUE; + TRACE("Found device name %s, version %s.\n", debugstr_w(params.name), debugstr_w(params.version)); + lstrcpynW(name, params.name, name_len); + lstrcpynW(version, params.version, version_len); + return TRUE; +} + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + NtQueryVirtualMemory(GetCurrentProcess(), instance, + MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL); + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; } diff --git a/dlls/avicap32/unixlib.h b/dlls/avicap32/unixlib.h new file mode 100644 index 00000000000..89ef1cc93f9 --- /dev/null +++ b/dlls/avicap32/unixlib.h @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/unixlib.h" + +#define CAP_DESC_MAX 32 + +struct get_device_desc_params +{ + WORD index; + WCHAR name[CAP_DESC_MAX]; + WCHAR version[CAP_DESC_MAX]; +}; + +enum unix_funcs +{ + unix_get_device_desc, +}; diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c new file mode 100644 index 00000000000..ab2694ae041 --- /dev/null +++ b/dlls/avicap32/v4l.c @@ -0,0 +1,137 @@ +/* + * Copyright 2002 Dmitry Timoshkov for CodeWeavers + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdarg.h> +#include <stdio.h> +#include <unistd.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_LINUX_VIDEODEV2_H +# include <linux/videodev2.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "wine/debug.h" + +#include "unixlib.h" + +#ifdef HAVE_LINUX_VIDEODEV2_H + +WINE_DEFAULT_DEBUG_CHANNEL(avicap); + +static int xioctl(int fd, int request, void *arg) +{ + int ret; + + do + ret = ioctl(fd, request, arg); + while (ret < 0 && errno == EINTR); + + return ret; +} + +static void v4l_umbstowcs(const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen) +{ + DWORD ret = ntdll_umbstowcs(src, srclen, dst, dstlen - 1); + + dst[ret] = 0; +} + +static NTSTATUS get_device_desc(void *args) +{ + struct get_device_desc_params *params = args; + struct v4l2_capability caps = {{0}}; + char device[16]; + struct stat st; + int fd; + + snprintf(device, sizeof(device), "/dev/video%u", params->index); + + if (stat(device, &st) < 0) + { + /* This is probably because the device does not exist */ + WARN("Failed to stat %s: %s\n", device, strerror(errno)); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + if (!S_ISCHR(st.st_mode)) + { + ERR("%s is not a character device.\n", device); + return STATUS_OBJECT_TYPE_MISMATCH; + } + + if ((fd = open(device, O_RDWR | O_NONBLOCK)) < 0) + { + ERR("%s: Failed to open: %s\n", device, strerror(errno)); + return STATUS_UNSUCCESSFUL; + } + + if (!xioctl(fd, VIDIOC_QUERYCAP, &caps)) + { + BOOL is_capture_device; +#ifdef V4L2_CAP_DEVICE_CAPS + if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) + is_capture_device = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; + else +#endif + is_capture_device = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; + if (is_capture_device) + { + char version[CAP_DESC_MAX]; + int ret; + + v4l_umbstowcs((char *)caps.card, strlen((char *)caps.card), + params->name, ARRAY_SIZE(params->name)); + + ret = snprintf(version, ARRAY_SIZE(version), "%s v%u.%u.%u", (char *)caps.driver, + (caps.version >> 16) & 0xff, (caps.version >> 8) & 0xff, caps.version & 0xff); + v4l_umbstowcs(version, ret, params->version, ARRAY_SIZE(params->version)); + } + close(fd); + return is_capture_device; + } + + /* errno 515 is used by some webcam drivers for unknown IOCTL commands. */ + ERR("Failed to get capabilities for %s: %s\n", device, strerror(errno)); + + close(fd); + return FALSE; +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_device_desc, +}; + +#endif /* HAVE_LINUX_VIDEODEV_2 */ -- 2.33.0

1 1

[PATCH vkd3d 2/5] vkd3d-shader/hlsl: Set the source name in hlsl_ctx_init().
by Henri Verbeet 01 Sep '21

01 Sep '21

Without this, HLSL compiler messages were missing the source name. For example, when attempting to compile gears.hlsl from the "gears" demo with vkd3d-compiler: ":33:17: E5000: syntax error, unexpected NEW_IDENTIFIER" Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 13ef6cf9..0d539600 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1694,8 +1694,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } -static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *profile, - struct vkd3d_shader_message_context *message_context) +static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, + const struct hlsl_profile_info *profile, struct vkd3d_shader_message_context *message_context) { memset(ctx, 0, sizeof(*ctx)); @@ -1705,7 +1705,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->source_files = hlsl_alloc(ctx, sizeof(*ctx->source_files)))) return false; - if (!(ctx->source_files[0] = hlsl_strdup(ctx, ""))) + if (!(ctx->source_files[0] = hlsl_strdup(ctx, source_name ? source_name : "<anonymous>"))) { vkd3d_free(ctx->source_files); return false; @@ -1800,7 +1800,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); - if (!hlsl_ctx_init(&ctx, profile, message_context)) + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) -- 2.20.1

2 1

[PATCH] wined3d: Make wined3d_context_vk_allocate_memory() static.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8df416851f2..705f789ed5f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -306,7 +306,7 @@ VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_cont return vk_memory; } -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, +static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e9f3884724..86c053df0db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,6 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, - unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, -- 2.30.2

2 1

[PATCH] windowscodecs: Make the png_{de,en}coder_*() functions static.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/libpng.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 0571f5a2aad..6496fa36436 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -203,7 +203,7 @@ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt } } -HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; @@ -484,14 +484,14 @@ end: return hr; } -HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct png_decoder *This = impl_from_decoder(iface); *info = This->decoder_frame; return S_OK; } -HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, +static HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct png_decoder *This = impl_from_decoder(iface); @@ -501,7 +501,7 @@ HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, prc, stride, buffersize, buffer); } -HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, +static HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { struct png_decoder *This = impl_from_decoder(iface); @@ -574,7 +574,7 @@ end: return hr; } -HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, +static HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct png_decoder *This = impl_from_decoder(iface); @@ -590,7 +590,7 @@ HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL png_decoder_destroy(struct decoder* iface) +static void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -738,7 +738,7 @@ static HRESULT CDECL png_encoder_initialize(struct encoder *encoder, IStream *st return S_OK; } -HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) +static HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -869,7 +869,7 @@ static HRESULT CDECL png_encoder_create_frame(struct encoder *encoder, const str return S_OK; } -HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) +static HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) { struct png_encoder *This = impl_from_encoder(encoder); jmp_buf jmpbuf; -- 2.30.2

2 1

[PATCH 0/3] Let 64bit dbghelp handle a 32bit target
by Eric Pouech 01 Sep '21

01 Sep '21

Allow 64bit dbghelp handle a 32bit target on WOW64 context The good news is that the serie is rather small. Improvements on last patch are welcomed :-( A+ --- Eric Pouech (3): dbghelp: split storage of PE header dbghelp: now storing the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64 dlls/dbghelp/dbghelp.c | 58 +++++++++++++++++++++++++++++++++--- dlls/dbghelp/image_private.h | 6 +++- dlls/dbghelp/pe_module.c | 37 ++++++++++++++++------- 3 files changed, 86 insertions(+), 15 deletions(-)

5 10

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Write SM4 multiplication instructions.
by Zebediah Figura 01 Sep '21

01 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 32a4eda1..af1660f1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -957,6 +957,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_OP2_MUL: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.33.0

7 26

[PATCH v2 1/5] winemac.drv: Enable layer-backed views.
by Chip Davis 01 Sep '21

01 Sep '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d5434b8a966..bc06a9506ee 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -311,6 +311,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +#ifndef MAC_OS_X_VERSION_10_14 +@protocol NSViewLayerContentScaleDelegate <NSObject> +@optional + + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window; + +@end +#endif + + @interface WineBaseView : NSView @end @@ -327,7 +337,7 @@ - (id) initWithFrame:(NSRect)frame device:(id<MTLDevice>)device; #endif -@interface WineContentView : WineBaseView <NSTextInputClient> +@interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -339,6 +349,7 @@ @interface WineContentView : WineBaseView <NSTextInputClient> NSMutableAttributedString* markedText; NSRange markedTextSelection; + BOOL _retinaMode; int backingSize[2]; #ifdef HAVE_METAL_METAL_H @@ -688,9 +699,15 @@ - (void) setRetinaMode:(int)mode [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; + _retinaMode = !!mode; [super setRetinaMode:mode]; } + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window + { + return (_retinaMode || newScale == 1.0); + } + - (void) viewDidHide { [super viewDidHide]; @@ -1002,6 +1019,7 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; if (!contentView) return nil; + [contentView setWantsLayer:YES]; [contentView setAutoresizesSubviews:NO]; /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES @@ -3576,6 +3594,7 @@ macdrv_view macdrv_create_view(CGRect rect) NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + [view setWantsLayer:YES]; [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES]; -- 2.33.0

2 5

[PATCH v2 1/2] jscript: Allow ES5 keywords in identifiers.
by Gabriel Ivăncescu 01 Sep '21

01 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- So, I managed to solve all the extra shift/reduce conflicts, but I'm not entirely happy about how I've done it, and I can't for the life of me figure out WHY, so I'm hoping by sending it some review might help me out of this situation. I tried bison with --report=all and verbose, and I don't know how to solve that conflict. The problem is in LabelledStatement; for some reason I cannot comprehend, I had to duplicate all the ES5 keywords and use tIdentifier as separate rules to avoid any extra shift/reduce conflicts from it. Using just "Identifier" would generate two extra shift/reduce conflicts! Using "tIdentifier | ES5Keyword" would generate only one extra shift/reduce conflict. And using "tIdentifier | kGET | kSET | kLET" generates no extra conflicts (this patch). I think I'm going crazy; isn't it supposed to be the same thing? Why the difference? Any ideas? dlls/jscript/parser.y | 44 ++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0ebdc2b..34ad532 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -220,7 +220,7 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <expr> MemberExpression %type <expr> PrimaryExpression %type <expr> GetterSetterMethod -%type <identifier> Identifier_opt +%type <identifier> Identifier Identifier_opt %type <variable_list> VariableDeclarationList %type <variable_list> VariableDeclarationListNoIn %type <variable_declaration> VariableDeclaration @@ -240,10 +240,11 @@ static expression_t *new_prop_and_value_expression(parser_ctx_t*,property_list_t %type <literal> PropertyName %type <literal> BooleanLiteral %type <ival> AssignOper -%type <identifier> IdentifierName ReservedAsIdentifier +%type <identifier> IdentifierName ReservedAsIdentifier ES5Keyword %nonassoc LOWER_THAN_ELSE -%nonassoc kELSE +%nonassoc kELSE kIN kINSTANCEOF ':' +%nonassoc kGET kLET kSET %% @@ -267,9 +268,9 @@ FunctionStatementList FunctionExpression : kFUNCTION left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, NULL, $3, $6, NULL, ctx->begin + @1, @7 - @1 + 1); } - | kFUNCTION tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, NULL, ctx->begin + @1, @8 - @1 + 1); } - | kFUNCTION tIdentifier kDCOL tIdentifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + | kFUNCTION Identifier kDCOL Identifier left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $4, $6, $9, $2, ctx->begin + @1, @10 - @1 + 1); } /* ECMA-262 10th Edition 14.1 */ @@ -278,8 +279,8 @@ FunctionBody /* ECMA-262 3rd Edition 13 */ FormalParameterList - : tIdentifier { $$ = new_parameter_list(ctx, $1); } - | FormalParameterList ',' tIdentifier + : Identifier { $$ = new_parameter_list(ctx, $1); } + | FormalParameterList ',' Identifier { $$ = parameter_list_add(ctx, $1, $3); } /* ECMA-262 3rd Edition 13 */ @@ -380,12 +381,12 @@ VariableDeclarationListNoIn /* ECMA-262 3rd Edition 12.2 */ VariableDeclaration - : tIdentifier Initialiser_opt + : Identifier Initialiser_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationNoIn - : tIdentifier InitialiserNoIn_opt + : Identifier InitialiserNoIn_opt { $$ = new_variable_declaration(ctx, $1, $2); } /* ECMA-262 3rd Edition 12.2 */ @@ -478,6 +479,12 @@ WithStatement LabelledStatement : tIdentifier ':' Statement { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kGET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kSET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } + | kLET ':' Statement + { $$ = new_labelled_statement(ctx, @$, $1, $3); } /* ECMA-262 3rd Edition 12.11 */ SwitchStatement @@ -526,7 +533,7 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH left_bracket tIdentifier right_bracket Block + : kCATCH left_bracket Identifier right_bracket Block { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ @@ -785,7 +792,7 @@ ArgumentList /* ECMA-262 3rd Edition 11.1 */ PrimaryExpression : kTHIS { $$ = new_expression(ctx, EXPR_THIS, 0); } - | tIdentifier { $$ = new_identifier_expression(ctx, $1); } + | Identifier { $$ = new_identifier_expression(ctx, $1); } | Literal { $$ = new_literal_expression(ctx, $1); } | ArrayLiteral { $$ = $1; } | ObjectLiteral { $$ = $1; } @@ -859,7 +866,11 @@ PropertyName /* ECMA-262 3rd Edition 7.6 */ Identifier_opt : /* empty*/ { $$ = NULL; } - | tIdentifier { $$ = $1; } + | Identifier { $$ = $1; } + +Identifier + : tIdentifier { $$ = $1; } + | ES5Keyword { $$ = $1; } /* ECMA-262 5.1 Edition 7.6 */ IdentifierName @@ -889,15 +900,12 @@ ReservedAsIdentifier | kFINALLY { $$ = $1; } | kFOR { $$ = $1; } | kFUNCTION { $$ = $1; } - | kGET { $$ = $1; } | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } - | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } - | kSET { $$ = $1; } | kSWITCH { $$ = $1; } | kTHIS { $$ = $1; } | kTHROW { $$ = $1; } @@ -908,6 +916,12 @@ ReservedAsIdentifier | kVOID { $$ = $1; } | kWHILE { $$ = $1; } | kWITH { $$ = $1; } + | ES5Keyword { $$ = $1; } + +ES5Keyword + : kGET { $$ = $1; } + | kLET { $$ = $1; } + | kSET { $$ = $1; } /* ECMA-262 3rd Edition 7.8 */ Literal -- 2.31.1

2 2

[PATCH 0/5] winemac.drv: Layer-backed views
by Chip Davis 01 Sep '21

01 Sep '21

3 10

[PATCH 6/6] gdi32: Move CombineTransform to objects.c.
by Jacek Caban 01 Sep '21

01 Sep '21

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 52 +------------------------------------- dlls/gdi32/mapping.c | 22 ++++++++++++++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 24 ++++++++++++++++++ 5 files changed, 48 insertions(+), 54 deletions(-)

2 1

[PATCH 5/6] gdi32: Copy TranslateCharsetInfo to text.c.
by Jacek Caban 01 Sep '21

01 Sep '21

And use a separated copy in ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 96 ++++++++++++++++---------------------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/text.c | 82 ++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 58 deletions(-)

2 1

[PATCH 4/6] gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- dlls/gdi32/text.c | 16 ++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-)

2 1

[PATCH 3/6] gdi32: Use NtGdiAddFontMemResourceEx for AddFontMemResourceEx.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 19 ++++++++++--------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 8 ++++++++ include/ntgdi.h | 3 +++ 4 files changed, 22 insertions(+), 10 deletions(-)

2 1

[PATCH 2/6] gdi32: Use NtGdiEnumFonts for EnumFontFamiliesExW.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 100 +++++++++++++++++++++------------------------- dlls/gdi32/text.c | 43 ++++++++++++++++++++ include/ntgdi.h | 9 +++++ 3 files changed, 98 insertions(+), 54 deletions(-)

2 2

[PATCH 1/6] gdi32: Use EnumFontFamiliesExW for EnumFontFamiliesExA.
by Jacek Caban 01 Sep '21

01 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 119 +--------------------------------------------- dlls/gdi32/text.c | 73 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 117 deletions(-)

2 1

[PATCH 2/3] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
by Dmitry Timoshkov 01 Sep '21

01 Sep '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/dialogs.c | 5 +---- dlls/wininet/tests/internet.c | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7af1bcd59f9..25ed1f2a651 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -498,7 +498,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) break; if(!req) - return ERROR_INVALID_HANDLE; + return ERROR_INVALID_PARAMETER; switch(req->status_code) { case HTTP_STATUS_PROXY_AUTH_REQ: @@ -523,9 +523,6 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, res = ERROR_CANCELLED; break; } - if(!req) - return ERROR_INVALID_HANDLE; - if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) FIXME("%08x contains unsupported flags.\n", dwFlags); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 6b8eefc0b78..f7d7f1f49d7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1595,7 +1595,6 @@ static void test_InternetErrorDlg(void) res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) @@ -1608,7 +1607,8 @@ static void test_InternetErrorDlg(void) i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && - i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION && + i != ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } -- 2.31.1

1 0

[PATCH vkd3d 5/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_dxbc_binary_to_text().
by Henri Verbeet 01 Sep '21

01 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 78ec1c18..3b01b531 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1771,7 +1771,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { enum vkd3d_shader_compile_option_formatting_flags formatting; @@ -1831,17 +1831,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; - shader_sm4_read_header(data, &ptr, shader_version); + shader_sm4_read_header(parser->data, &ptr, shader_version); vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; - while (!shader_sm4_is_end(data, &ptr)) + while (!shader_sm4_is_end(parser->data, &ptr)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(data, &ptr, &ins); + shader_sm4_read_instruction(parser->data, &ptr, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); @@ -1905,7 +1905,7 @@ void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0cfe1eaf..36c211e6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1051,7 +1051,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser.data, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser, compile_info, out); vkd3d_shader_parser_destroy(&parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6c40efa9..97c1999b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -910,7 +910,7 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, +enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); -- 2.20.1

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Pass a vkd3d_shader_parser structure to vkd3d_shader_trace().
by Henri Verbeet 01 Sep '21

01 Sep '21

Mostly to avoid passing around void pointers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 10 +--------- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 26bc7885..78ec1c18 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1900,12 +1900,12 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, return result; } -void vkd3d_shader_trace(void *data) +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) { const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(data, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(parser->data, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e28cfad8..0cfe1eaf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -367,14 +367,6 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, shader_get_source_type_suffix(source_type), shader->code, shader->size); } -struct vkd3d_shader_parser -{ - struct vkd3d_shader_desc shader_desc; - struct vkd3d_shader_version shader_version; - void *data; - const DWORD *ptr; -}; - static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) { @@ -960,7 +952,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } if (TRACE_ON()) - vkd3d_shader_trace(parser.data); + vkd3d_shader_trace(&parser); while (!shader_sm4_is_end(parser.data, &parser.ptr)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e195c12a..6c40efa9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -874,7 +874,15 @@ static inline bool vkd3d_shader_register_is_output(const struct vkd3d_shader_reg return reg->type == VKD3DSPR_OUTPUT || reg->type == VKD3DSPR_COLOROUT; } -void vkd3d_shader_trace(void *data); +struct vkd3d_shader_parser +{ + struct vkd3d_shader_desc shader_desc; + struct vkd3d_shader_version shader_version; + void *data; + const uint32_t *ptr; +}; + +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); const char *shader_get_type_prefix(enum vkd3d_shader_type type); -- 2.20.1

1 0

[PATCH vkd3d 3/5] vkd3d-shader: Only use scan_dxbc() for scanning dxbc-tpf source.
by Henri Verbeet 01 Sep '21

01 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- It's clearly not going to work for e.g. HLSL. libs/vkd3d-shader/vkd3d_shader_main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 5fab5151..e28cfad8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1006,7 +1006,22 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char vkd3d_shader_message_context_init(&message_context, compile_info->log_level); - ret = scan_dxbc(compile_info, &message_context); + switch (compile_info->source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + ret = scan_dxbc(compile_info, &message_context); + break; + + case VKD3D_SHADER_SOURCE_HLSL: + FIXME("HLSL support not implemented.\n"); + ret = VKD3D_ERROR_NOT_IMPLEMENTED; + break; + + default: + ERR("Unsupported source type %#x.\n", compile_info->source_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + break; + } vkd3d_shader_message_context_trace_messages(&message_context); if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) -- 2.20.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Dump HLSL shaders with a ".hlsl" suffix.
by Henri Verbeet 01 Sep '21

01 Sep '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 27 +++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 7b246bfd..13ef6cf9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1798,7 +1798,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_NOT_IMPLEMENTED; } - vkd3d_shader_dump_shader(profile->type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 16994d20..5fab5151 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -310,7 +310,8 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value memcpy(buffer->data + offset, &value, sizeof(value)); } -static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const void *data, size_t size) +static void vkd3d_shader_dump_blob(const char *path, const char *prefix, + const char *suffix, const void *data, size_t size) { static int shader_id = 0; char filename[1024]; @@ -319,7 +320,7 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v id = InterlockedIncrement(&shader_id) - 1; - snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id); + snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.%s", path, prefix, id, suffix); if ((f = fopen(filename, "wb"))) { if (fwrite(data, 1, size, f) != size) @@ -333,7 +334,22 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v } } -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +static const char *shader_get_source_type_suffix(enum vkd3d_shader_source_type type) +{ + switch (type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + return "dxbc"; + case VKD3D_SHADER_SOURCE_HLSL: + return "hlsl"; + default: + FIXME("Unhandled source type %#x.\n", type); + return "bin"; + } +} + +void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, + enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader) { static bool enabled = true; const char *path; @@ -347,7 +363,8 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_sh return; } - vkd3d_shader_dump_blob(path, shader_get_type_prefix(type), shader->code, shader->size); + vkd3d_shader_dump_blob(path, shader_get_type_prefix(shader_type), + shader_get_source_type_suffix(source_type), shader->code, shader->size); } struct vkd3d_shader_parser @@ -1022,7 +1039,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return ret; } - vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); + vkd3d_shader_dump_shader(compile_info->source_type, parser.shader_version.type, &compile_info->source); if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54ac5326..e195c12a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -975,7 +975,8 @@ void vkd3d_shader_vnote(struct vkd3d_shader_message_context *context, const stru void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args); -void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader); +void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, + enum vkd3d_shader_type shader_type, const struct vkd3d_shader_code *shader); int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc); -- 2.20.1

1 0

[PATCH v3] shlwapi/tests: Remove SHFormatDateTimeA() crash test.
by Francois Gouget 01 Sep '21

01 Sep '21

SHFormatDateTimeA() crashes when given a NULL input pointer which is not really useful to know. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v3: Remove the test instead of documenting it. See: https://www.winehq.org/pipermail/wine-devel/2021-September/194251.html --- dlls/shlwapi/tests/ordinal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..0284800e10f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,12 +1674,6 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ - pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} - GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); /* SHFormatDateTime expects input as utc */ -- 2.30.2

2 1

[PATCH] shlwapi/tests: Test a NULL flags pointer for SHFormatDateTime().
by Francois Gouget 01 Sep '21

01 Sep '21

It's equivalent to FDTF_DEFAULT. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shlwapi/tests/ordinal.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8a294ec1751..187167dcb2a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1715,6 +1715,21 @@ static void test_SHFormatDateTimeA(void) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + flags = FDTF_DEFAULT; + ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); + ok(ret == lstrlenA(buff)+1, "got %d\n", ret); + + buff2[0] = '\0'; + flags = FDTF_SHORTDATE | FDTF_SHORTTIME; + ret = pSHFormatDateTimeA(&filetime, &flags, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + + buff2[0] = '\0'; + ret = pSHFormatDateTimeA(&filetime, NULL, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + /* now check returned strings */ flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); -- 2.30.2

2 1

[PATCH] msi: Remove CDECL on static functions where not needed.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 41c82af1b59..cc4648481ba 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -271,7 +271,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) return -1; } -static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row; -- 2.30.2

2 1

[PATCH 4/7] comctl32: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Zhiyi Zhang 01 Sep '21

01 Sep '21

If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/hotkey.c | 2 +- dlls/comctl32/toolbar.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ac5268f146c..f8827d4e26c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1317,7 +1317,7 @@ static LRESULT DATETIME_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 7421ff6ef65..7808660e7f5 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -434,7 +434,7 @@ HOTKEY_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cf1dc42449b..2ae70ad4f3e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5313,7 +5313,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (hwnd)); TOOLBAR_CheckStyle (infoPtr); @@ -6550,7 +6550,7 @@ TOOLBAR_SysColorChange (void) static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) { CloseThemeData (infoPtr->hTheme); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (infoPtr->hwndSelf)); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; } -- 2.30.2

2 3

[PATCH] winebus.sys: Make hid_descriptor_append() static.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/hid.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 803ffaad132..fbf899c0c99 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -64,7 +64,6 @@ struct hid_descriptor SIZE_T max_size; }; -extern BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) DECLSPEC_HIDDEN; extern BOOL hid_descriptor_begin(struct hid_descriptor *desc, USAGE usage_page, USAGE usage) DECLSPEC_HIDDEN; extern BOOL hid_descriptor_end(struct hid_descriptor *desc) DECLSPEC_HIDDEN; extern void hid_descriptor_free(struct hid_descriptor *desc) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 1a245031d4d..b92df2d5d2c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -29,7 +29,7 @@ #include "bus.h" -BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) +static BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) { BYTE *tmp = desc->data; -- 2.30.2

2 1

[PATCH v9 2/2] user32: Don't save maximized pos of top-level wnds covering whole work rect.
by Huw Davies 01 Sep '21

01 Sep '21

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++--------- dlls/user32/winpos.c | 50 +++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 228395e0469..e23ab8137f8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11624,8 +11624,9 @@ static void test_IsWindowEnabled(void) static void test_window_placement(void) { - RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect; + RECT orig = {100, 200, 300, 400}, orig2 = {200, 300, 400, 500}, rect, work_rect; WINDOWPLACEMENT wp = {sizeof(wp)}; + MONITORINFO mon_info; HWND hwnd; BOOL ret; @@ -11633,6 +11634,10 @@ static void test_window_placement(void) orig.left, orig.top, orig.right - orig.left, orig.bottom - orig.top, 0, 0, 0, 0); ok(!!hwnd, "failed to create window, error %u\n", GetLastError()); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY), &mon_info); + work_rect = mon_info.rcWork; + ret = GetWindowPlacement(hwnd, &wp); ok(ret, "failed to get window placement, error %u\n", GetLastError()); ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); @@ -11675,7 +11680,6 @@ static void test_window_placement(void) ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11693,6 +11697,42 @@ todo_wine ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", wine_dbgstr_rect(&wp.rcNormalPosition)); + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left - 1, + work_rect.bottom - work_rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + + SetWindowPos(hwnd, 0, work_rect.left, work_rect.top, work_rect.right - work_rect.left, + work_rect.bottom - work_rect.top - 1, SWP_NOZORDER | SWP_NOACTIVATE); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "failed to get window placement, error %u\n", GetLastError()); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); + ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, + "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); + ok(wp.ptMaxPosition.x == work_rect.left && wp.ptMaxPosition.y == work_rect.top, + "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); + ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", + wine_dbgstr_rect(&wp.rcNormalPosition)); + ShowWindow(hwnd, SW_MINIMIZE); ret = GetWindowPlacement(hwnd, &wp); @@ -11701,7 +11741,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11714,7 +11753,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11727,7 +11765,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11745,7 +11782,6 @@ todo_wine ok(wp.showCmd == SW_SHOWNORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11761,7 +11797,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig2), "got normal pos %s\n", @@ -11783,7 +11818,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11804,7 +11838,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMAXIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == 100 && wp.ptMinPosition.y == 100, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11825,7 +11858,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11839,7 +11871,6 @@ todo_wine ok(wp.showCmd == SW_SHOWMINIMIZED, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", @@ -11854,7 +11885,6 @@ todo_wine ok(wp.showCmd == SW_NORMAL, "got show cmd %u\n", wp.showCmd); ok(wp.ptMinPosition.x == -32000 && wp.ptMinPosition.y == -32000, "got minimized pos (%d,%d)\n", wp.ptMinPosition.x, wp.ptMinPosition.y); -todo_wine ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "got maximized pos (%d,%d)\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); ok(EqualRect(&wp.rcNormalPosition, &orig), "got normal pos %s\n", diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bc8c35afc58..fa2f7e6fede 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1285,6 +1285,47 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, } +static RECT get_maximized_work_rect( HWND hwnd ) +{ + RECT work_rect = { 0 }; + + if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_MINIMIZE | WS_MAXIMIZE)) == WS_MAXIMIZE) + { + if (!get_work_rect( hwnd, &work_rect )) + work_rect = get_primary_monitor_rect(); + } + return work_rect; +} + + +/******************************************************************* + * update_maximized_pos + * + * For top level windows covering the work area, we might have to + * "forget" the maximized position. Windows presumably does this + * to avoid situations where the border style changes, which would + * lead the window to be outside the screen, or the window gets + * reloaded on a different screen, and the "saved" position no + * longer applies to it (despite being maximized). + * + * Some applications (e.g. Imperiums: Greek Wars) depend on this. + */ +static void update_maximized_pos( WND *wnd, RECT *work_rect ) +{ + if (wnd->parent && wnd->parent != GetDesktopWindow()) + return; + + if (wnd->dwStyle & WS_MAXIMIZE) + { + if (wnd->window_rect.left <= work_rect->left && wnd->window_rect.top <= work_rect->top && + wnd->window_rect.right >= work_rect->right && wnd->window_rect.bottom >= work_rect->bottom) + wnd->max_pos.x = wnd->max_pos.y = -1; + } + else + wnd->max_pos.x = wnd->max_pos.y = -1; +} + + /*********************************************************************** * GetWindowPlacement (USER32.@) * @@ -1293,6 +1334,7 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, */ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { + RECT work_rect = get_maximized_work_rect( hwnd ); WND *pWnd = WIN_GetPtr( hwnd ); if (!pWnd) return FALSE; @@ -1350,6 +1392,7 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) { pWnd->normal_rect = pWnd->window_rect; } + update_maximized_pos( pWnd, &work_rect ); wndpl->length = sizeof(*wndpl); if( pWnd->dwStyle & WS_MINIMIZE ) @@ -1421,6 +1464,7 @@ static void make_point_onscreen( POINT *pt ) static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT flags ) { DWORD style; + RECT work_rect = get_maximized_work_rect( hwnd ); WND *pWnd = WIN_GetPtr( hwnd ); WINDOWPLACEMENT wp = *wndpl; @@ -1438,7 +1482,11 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; if (flags & PLACE_MIN) pWnd->min_pos = point_thread_to_win_dpi( hwnd, wp.ptMinPosition ); - if (flags & PLACE_MAX) pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + if (flags & PLACE_MAX) + { + pWnd->max_pos = point_thread_to_win_dpi( hwnd, wp.ptMaxPosition ); + update_maximized_pos( pWnd, &work_rect ); + } if (flags & PLACE_RECT) pWnd->normal_rect = rect_thread_to_win_dpi( hwnd, wp.rcNormalPosition ); style = pWnd->dwStyle; -- 2.23.0

2 1

[tools 1/3] winetest/build-patterns: Take the distance between key colors into account.
by Francois Gouget 01 Sep '21

01 Sep '21

To get a uniform color gradient, fewer colors should be squeezed between close key colors than between distant ones. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- There are two issues with the current pattern colors: * We have lots of blue/green colors which are hard to distinguish. * We have few colors in the yellow/red range despite those being easier to distinguish. This is in part because we don't take the space between key colors into account, but mainly because interpolating in the RGB colorspace does not yield good results. So the goal of this patchset is to make it easier to distinguish the pattern colors by fixing these two issues. --- winetest/build-patterns | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 2ee5d5bdd..ff72516f6 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -872,6 +872,13 @@ sub blend($$$) return $r; } +sub distance($$) +{ + my ($a, $b) = @_; + return sqrt(($b->[0] - $a->[0])**2 + + ($b->[1] - $a->[1])**2 + + ($b->[2] - $a->[2])**2); +} # Use colors to differentiate the set values. Each unique value is assigned # a color (in HTML format) picked along a series of gradients passing by the @@ -897,19 +904,33 @@ sub compute_set_colors($) # when many colors are needed. $keycolors[0] = [0, 179, 179] if ($count > 10); + # Compute the total length of the path traced by the key colors through + # the colorspace. This is necessary so the gradient remains uniform + # even if two key colors are close to each other. This does assume that + # the path does not zigzag too much: (0,0,0)->(255,0,0)->(1,0,0) cannot + # produce a meaningful gradient. + my @keypos = (0); + for (my $i = 1; $i < @keycolors; $i++) + { + my $d = distance($keycolors[$i - 1], $keycolors[$i]); + $keypos[$i] = $keypos[$i - 1] + $d; + } + my $k = 0; - my ($start, $end) = (-1, 0); for (0..$count-1) { - while (!$end or $_ > $end) + # Compute the position of the current item on the path + my $pos = $_ / ($count - 1) * $keypos[-1]; + + # Figure out which segment of the path this corresponds to + while ($pos > $keypos[$k+1] and $k+1 < @keycolors-1) { $k++; - $start = $end; - $end = ($count-1) * $k / (@keycolors-1); } - $set->{$values[$_]} = color2html(blend(($_-$start)/($end-$start), - $keycolors[$k-1], - $keycolors[$k])); + + # And blend + my $Rgb = blend(($pos - $keypos[$k]) / ($keypos[$k+1] - $keypos[$k]), $keycolors[$k], $keycolors[$k+1]); + $set->{$values[$_]} = color2html($Rgb); } } } -- 2.30.2

1 3

[PATCH v8 1/2] user32: Retrieve the work rect for placements in a helper function.
by Gabriel Ivăncescu 01 Sep '21

01 Sep '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/winpos.c | 45 ++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b..33a7de5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + style = GetWindowLongW( hwnd, GWL_STYLE ); + *rect = mon_info.rcMonitor; + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) -- 2.31.1

3 4

[PATCH] wininet: Set context length for http status 403
by Alistair Leslie-Hughes 01 Sep '21

01 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 203afb7d312..49c57a9c4e5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2927,7 +2927,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d0bf7f94250..c21896e70a1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2421,6 +2421,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3733,6 +3738,37 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6358,6 +6394,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH v9 1/2] user32: Add a helper to retrieve the work rect.
by Huw Davies 01 Sep '21

01 Sep '21

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/winpos.c | 45 ++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b5964..bc8c35afc58 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + *rect = mon_info.rcMonitor; + + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) -- 2.23.0

1 0

[PATCH] shell32: Fix a couple of ASCII / ANSI mixups in comments.
by Francois Gouget 01 Sep '21

01 Sep '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Resubmitting: the first try had an email encoding issue. --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 1/2] kernel32/tests: Test stack overflow by DefineDosDeviceW().
by Xu Wei 01 Sep '21

01 Sep '21

Signed-off-by: Xu Wei <xuwei(a)uniontech.com> --- dlls/kernel32/tests/volume.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb35de6add1..f8e0fdc0582 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -185,6 +185,11 @@ static void test_dos_devices(void) ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + ret = DefineDosDeviceA(DDD_RAW_TARGET_PATH, "{00000001-0000-0000-0000-5E3B001A0145}", "\\Device\\{00000001-0000-0000-0000-5E3B001A0145}"); + ok(ret, "failed to define drive %s, error %u\n", drivestr, GetLastError()); + + } static void test_FindFirstVolume(void) -- 2.20.1

1 1

[PATCH] advapi32/tests: Fix some Perflib subkey tests.
by Francois Gouget 01 Sep '21

01 Sep '21

Some languages don't have a subkey (e.g. German), and for others the subkey is the full language id rather than the primary language id (e.g. Portuguese). Furthermore there should be a CurrentLanguage key with localized values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This should fix the failures on w7u-pt-PT. https://test.winehq.org/data/patterns.html#advapi32:registry --- dlls/advapi32/tests/registry.c | 64 ++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5ed220095bb..b6f906fd689 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3929,10 +3929,11 @@ static void test_perflib_key(void) HKEY perflib_key, key, key2; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; - char lang_name[4]; + char lang_name[5]; + const char *knames[2] = {"009", "CurrentLanguage"}; char *buffer; DWORD size; - LONG ret; + LONG ret, l; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); @@ -4027,21 +4028,70 @@ static void test_perflib_key(void) else ok(!ret, "got %#x\n", ret); - /* multilingual support was not really completely thought through */ + for (l = 0; l < ARRAY_SIZE(knames); l++) + { + winetest_push_context("%d", l); + todo_wine_if(l == 1) { + ret = RegOpenKeyExA(perflib_key, knames[l], 0, KEY_READ, &key); + ok(!ret, "got %u\n", ret); + if (is_special_key(key)) + { + size = buffer_size; + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + ok(!ret, "got %u\n", ret); + if (!ret) + { + char *str; + int c = 0; + for (str = buffer; *str; str += strlen(str) + 1) + c++; + /* Note that the two keys may not have the same number of + * entries if they are in different languages. + */ + ok(c >= 2 && (c % 2) == 0, "%d is not a valid number of entries in %s\n", c, knames[l]); + trace("%s has %d entries\n", knames[l], c); + } + } + else + { + /* Windows 7 does not always return a special key for 009 + * when running without elevated privileges. + */ + ok(broken(l == 0), "expected a special handle, got %p\n", key); + } + + ret = RegCloseKey(key); + ok(!ret, "got %u\n", ret); + } + winetest_pop_context(); + } - sprintf(lang_name, "%03x", primary_lang); - if (primary_lang != LANG_ENGLISH) + /* multilingual support was not really completely thought through */ + switch (primary_lang) + { + case LANG_PORTUGUESE: + case LANG_CHINESE: + sprintf(lang_name, "%04x", GetUserDefaultLangID()); + break; + default: + sprintf(lang_name, "%03x", primary_lang); + break; + } + if (primary_lang != LANG_ENGLISH && + !RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key)) { - ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); - todo_wine ok(!ret, "got %u\n", ret); ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + size = buffer_size; ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); ret = RegCloseKey(key); todo_wine ok(!ret, "got %u\n", ret); } + /* else some languages don't have their own key. The keys are not really + * usable anyway so assume it does not really matter. + */ ret = RegCloseKey(perflib_key); ok(!ret, "got %u\n", ret); -- 2.30.2

1 0

[PATCH 7/7] uxtheme: Get DPI from theme class.
by Zhiyi Zhang 01 Sep '21

01 Sep '21

Fix Command Link glyphs not scaled according to DPI because a NULL device context handle was passed to GetThemePartSize() and GetThemePartSize() was using a device context to get DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 36 ++++++++++++++++++------------------ dlls/uxtheme/msstyles.c | 10 ++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 1 - 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4394f4943b7..a03217b65cf 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -172,7 +172,7 @@ static int imagefile_index_to_property(int index) * * Select the image to use */ -static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { PTHEME_PROPERTY tp; @@ -193,14 +193,15 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(imageselecttype == IST_DPI) { int reqdpi = 0; - int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); + int dpi = MSSTYLES_GetThemeDPI(hTheme); for (i = 7; i >= 1; i--) { reqdpi = 0; if (SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, mindpi_index_to_property(i), &reqdpi))) { - if(reqdpi != 0 && screendpi >= reqdpi) { + if (reqdpi != 0 && dpi >= reqdpi) + { TRACE("Using %d DPI, image %d\n", reqdpi, imagefile_index_to_property(i)); if (imageDpi) @@ -269,9 +270,9 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, * * Load image for part/state */ -static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, - const RECT *pRect, BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, - BOOL *hasImageAlpha, int *imageDpi) +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, + BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, BOOL *hasImageAlpha, + int *imageDpi) { int imagelayout = IL_HORIZONTAL; int imagecount = 1; @@ -280,7 +281,7 @@ static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iState WCHAR szPath[MAX_PATH]; PTHEME_PROPERTY tp; - tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph, imageDpi); + tp = UXTHEME_SelectImage(hTheme, iPartId, iStateId, pRect, glyph, imageDpi); if(!tp) { FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); return E_PROP_ID_UNSUPPORTED; @@ -528,7 +529,7 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, POINT topleft; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -594,9 +595,8 @@ static HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId, * * Used by GetThemePartSize and UXTHEME_DrawImageBackground */ -static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, - int iStateId, RECT *prc, THEMESIZE eSize, - POINT *psz) +static HRESULT get_image_part_size(HTHEME hTheme, int iPartId, int iStateId, RECT *prc, + THEMESIZE eSize, POINT *psz) { int imageDpi, dstDpi; HRESULT hr = S_OK; @@ -604,7 +604,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, RECT rcSrc; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, &imageDpi); if (FAILED(hr)) return hr; @@ -627,8 +627,8 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, { /* Scale to DPI only if the destination DPI exceeds the source DPI by * stretchMark percent */ - dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); - if (dstDpi && dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) + dstDpi = MSSTYLES_GetThemeDPI(hTheme); + if (dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) { srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); @@ -707,7 +707,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, COLORREF transparentcolor = 0; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -731,7 +731,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, if(sizingtype == ST_TRUESIZE) { int valign = VA_CENTER, halign = HA_CENTER; - get_image_part_size (hTheme, hdc, iPartId, iStateId, pRect, TS_DRAW, &drawSize); + get_image_part_size(hTheme, iPartId, iStateId, pRect, TS_DRAW, &drawSize); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); @@ -2072,7 +2072,7 @@ HRESULT WINAPI GetThemePartSize(HTHEME hTheme, HDC hdc, int iPartId, if (bgtype == BT_NONE) /* do nothing */; else if(bgtype == BT_IMAGEFILE) - hr = get_image_part_size (hTheme, hdc, iPartId, iStateId, prc, eSize, &size); + hr = get_image_part_size(hTheme, iPartId, iStateId, prc, eSize, &size); else if(bgtype == BT_BORDERFILL) hr = get_border_background_size (hTheme, iPartId, iStateId, eSize, &size); else { @@ -2183,7 +2183,7 @@ BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, if (bgtype != BT_IMAGEFILE) return FALSE; - if (FAILED(UXTHEME_LoadImage(hTheme, 0, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, + if (FAILED(UXTHEME_LoadImage(hTheme, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL))) return FALSE; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 99eda64233c..efabd06f7c0 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -247,6 +247,16 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) return UXINI_LoadINI(tf->hTheme, L"themes_ini"); } +/*********************************************************************** + * MSSTYLES_GetThemeDPI + * + * Retrieves the DPI from a theme handle when it was opened + */ +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) +{ + return tc->dpi; +} + /*********************************************************************** * MSSTYLES_GetActiveThemeIni * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 1cb27b93ab3..12292cefae4 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -94,6 +94,7 @@ BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwI BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 584a71a82b4..f9bf371e6bf 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1030,7 +1030,6 @@ static void test_GetThemePartSize(void) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); hr = GetThemePartSize(htheme, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size2); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(size2.cx == size.cx && size2.cy == size.cy, "Expected size %dx%d, got %dx%d.\n", size.cx, size.cy, size2.cx, size2.cy); ReleaseDC(hwnd, hdc); -- 2.30.2

1 0

[PATCH 6/7] winecfg: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Zhiyi Zhang 01 Sep '21

01 Sep '21

If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index e204a911516..b3a3eeed3ba 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1090,7 +1090,7 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) HTHEME theme; RECT buttonrect; - theme = OpenThemeData(NULL, WC_BUTTONW); + theme = OpenThemeDataForDpi(NULL, WC_BUTTONW, GetDpiForWindow(hDlg)); if (theme) { MARGINS margins; -- 2.30.2

1 0