- wine-devel - winehq.org

[PATCH v4] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 09 Sep '21

09 Sep '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Out of performance considerations, only copy data to the committed buffer when we detect that an overwrite is possible (i.e. the current mixing region of the buffer gets locked). Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 51 +++++++++++++++++++++++++++++++++--- dlls/dsound/dsound_convert.c | 33 ++++++++++++++++------- dlls/dsound/dsound_private.h | 6 ++++- dlls/dsound/mixer.c | 1 + 4 files changed, 77 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..12c8345c4a8 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -101,6 +101,25 @@ static int __cdecl notify_compar(const void *l, const void *r) return 1; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + +static void commit_next_chunk(IDirectSoundBufferImpl *dsb) +{ + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + dsb->use_committed = TRUE; + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -503,8 +522,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 1\n"); + commit_next_chunk(This); + } *audiobytes1 = writebytes; if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = NULL; @@ -519,16 +540,20 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; *audiobytes1 = This->buflen-writecursor; This->buffer->lockedbytes += *audiobytes1; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 2\n"); + commit_next_chunk(This); + } if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; if (audiobytes2) { *audiobytes2 = writebytes-(This->buflen-writecursor); This->buffer->lockedbytes += *audiobytes2; } - if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) + if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 3\n"); + commit_next_chunk(This); + } TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } @@ -1081,6 +1106,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1167,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; @@ -1157,6 +1190,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; + VOID *committedbuff; TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); @@ -1166,6 +1200,14 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } + committedbuff = HeapAlloc(GetProcessHeap(),0,pdsb->writelead); + if (committedbuff == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } + FillMemory(committedbuff, pdsb->writelead, pdsb->pwfx->wBitsPerSample == 8 ? 128 : 0); + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); @@ -1175,6 +1217,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,committedbuff); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return DSERR_OUTOFMEMORY; @@ -1192,6 +1235,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; + dsb->committedbuff = committedbuff; DSOUND_RecalcFormat(dsb); InitializeSRWLock(&dsb->lock); @@ -1202,6 +1246,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb->committedbuff); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; }else diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..76c36b607c7 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(!dsb->use_committed) + return dsb->buffer->memory + offset; + + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +86,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +97,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..48f83315180 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,11 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + BOOL use_committed; + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..5cc1f70afdb 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -389,6 +389,7 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu } dsb->sec_mixpos = ipos; + dsb->use_committed = FALSE; } /** -- 2.25.1

2 1

[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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel