- wine-devel - winehq.org

[PATCH v2] ntdll: Exclude large integer APIs from relay tracing.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

According to the comment in large_int.c: These builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations. Otherwise ucrtbase initialization code crashes with +relay enabled when compiled with clang as a PE build. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0a2c2493334..185dd6767eb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1450,17 +1450,17 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __toascii(long) -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _allmul(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() -@ cdecl -arch=i386 -ret64 _allrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) -@ cdecl -arch=i386 -ret64 _aullrem(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused -- 2.29.2

2 1

[PATCH 1/2] conhost: Fix copy-paste error when setting windows size.
by Roman Pišl 03 Feb '21

03 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50602 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 55690377a7e..5e94a1d454e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1885,7 +1885,7 @@ static void apply_config( struct console *console, const struct console_config * console->active->attr = config->attr; console->active->popup_attr = config->popup_attr; console->active->win.left = config->win_pos.X; - console->active->win.right = config->win_pos.Y; + console->active->win.top = config->win_pos.Y; console->active->win.right = config->win_pos.X + config->win_width - 1; console->active->win.bottom = config->win_pos.Y + config->win_height - 1; memcpy( console->active->color_map, config->color_map, sizeof(config->color_map) ); -- 2.20.1

2 6

[PATCH] evr/allocator: Fix sample entry leak.
by Nikolay Sivov 03 Feb '21

03 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- A bit later It's allocated again. dlls/evr/sample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 44b09d6d474..9c76011f153 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -585,7 +585,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { - struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + struct queued_sample *queued_sample; IMFMediaBuffer *buffer; if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) -- 2.30.0

1 0

[PATCH v4] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Huw Davies 03 Feb '21

03 Feb '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 25 ++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..edd536c3a01 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -388,7 +388,7 @@ static void test_get_set(void) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) { - HRESULT r; + HRESULT r, init_dirty; IShellLinkA *sl; IPersistFile *pf; @@ -451,6 +451,17 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + init_dirty = IPersistFile_IsDirty(pf); /* empty links start off as clean */ + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == init_dirty, "dirty (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -459,6 +470,18 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) r = IPersistFile_Save(pf, path, TRUE); lok(r == S_OK, "save failed (0x%08x)\n", r); + r = IPersistFile_IsDirty(pf); + lok(r == S_FALSE, "dirty (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str); -- 2.23.0

1 0

[PATCH] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

This is a resend, previous version didn't get much attention. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 14 ++++++++++---- dlls/shell32/tests/shelllink.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 5b044d4be1..23c5935a7b 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,10 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +382,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1..21e9107fa6 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -467,6 +467,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

2 4

[PATCH 1/9] mfplat: Move sample implementation to a separate file.
by Nikolay Sivov 03 Feb '21

03 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 3 +- dlls/mfplat/buffer.c | 982 -------------------------------------- dlls/mfplat/sample.c | 1007 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 1009 insertions(+), 983 deletions(-) create mode 100644 dlls/mfplat/sample.c diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index cdb2b813340..bc04a440826 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -8,4 +8,5 @@ C_SRCS = \ buffer.c \ main.c \ mediatype.c \ - queue.c + queue.c \ + sample.c diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index b47d2a9ba16..adfa2d867c1 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -63,31 +63,6 @@ struct memory_buffer CRITICAL_SECTION cs; }; -enum sample_prop_flags -{ - SAMPLE_PROP_HAS_DURATION = 1 << 0, - SAMPLE_PROP_HAS_TIMESTAMP = 1 << 1, -}; - -struct sample -{ - struct attributes attributes; - IMFSample IMFSample_iface; - IMFTrackedSample IMFTrackedSample_iface; - - IMFMediaBuffer **buffers; - size_t buffer_count; - size_t capacity; - DWORD flags; - DWORD prop_flags; - LONGLONG duration; - LONGLONG timestamp; - - /* Tracked sample functionality. */ - IRtwqAsyncResult *tracked_result; - LONG tracked_refcount; -}; - static inline struct memory_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) { return CONTAINING_RECORD(iface, struct memory_buffer, IMFMediaBuffer_iface); @@ -103,16 +78,6 @@ static struct memory_buffer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct memory_buffer, IMFGetService_iface); } -static inline struct sample *impl_from_IMFSample(IMFSample *iface) -{ - return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); -} - -static struct sample *impl_from_IMFTrackedSample(IMFTrackedSample *iface) -{ - return CONTAINING_RECORD(iface, struct sample, IMFTrackedSample_iface); -} - static HRESULT WINAPI memory_buffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) { struct memory_buffer *buffer = impl_from_IMFMediaBuffer(iface); @@ -1080,950 +1045,3 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO return E_NOTIMPL; } - -static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFSample) || - IsEqualIID(riid, &IID_IMFAttributes) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = &sample->IMFSample_iface; - } - else if (sample->IMFTrackedSample_iface.lpVtbl && IsEqualIID(riid, &IID_IMFTrackedSample)) - { - *out = &sample->IMFTrackedSample_iface; - } - else - { - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; -} - -static ULONG WINAPI sample_AddRef(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - ULONG refcount = InterlockedIncrement(&sample->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; -} - -static void release_sample_object(struct sample *sample) -{ - size_t i; - - for (i = 0; i < sample->buffer_count; ++i) - IMFMediaBuffer_Release(sample->buffers[i]); - clear_attributes_object(&sample->attributes); - heap_free(sample->buffers); - heap_free(sample); -} - -static ULONG WINAPI sample_Release(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - ULONG refcount = InterlockedDecrement(&sample->attributes.ref); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - release_sample_object(sample); - - return refcount; -} - -static ULONG WINAPI sample_tracked_Release(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - ULONG refcount; - HRESULT hr; - - EnterCriticalSection(&sample->attributes.cs); - refcount = InterlockedDecrement(&sample->attributes.ref); - if (sample->tracked_result && sample->tracked_refcount == refcount) - { - /* Call could fail if queue system is not initialized, it's not critical. */ - if (FAILED(hr = RtwqInvokeCallback(sample->tracked_result))) - WARN("Failed to invoke tracking callback, hr %#x.\n", hr); - IRtwqAsyncResult_Release(sample->tracked_result); - sample->tracked_result = NULL; - sample->tracked_refcount = 0; - } - LeaveCriticalSection(&sample->attributes.cs); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - release_sample_object(sample); - - return refcount; -} - -static HRESULT WINAPI sample_GetItem(IMFSample *iface, REFGUID key, PROPVARIANT *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); - - return attributes_GetItem(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_GetItemType(IMFSample *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); - - return attributes_GetItemType(&sample->attributes, key, type); -} - -static HRESULT WINAPI sample_CompareItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result); - - return attributes_CompareItem(&sample->attributes, key, value, result); -} - -static HRESULT WINAPI sample_Compare(IMFSample *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, - BOOL *result) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); - - return attributes_Compare(&sample->attributes, theirs, type, result); -} - -static HRESULT WINAPI sample_GetUINT32(IMFSample *iface, REFGUID key, UINT32 *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); - - return attributes_GetUINT32(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_GetUINT64(IMFSample *iface, REFGUID key, UINT64 *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); - - return attributes_GetUINT64(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_GetDouble(IMFSample *iface, REFGUID key, double *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); - - return attributes_GetDouble(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_GetGUID(IMFSample *iface, REFGUID key, GUID *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); - - return attributes_GetGUID(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_GetStringLength(IMFSample *iface, REFGUID key, UINT32 *length) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); - - return attributes_GetStringLength(&sample->attributes, key, length); -} - -static HRESULT WINAPI sample_GetString(IMFSample *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), value, size, length); - - return attributes_GetString(&sample->attributes, key, value, size, length); -} - -static HRESULT WINAPI sample_GetAllocatedString(IMFSample *iface, REFGUID key, WCHAR **value, UINT32 *length) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); - - return attributes_GetAllocatedString(&sample->attributes, key, value, length); -} - -static HRESULT WINAPI sample_GetBlobSize(IMFSample *iface, REFGUID key, UINT32 *size) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); - - return attributes_GetBlobSize(&sample->attributes, key, size); -} - -static HRESULT WINAPI sample_GetBlob(IMFSample *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); - - return attributes_GetBlob(&sample->attributes, key, buf, bufsize, blobsize); -} - -static HRESULT WINAPI sample_GetAllocatedBlob(IMFSample *iface, REFGUID key, UINT8 **buf, UINT32 *size) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); - - return attributes_GetAllocatedBlob(&sample->attributes, key, buf, size); -} - -static HRESULT WINAPI sample_GetUnknown(IMFSample *iface, REFGUID key, REFIID riid, void **out) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), out); - - return attributes_GetUnknown(&sample->attributes, key, riid, out); -} - -static HRESULT WINAPI sample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value)); - - return attributes_SetItem(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_DeleteItem(IMFSample *iface, REFGUID key) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s.\n", iface, debugstr_attr(key)); - - return attributes_DeleteItem(&sample->attributes, key); -} - -static HRESULT WINAPI sample_DeleteAllItems(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p.\n", iface); - - return attributes_DeleteAllItems(&sample->attributes); -} - -static HRESULT WINAPI sample_SetUINT32(IMFSample *iface, REFGUID key, UINT32 value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %u.\n", iface, debugstr_attr(key), value); - - return attributes_SetUINT32(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_SetUINT64(IMFSample *iface, REFGUID key, UINT64 value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); - - return attributes_SetUINT64(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_SetDouble(IMFSample *iface, REFGUID key, double value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); - - return attributes_SetDouble(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_SetGUID(IMFSample *iface, REFGUID key, REFGUID value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); - - return attributes_SetGUID(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_SetString(IMFSample *iface, REFGUID key, const WCHAR *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); - - return attributes_SetString(&sample->attributes, key, value); -} - -static HRESULT WINAPI sample_SetBlob(IMFSample *iface, REFGUID key, const UINT8 *buf, UINT32 size) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); - - return attributes_SetBlob(&sample->attributes, key, buf, size); -} - -static HRESULT WINAPI sample_SetUnknown(IMFSample *iface, REFGUID key, IUnknown *unknown) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); - - return attributes_SetUnknown(&sample->attributes, key, unknown); -} - -static HRESULT WINAPI sample_LockStore(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p.\n", iface); - - return attributes_LockStore(&sample->attributes); -} - -static HRESULT WINAPI sample_UnlockStore(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p.\n", iface); - - return attributes_UnlockStore(&sample->attributes); -} - -static HRESULT WINAPI sample_GetCount(IMFSample *iface, UINT32 *count) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p.\n", iface, count); - - return attributes_GetCount(&sample->attributes, count); -} - -static HRESULT WINAPI sample_GetItemByIndex(IMFSample *iface, UINT32 index, GUID *key, PROPVARIANT *value) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %u, %p, %p.\n", iface, index, key, value); - - return attributes_GetItemByIndex(&sample->attributes, index, key, value); -} - -static HRESULT WINAPI sample_CopyAllItems(IMFSample *iface, IMFAttributes *dest) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p.\n", iface, dest); - - return attributes_CopyAllItems(&sample->attributes, dest); -} - -static HRESULT WINAPI sample_GetSampleFlags(IMFSample *iface, DWORD *flags) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p.\n", iface, flags); - - EnterCriticalSection(&sample->attributes.cs); - *flags = sample->flags; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %#x.\n", iface, flags); - - EnterCriticalSection(&sample->attributes.cs); - sample->flags = flags; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp) -{ - struct sample *sample = impl_from_IMFSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p.\n", iface, timestamp); - - EnterCriticalSection(&sample->attributes.cs); - if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) - *timestamp = sample->timestamp; - else - hr = MF_E_NO_SAMPLE_TIMESTAMP; - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); - - EnterCriticalSection(&sample->attributes.cs); - sample->timestamp = timestamp; - sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) -{ - struct sample *sample = impl_from_IMFSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p.\n", iface, duration); - - EnterCriticalSection(&sample->attributes.cs); - if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) - *duration = sample->duration; - else - hr = MF_E_NO_SAMPLE_DURATION; - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG duration) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %s.\n", iface, debugstr_time(duration)); - - EnterCriticalSection(&sample->attributes.cs); - sample->duration = duration; - sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p.\n", iface, count); - - if (!count) - return E_INVALIDARG; - - EnterCriticalSection(&sample->attributes.cs); - *count = sample->buffer_count; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMFMediaBuffer **buffer) -{ - struct sample *sample = impl_from_IMFSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %u, %p.\n", iface, index, buffer); - - EnterCriticalSection(&sample->attributes.cs); - if (index < sample->buffer_count) - { - *buffer = sample->buffers[index]; - IMFMediaBuffer_AddRef(*buffer); - } - else - hr = E_INVALIDARG; - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static unsigned int sample_get_total_length(struct sample *sample) -{ - DWORD total_length = 0, length; - size_t i; - - for (i = 0; i < sample->buffer_count; ++i) - { - length = 0; - if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - total_length += length; - } - - return total_length; -} - -static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buffer) -{ - DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; - BYTE *src_ptr, *dst_ptr; - BOOL locked; - HRESULT hr; - size_t i; - - total_length = sample_get_total_length(sample); - dst_current_length = 0; - - dst_ptr = NULL; - dst_length = current_length = 0; - locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); - if (locked) - { - if (dst_length < total_length) - hr = MF_E_BUFFERTOOSMALL; - else if (dst_ptr) - { - for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) - { - src_ptr = NULL; - src_max_length = current_length = 0; - if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) - { - if (src_ptr) - { - if (current_length > dst_length) - hr = MF_E_BUFFERTOOSMALL; - else if (current_length) - { - memcpy(dst_ptr, src_ptr, current_length); - dst_length -= current_length; - dst_current_length += current_length; - dst_ptr += current_length; - } - } - IMFMediaBuffer_Unlock(sample->buffers[i]); - } - } - } - } - - if (FAILED(IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length))) - WARN("Failed to set buffer length.\n"); - - if (locked) - IMFMediaBuffer_Unlock(buffer); - - return hr; -} - -static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) -{ - struct sample *sample = impl_from_IMFSample(iface); - unsigned int total_length, i; - IMFMediaBuffer *dest_buffer; - HRESULT hr = S_OK; - - TRACE("%p, %p.\n", iface, buffer); - - EnterCriticalSection(&sample->attributes.cs); - - if (sample->buffer_count == 0) - hr = E_UNEXPECTED; - else if (sample->buffer_count > 1) - { - total_length = sample_get_total_length(sample); - if (SUCCEEDED(hr = MFCreateMemoryBuffer(total_length, &dest_buffer))) - { - if (SUCCEEDED(hr = sample_copy_to_buffer(sample, dest_buffer))) - { - for (i = 0; i < sample->buffer_count; ++i) - IMFMediaBuffer_Release(sample->buffers[i]); - - sample->buffers[0] = dest_buffer; - IMFMediaBuffer_AddRef(sample->buffers[0]); - - sample->buffer_count = 1; - } - IMFMediaBuffer_Release(dest_buffer); - } - } - - if (SUCCEEDED(hr) && buffer) - { - *buffer = sample->buffers[0]; - IMFMediaBuffer_AddRef(*buffer); - } - - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) -{ - struct sample *sample = impl_from_IMFSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p.\n", iface, buffer); - - EnterCriticalSection(&sample->attributes.cs); - if (!mf_array_reserve((void **)&sample->buffers, &sample->capacity, sample->buffer_count + 1, - sizeof(*sample->buffers))) - hr = E_OUTOFMEMORY; - else - { - sample->buffers[sample->buffer_count++] = buffer; - IMFMediaBuffer_AddRef(buffer); - } - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) -{ - struct sample *sample = impl_from_IMFSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %u.\n", iface, index); - - EnterCriticalSection(&sample->attributes.cs); - if (index < sample->buffer_count) - { - IMFMediaBuffer_Release(sample->buffers[index]); - if (index < sample->buffer_count - 1) - { - memmove(&sample->buffers[index], &sample->buffers[index+1], - (sample->buffer_count - index - 1) * sizeof(*sample->buffers)); - } - sample->buffer_count--; - } - else - hr = E_INVALIDARG; - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) -{ - struct sample *sample = impl_from_IMFSample(iface); - size_t i; - - TRACE("%p.\n", iface); - - EnterCriticalSection(&sample->attributes.cs); - for (i = 0; i < sample->buffer_count; ++i) - IMFMediaBuffer_Release(sample->buffers[i]); - sample->buffer_count = 0; - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) -{ - struct sample *sample = impl_from_IMFSample(iface); - - TRACE("%p, %p.\n", iface, total_length); - - EnterCriticalSection(&sample->attributes.cs); - *total_length = sample_get_total_length(sample); - LeaveCriticalSection(&sample->attributes.cs); - - return S_OK; -} - -static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) -{ - struct sample *sample = impl_from_IMFSample(iface); - DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; - BYTE *src_ptr, *dst_ptr; - BOOL locked; - HRESULT hr; - size_t i; - - TRACE("%p, %p.\n", iface, buffer); - - EnterCriticalSection(&sample->attributes.cs); - - total_length = sample_get_total_length(sample); - dst_current_length = 0; - - dst_ptr = NULL; - dst_length = current_length = 0; - locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); - if (locked) - { - if (dst_length < total_length) - hr = MF_E_BUFFERTOOSMALL; - else if (dst_ptr) - { - for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) - { - src_ptr = NULL; - src_max_length = current_length = 0; - if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) - { - if (src_ptr) - { - if (current_length > dst_length) - hr = MF_E_BUFFERTOOSMALL; - else if (current_length) - { - memcpy(dst_ptr, src_ptr, current_length); - dst_length -= current_length; - dst_current_length += current_length; - dst_ptr += current_length; - } - } - IMFMediaBuffer_Unlock(sample->buffers[i]); - } - } - } - } - - IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); - - if (locked) - IMFMediaBuffer_Unlock(buffer); - - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static const IMFSampleVtbl samplevtbl = -{ - sample_QueryInterface, - sample_AddRef, - sample_Release, - sample_GetItem, - sample_GetItemType, - sample_CompareItem, - sample_Compare, - sample_GetUINT32, - sample_GetUINT64, - sample_GetDouble, - sample_GetGUID, - sample_GetStringLength, - sample_GetString, - sample_GetAllocatedString, - sample_GetBlobSize, - sample_GetBlob, - sample_GetAllocatedBlob, - sample_GetUnknown, - sample_SetItem, - sample_DeleteItem, - sample_DeleteAllItems, - sample_SetUINT32, - sample_SetUINT64, - sample_SetDouble, - sample_SetGUID, - sample_SetString, - sample_SetBlob, - sample_SetUnknown, - sample_LockStore, - sample_UnlockStore, - sample_GetCount, - sample_GetItemByIndex, - sample_CopyAllItems, - sample_GetSampleFlags, - sample_SetSampleFlags, - sample_GetSampleTime, - sample_SetSampleTime, - sample_GetSampleDuration, - sample_SetSampleDuration, - sample_GetBufferCount, - sample_GetBufferByIndex, - sample_ConvertToContiguousBuffer, - sample_AddBuffer, - sample_RemoveBufferByIndex, - sample_RemoveAllBuffers, - sample_GetTotalLength, - sample_CopyToBuffer, -}; - -static HRESULT WINAPI tracked_sample_QueryInterface(IMFTrackedSample *iface, REFIID riid, void **obj) -{ - struct sample *sample = impl_from_IMFTrackedSample(iface); - return IMFSample_QueryInterface(&sample->IMFSample_iface, riid, obj); -} - -static ULONG WINAPI tracked_sample_AddRef(IMFTrackedSample *iface) -{ - struct sample *sample = impl_from_IMFTrackedSample(iface); - return IMFSample_AddRef(&sample->IMFSample_iface); -} - -static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) -{ - struct sample *sample = impl_from_IMFTrackedSample(iface); - return IMFSample_Release(&sample->IMFSample_iface); -} - -static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, - IMFAsyncCallback *sample_allocator, IUnknown *state) -{ - struct sample *sample = impl_from_IMFTrackedSample(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p, %p.\n", iface, sample_allocator, state); - - EnterCriticalSection(&sample->attributes.cs); - - if (sample->tracked_result) - hr = MF_E_NOTACCEPTING; - else - { - if (SUCCEEDED(hr = RtwqCreateAsyncResult((IUnknown *)iface, (IRtwqAsyncCallback *)sample_allocator, - state, &sample->tracked_result))) - { - /* Account for additional refcount brought by 'state' object. This threshold is used - on Release() to invoke tracker callback. */ - sample->tracked_refcount = 1; - if (state == (IUnknown *)&sample->IMFTrackedSample_iface || - state == (IUnknown *)&sample->IMFSample_iface) - { - ++sample->tracked_refcount; - } - } - } - - LeaveCriticalSection(&sample->attributes.cs); - - return hr; -} - -static const IMFTrackedSampleVtbl tracked_sample_vtbl = -{ - tracked_sample_QueryInterface, - tracked_sample_AddRef, - tracked_sample_Release, - tracked_sample_SetAllocator, -}; - -static const IMFSampleVtbl sample_tracked_vtbl = -{ - sample_QueryInterface, - sample_AddRef, - sample_tracked_Release, - sample_GetItem, - sample_GetItemType, - sample_CompareItem, - sample_Compare, - sample_GetUINT32, - sample_GetUINT64, - sample_GetDouble, - sample_GetGUID, - sample_GetStringLength, - sample_GetString, - sample_GetAllocatedString, - sample_GetBlobSize, - sample_GetBlob, - sample_GetAllocatedBlob, - sample_GetUnknown, - sample_SetItem, - sample_DeleteItem, - sample_DeleteAllItems, - sample_SetUINT32, - sample_SetUINT64, - sample_SetDouble, - sample_SetGUID, - sample_SetString, - sample_SetBlob, - sample_SetUnknown, - sample_LockStore, - sample_UnlockStore, - sample_GetCount, - sample_GetItemByIndex, - sample_CopyAllItems, - sample_GetSampleFlags, - sample_SetSampleFlags, - sample_GetSampleTime, - sample_SetSampleTime, - sample_GetSampleDuration, - sample_SetSampleDuration, - sample_GetBufferCount, - sample_GetBufferByIndex, - sample_ConvertToContiguousBuffer, - sample_AddBuffer, - sample_RemoveBufferByIndex, - sample_RemoveAllBuffers, - sample_GetTotalLength, - sample_CopyToBuffer, -}; - - -/*********************************************************************** - * MFCreateSample (mfplat.@) - */ -HRESULT WINAPI MFCreateSample(IMFSample **sample) -{ - struct sample *object; - HRESULT hr; - - TRACE("%p.\n", sample); - - object = heap_alloc_zero(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); - return hr; - } - - object->IMFSample_iface.lpVtbl = &samplevtbl; - - *sample = &object->IMFSample_iface; - - TRACE("Created sample %p.\n", *sample); - - return S_OK; -} - -/*********************************************************************** - * MFCreateTrackedSample (mfplat.@) - */ -HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) -{ - struct sample *object; - HRESULT hr; - - TRACE("%p.\n", sample); - - object = heap_alloc_zero(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = init_attributes_object(&object->attributes, 0))) - { - heap_free(object); - return hr; - } - - object->IMFSample_iface.lpVtbl = &sample_tracked_vtbl; - object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; - - *sample = &object->IMFTrackedSample_iface; - - return S_OK; -} diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c new file mode 100644 index 00000000000..bd67fb731fc --- /dev/null +++ b/dlls/mfplat/sample.c @@ -0,0 +1,1007 @@ +/* + * Copyright 2021 Nikolay Sivov 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 + */ + +#define COBJMACROS + +#include "mfplat_private.h" +#include "rtworkq.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +enum sample_prop_flags +{ + SAMPLE_PROP_HAS_DURATION = 1 << 0, + SAMPLE_PROP_HAS_TIMESTAMP = 1 << 1, +}; + +struct sample +{ + struct attributes attributes; + IMFSample IMFSample_iface; + IMFTrackedSample IMFTrackedSample_iface; + + IMFMediaBuffer **buffers; + size_t buffer_count; + size_t capacity; + DWORD flags; + DWORD prop_flags; + LONGLONG duration; + LONGLONG timestamp; + + /* Tracked sample functionality. */ + IRtwqAsyncResult *tracked_result; + LONG tracked_refcount; +}; + +static struct sample *impl_from_IMFSample(IMFSample *iface) +{ + return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); +} + +static struct sample *impl_from_IMFTrackedSample(IMFTrackedSample *iface) +{ + return CONTAINING_RECORD(iface, struct sample, IMFTrackedSample_iface); +} + +static HRESULT WINAPI sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFSample) || + IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &sample->IMFSample_iface; + } + else if (sample->IMFTrackedSample_iface.lpVtbl && IsEqualIID(riid, &IID_IMFTrackedSample)) + { + *out = &sample->IMFTrackedSample_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI sample_AddRef(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + ULONG refcount = InterlockedIncrement(&sample->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static void release_sample_object(struct sample *sample) +{ + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + clear_attributes_object(&sample->attributes); + heap_free(sample->buffers); + heap_free(sample); +} + +static ULONG WINAPI sample_Release(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + ULONG refcount = InterlockedDecrement(&sample->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + release_sample_object(sample); + + return refcount; +} + +static ULONG WINAPI sample_tracked_Release(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + ULONG refcount; + HRESULT hr; + + EnterCriticalSection(&sample->attributes.cs); + refcount = InterlockedDecrement(&sample->attributes.ref); + if (sample->tracked_result && sample->tracked_refcount == refcount) + { + /* Call could fail if queue system is not initialized, it's not critical. */ + if (FAILED(hr = RtwqInvokeCallback(sample->tracked_result))) + WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + IRtwqAsyncResult_Release(sample->tracked_result); + sample->tracked_result = NULL; + sample->tracked_refcount = 0; + } + LeaveCriticalSection(&sample->attributes.cs); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + release_sample_object(sample); + + return refcount; +} + +static HRESULT WINAPI sample_GetItem(IMFSample *iface, REFGUID key, PROPVARIANT *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetItem(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_GetItemType(IMFSample *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + return attributes_GetItemType(&sample->attributes, key, type); +} + +static HRESULT WINAPI sample_CompareItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result); + + return attributes_CompareItem(&sample->attributes, key, value, result); +} + +static HRESULT WINAPI sample_Compare(IMFSample *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, type, result); + + return attributes_Compare(&sample->attributes, theirs, type, result); +} + +static HRESULT WINAPI sample_GetUINT32(IMFSample *iface, REFGUID key, UINT32 *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT32(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_GetUINT64(IMFSample *iface, REFGUID key, UINT64 *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT64(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_GetDouble(IMFSample *iface, REFGUID key, double *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetDouble(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_GetGUID(IMFSample *iface, REFGUID key, GUID *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetGUID(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_GetStringLength(IMFSample *iface, REFGUID key, UINT32 *length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); + + return attributes_GetStringLength(&sample->attributes, key, length); +} + +static HRESULT WINAPI sample_GetString(IMFSample *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), value, size, length); + + return attributes_GetString(&sample->attributes, key, value, size, length); +} + +static HRESULT WINAPI sample_GetAllocatedString(IMFSample *iface, REFGUID key, WCHAR **value, UINT32 *length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + + return attributes_GetAllocatedString(&sample->attributes, key, value, length); +} + +static HRESULT WINAPI sample_GetBlobSize(IMFSample *iface, REFGUID key, UINT32 *size) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); + + return attributes_GetBlobSize(&sample->attributes, key, size); +} + +static HRESULT WINAPI sample_GetBlob(IMFSample *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + + return attributes_GetBlob(&sample->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI sample_GetAllocatedBlob(IMFSample *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + + return attributes_GetAllocatedBlob(&sample->attributes, key, buf, size); +} + +static HRESULT WINAPI sample_GetUnknown(IMFSample *iface, REFGUID key, REFIID riid, void **out) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), out); + + return attributes_GetUnknown(&sample->attributes, key, riid, out); +} + +static HRESULT WINAPI sample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value)); + + return attributes_SetItem(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_DeleteItem(IMFSample *iface, REFGUID key) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s.\n", iface, debugstr_attr(key)); + + return attributes_DeleteItem(&sample->attributes, key); +} + +static HRESULT WINAPI sample_DeleteAllItems(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p.\n", iface); + + return attributes_DeleteAllItems(&sample->attributes); +} + +static HRESULT WINAPI sample_SetUINT32(IMFSample *iface, REFGUID key, UINT32 value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_attr(key), value); + + return attributes_SetUINT32(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_SetUINT64(IMFSample *iface, REFGUID key, UINT64 value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + + return attributes_SetUINT64(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_SetDouble(IMFSample *iface, REFGUID key, double value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); + + return attributes_SetDouble(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_SetGUID(IMFSample *iface, REFGUID key, REFGUID value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); + + return attributes_SetGUID(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_SetString(IMFSample *iface, REFGUID key, const WCHAR *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + + return attributes_SetString(&sample->attributes, key, value); +} + +static HRESULT WINAPI sample_SetBlob(IMFSample *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + + return attributes_SetBlob(&sample->attributes, key, buf, size); +} + +static HRESULT WINAPI sample_SetUnknown(IMFSample *iface, REFGUID key, IUnknown *unknown) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + + return attributes_SetUnknown(&sample->attributes, key, unknown); +} + +static HRESULT WINAPI sample_LockStore(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p.\n", iface); + + return attributes_LockStore(&sample->attributes); +} + +static HRESULT WINAPI sample_UnlockStore(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p.\n", iface); + + return attributes_UnlockStore(&sample->attributes); +} + +static HRESULT WINAPI sample_GetCount(IMFSample *iface, UINT32 *count) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, count); + + return attributes_GetCount(&sample->attributes, count); +} + +static HRESULT WINAPI sample_GetItemByIndex(IMFSample *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return attributes_GetItemByIndex(&sample->attributes, index, key, value); +} + +static HRESULT WINAPI sample_CopyAllItems(IMFSample *iface, IMFAttributes *dest) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, dest); + + return attributes_CopyAllItems(&sample->attributes, dest); +} + +static HRESULT WINAPI sample_GetSampleFlags(IMFSample *iface, DWORD *flags) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, flags); + + EnterCriticalSection(&sample->attributes.cs); + *flags = sample->flags; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %#x.\n", iface, flags); + + EnterCriticalSection(&sample->attributes.cs); + sample->flags = flags; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_GetSampleTime(IMFSample *iface, LONGLONG *timestamp) +{ + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, timestamp); + + EnterCriticalSection(&sample->attributes.cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_TIMESTAMP) + *timestamp = sample->timestamp; + else + hr = MF_E_NO_SAMPLE_TIMESTAMP; + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); + + EnterCriticalSection(&sample->attributes.cs); + sample->timestamp = timestamp; + sample->prop_flags |= SAMPLE_PROP_HAS_TIMESTAMP; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) +{ + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, duration); + + EnterCriticalSection(&sample->attributes.cs); + if (sample->prop_flags & SAMPLE_PROP_HAS_DURATION) + *duration = sample->duration; + else + hr = MF_E_NO_SAMPLE_DURATION; + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG duration) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %s.\n", iface, debugstr_time(duration)); + + EnterCriticalSection(&sample->attributes.cs); + sample->duration = duration; + sample->prop_flags |= SAMPLE_PROP_HAS_DURATION; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_GetBufferCount(IMFSample *iface, DWORD *count) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_INVALIDARG; + + EnterCriticalSection(&sample->attributes.cs); + *count = sample->buffer_count; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMFMediaBuffer **buffer) +{ + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %u, %p.\n", iface, index, buffer); + + EnterCriticalSection(&sample->attributes.cs); + if (index < sample->buffer_count) + { + *buffer = sample->buffers[index]; + IMFMediaBuffer_AddRef(*buffer); + } + else + hr = E_INVALIDARG; + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static unsigned int sample_get_total_length(struct sample *sample) +{ + DWORD total_length = 0, length; + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + { + length = 0; + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) + total_length += length; + } + + return total_length; +} + +static HRESULT sample_copy_to_buffer(struct sample *sample, IMFMediaBuffer *buffer) +{ + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + if (FAILED(IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length))) + WARN("Failed to set buffer length.\n"); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + return hr; +} + +static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) +{ + struct sample *sample = impl_from_IMFSample(iface); + unsigned int total_length, i; + IMFMediaBuffer *dest_buffer; + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->attributes.cs); + + if (sample->buffer_count == 0) + hr = E_UNEXPECTED; + else if (sample->buffer_count > 1) + { + total_length = sample_get_total_length(sample); + if (SUCCEEDED(hr = MFCreateMemoryBuffer(total_length, &dest_buffer))) + { + if (SUCCEEDED(hr = sample_copy_to_buffer(sample, dest_buffer))) + { + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + + sample->buffers[0] = dest_buffer; + IMFMediaBuffer_AddRef(sample->buffers[0]); + + sample->buffer_count = 1; + } + IMFMediaBuffer_Release(dest_buffer); + } + } + + if (SUCCEEDED(hr) && buffer) + { + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); + } + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->attributes.cs); + if (!mf_array_reserve((void **)&sample->buffers, &sample->capacity, sample->buffer_count + 1, + sizeof(*sample->buffers))) + hr = E_OUTOFMEMORY; + else + { + sample->buffers[sample->buffer_count++] = buffer; + IMFMediaBuffer_AddRef(buffer); + } + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) +{ + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %u.\n", iface, index); + + EnterCriticalSection(&sample->attributes.cs); + if (index < sample->buffer_count) + { + IMFMediaBuffer_Release(sample->buffers[index]); + if (index < sample->buffer_count - 1) + { + memmove(&sample->buffers[index], &sample->buffers[index+1], + (sample->buffer_count - index - 1) * sizeof(*sample->buffers)); + } + sample->buffer_count--; + } + else + hr = E_INVALIDARG; + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + size_t i; + + TRACE("%p.\n", iface); + + EnterCriticalSection(&sample->attributes.cs); + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + sample->buffer_count = 0; + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, total_length); + + EnterCriticalSection(&sample->attributes.cs); + *total_length = sample_get_total_length(sample); + LeaveCriticalSection(&sample->attributes.cs); + + return S_OK; +} + +static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + struct sample *sample = impl_from_IMFSample(iface); + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; + + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->attributes.cs); + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static const IMFSampleVtbl samplevtbl = +{ + sample_QueryInterface, + sample_AddRef, + sample_Release, + sample_GetItem, + sample_GetItemType, + sample_CompareItem, + sample_Compare, + sample_GetUINT32, + sample_GetUINT64, + sample_GetDouble, + sample_GetGUID, + sample_GetStringLength, + sample_GetString, + sample_GetAllocatedString, + sample_GetBlobSize, + sample_GetBlob, + sample_GetAllocatedBlob, + sample_GetUnknown, + sample_SetItem, + sample_DeleteItem, + sample_DeleteAllItems, + sample_SetUINT32, + sample_SetUINT64, + sample_SetDouble, + sample_SetGUID, + sample_SetString, + sample_SetBlob, + sample_SetUnknown, + sample_LockStore, + sample_UnlockStore, + sample_GetCount, + sample_GetItemByIndex, + sample_CopyAllItems, + sample_GetSampleFlags, + sample_SetSampleFlags, + sample_GetSampleTime, + sample_SetSampleTime, + sample_GetSampleDuration, + sample_SetSampleDuration, + sample_GetBufferCount, + sample_GetBufferByIndex, + sample_ConvertToContiguousBuffer, + sample_AddBuffer, + sample_RemoveBufferByIndex, + sample_RemoveAllBuffers, + sample_GetTotalLength, + sample_CopyToBuffer, +}; + +static HRESULT WINAPI tracked_sample_QueryInterface(IMFTrackedSample *iface, REFIID riid, void **obj) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_QueryInterface(&sample->IMFSample_iface, riid, obj); +} + +static ULONG WINAPI tracked_sample_AddRef(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_AddRef(&sample->IMFSample_iface); +} + +static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + return IMFSample_Release(&sample->IMFSample_iface); +} + +static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, + IMFAsyncCallback *sample_allocator, IUnknown *state) +{ + struct sample *sample = impl_from_IMFTrackedSample(iface); + HRESULT hr = S_OK; + + TRACE("%p, %p, %p.\n", iface, sample_allocator, state); + + EnterCriticalSection(&sample->attributes.cs); + + if (sample->tracked_result) + hr = MF_E_NOTACCEPTING; + else + { + if (SUCCEEDED(hr = RtwqCreateAsyncResult((IUnknown *)iface, (IRtwqAsyncCallback *)sample_allocator, + state, &sample->tracked_result))) + { + /* Account for additional refcount brought by 'state' object. This threshold is used + on Release() to invoke tracker callback. */ + sample->tracked_refcount = 1; + if (state == (IUnknown *)&sample->IMFTrackedSample_iface || + state == (IUnknown *)&sample->IMFSample_iface) + { + ++sample->tracked_refcount; + } + } + } + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; +} + +static const IMFTrackedSampleVtbl tracked_sample_vtbl = +{ + tracked_sample_QueryInterface, + tracked_sample_AddRef, + tracked_sample_Release, + tracked_sample_SetAllocator, +}; + +static const IMFSampleVtbl sample_tracked_vtbl = +{ + sample_QueryInterface, + sample_AddRef, + sample_tracked_Release, + sample_GetItem, + sample_GetItemType, + sample_CompareItem, + sample_Compare, + sample_GetUINT32, + sample_GetUINT64, + sample_GetDouble, + sample_GetGUID, + sample_GetStringLength, + sample_GetString, + sample_GetAllocatedString, + sample_GetBlobSize, + sample_GetBlob, + sample_GetAllocatedBlob, + sample_GetUnknown, + sample_SetItem, + sample_DeleteItem, + sample_DeleteAllItems, + sample_SetUINT32, + sample_SetUINT64, + sample_SetDouble, + sample_SetGUID, + sample_SetString, + sample_SetBlob, + sample_SetUnknown, + sample_LockStore, + sample_UnlockStore, + sample_GetCount, + sample_GetItemByIndex, + sample_CopyAllItems, + sample_GetSampleFlags, + sample_SetSampleFlags, + sample_GetSampleTime, + sample_SetSampleTime, + sample_GetSampleDuration, + sample_SetSampleDuration, + sample_GetBufferCount, + sample_GetBufferByIndex, + sample_ConvertToContiguousBuffer, + sample_AddBuffer, + sample_RemoveBufferByIndex, + sample_RemoveAllBuffers, + sample_GetTotalLength, + sample_CopyToBuffer, +}; + +/*********************************************************************** + * MFCreateSample (mfplat.@) + */ +HRESULT WINAPI MFCreateSample(IMFSample **sample) +{ + struct sample *object; + HRESULT hr; + + TRACE("%p.\n", sample); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + + object->IMFSample_iface.lpVtbl = &samplevtbl; + + *sample = &object->IMFSample_iface; + + TRACE("Created sample %p.\n", *sample); + + return S_OK; +} + +/*********************************************************************** + * MFCreateTrackedSample (mfplat.@) + */ +HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) +{ + struct sample *object; + HRESULT hr; + + TRACE("%p.\n", sample); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + + object->IMFSample_iface.lpVtbl = &sample_tracked_vtbl; + object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; + + *sample = &object->IMFTrackedSample_iface; + + return S_OK; +} -- 2.30.0

2 16

[PATCH 1/2] wined3d: Store stencil reference value in wined3d_state.
by Jan Sikorski 03 Feb '21

03 Feb '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 15 +++------------ dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/cs.c | 15 +++++++++++---- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7fef636b883..cdae1104efa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -583,8 +583,6 @@ struct d3d_device struct wine_rb_tree depthstencil_states; struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - - UINT stencil_ref; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d24ec0ef0ba..fcbcc64a636 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -881,27 +881,19 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_state *state_impl; - const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - device->stencil_ref = stencil_ref; if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL); + wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL, 0); wined3d_mutex_unlock(); return; } - wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state); - desc = &state_impl->desc; - - if (desc->StencilEnable) - { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); - } + wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state, stencil_ref); wined3d_mutex_unlock(); } @@ -2022,7 +2014,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device, stencil_ref))) { state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); @@ -2031,7 +2023,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 { *depth_stencil_state = NULL; } - *stencil_ref = device->stencil_ref; wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d2ac652ab62..62032fb74c5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -43,6 +43,7 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_STREAMSRC, {STATE_STREAMSRC, state_nop}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_DEPTH_STENCIL, {STATE_DEPTH_STENCIL, state_nop}}, + {STATE_STENCIL_REF, {STATE_STENCIL_REF, state_nop}}, {STATE_RASTERIZER, {STATE_RASTERIZER, state_nop}}, {STATE_SCISSORRECT, {STATE_SCISSORRECT, state_nop}}, {STATE_POINTSPRITECOORDORIGIN, {STATE_POINTSPRITECOORDORIGIN, state_nop}}, @@ -116,7 +117,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_RENDER(WINED3D_RS_ANISOTROPY), state_nop}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_nop}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_RENDER(WINED3D_RS_STENCILREF), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 841b3d742c6..55127e44a00 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2076,7 +2076,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; - key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.front.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); key->ds_desc.back.failOp = vk_stencil_op_from_wined3d(d->desc.back.fail_op); @@ -2085,7 +2085,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.back.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 56df760145a..e09b1fb9725 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -275,6 +275,7 @@ struct wined3d_cs_set_depth_stencil_state { enum wined3d_cs_op opcode; struct wined3d_depth_stencil_state *state; + unsigned int stencil_ref; }; struct wined3d_cs_set_rasterizer_state @@ -1235,7 +1236,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) device_invalidate_state(device, STATE_RASTERIZER); if (prev->format->stencil_size != op->view->format->stencil_size) - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); + device_invalidate_state(device, STATE_STENCIL_REF); } device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -1665,19 +1666,25 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_depth_stencil_state *op = data; + struct wined3d_state *state = &cs->state; - cs->state.depth_stencil_state = op->state; - device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + if (state->depth_stencil_state != op->state) { + state->depth_stencil_state = op->state; + device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + } + state->stencil_ref = op->stencil_ref; + device_invalidate_state(cs->device, STATE_STENCIL_REF); } void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_cs_set_depth_stencil_state *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE; op->state = state; + op->stencil_ref = stencil_ref; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c16a3c691e..feaef2ef18f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,28 +1774,30 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w } void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_depth_stencil_state *prev; - TRACE("device %p, state %p.\n", device, state); + TRACE("device %p, state %p, stencil_ref %u.\n", device, state, stencil_ref); prev = device->state.depth_stencil_state; - if (prev == state) + if (prev == state && device->state.stencil_ref == stencil_ref) return; if (state) wined3d_depth_stencil_state_incref(state); device->state.depth_stencil_state = state; - wined3d_cs_emit_set_depth_stencil_state(device->cs, state); + device->state.stencil_ref = stencil_ref; + wined3d_cs_emit_set_depth_stencil_state(device->cs, state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } -struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device) +struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, unsigned int *stencil_ref) { - TRACE("device %p.\n", device); + TRACE("device %p, stencil_ref %p.\n", device, stencil_ref); + *stencil_ref = device->state.stencil_ref; return device->state.depth_stencil_state; } @@ -3704,6 +3706,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_STENCILENABLE: case WINED3D_RS_STENCILFAIL: case WINED3D_RS_STENCILFUNC: + case WINED3D_RS_STENCILREF: case WINED3D_RS_STENCILMASK: case WINED3D_RS_STENCILPASS: case WINED3D_RS_STENCILWRITEMASK: @@ -3848,6 +3851,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state; struct wined3d_depth_stencil_state_desc desc; struct wine_rb_entry *entry; + unsigned int stencil_ref; memset(&desc, 0, sizeof(desc)); switch (state->rs[WINED3D_RS_ZENABLE]) @@ -3887,15 +3891,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.back = desc.front; } + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_STENCILREF)) + stencil_ref = state->rs[WINED3D_RS_STENCILREF]; + else + wined3d_device_get_depth_stencil_state(device, &stencil_ref); + if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 040a9f81083..f72fd3e3ae3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2469,6 +2469,7 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_BLEND_FACTOR, {STATE_VDECL}}, {STATE_SAMPLE_MASK, {STATE_VDECL}}, {STATE_DEPTH_STENCIL, {STATE_VDECL}}, + {STATE_STENCIL_REF, {STATE_VDECL}}, {STATE_STREAMSRC, {STATE_VDECL}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_RASTERIZER, {STATE_VDECL}}, @@ -2545,7 +2546,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e40c23daf03..f454a7a3801 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1070,7 +1070,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op); @@ -4691,6 +4691,7 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask_w }, WINED3D_GL_EXT_NONE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil_2s }, EXT_STENCIL_TWO_SIDE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil }, WINED3D_GL_EXT_NONE }, + { STATE_STENCIL_REF, { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL }, @@ -4775,7 +4776,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_ANISOTROPY), { STATE_RENDER(WINED3D_RS_ANISOTROPY), state_anisotropy }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FLUSHBATCH), { STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_flushbatch }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5574,8 +5574,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 40, 40}, { 42, 45}, { 47, 47}, - { 52, 56}, - { 58, 59}, + { 52, 59}, { 61, 127}, {149, 150}, {162, 162}, @@ -5621,6 +5620,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) STATE_BLEND, STATE_BLEND_FACTOR, STATE_DEPTH_STENCIL, + STATE_STENCIL_REF, }; unsigned int i, current; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 101c0287936..f959cd51d68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1827,7 +1827,10 @@ enum wined3d_pipeline #define STATE_DEPTH_STENCIL (STATE_SAMPLE_MASK + 1) #define STATE_IS_DEPTH_STENCIL(a) ((a) == STATE_DEPTH_STENCIL) -#define STATE_COMPUTE_OFFSET (STATE_DEPTH_STENCIL + 1) +#define STATE_STENCIL_REF (STATE_DEPTH_STENCIL + 1) +#define STATE_IS_SAMPLE_REF(a) ((a) == STATE_STENCIL_REF) + +#define STATE_COMPUTE_OFFSET (STATE_STENCIL_REF + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -3701,6 +3704,7 @@ struct wined3d_state struct wined3d_color blend_factor; unsigned int sample_mask; struct wined3d_depth_stencil_state *depth_stencil_state; + unsigned int stencil_ref; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -4740,7 +4744,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) DECLSPEC_HIDDEN; + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 310911992ae..96cb6fc1d86 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2392,7 +2392,7 @@ struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wine struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_get_depth_stencil_state( - const struct wined3d_device *device); + const struct wined3d_device *device, unsigned int *stencil_ref); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, @@ -2480,7 +2480,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); void __cdecl wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state); + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); -- 2.30.0

2 6

[PATCH v3] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

v3: Fixed test failures under Windows Vista. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..7245f5533f6 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -451,6 +451,12 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK || r == E_INVALIDARG /* before Windows 7 */, "save failed (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -467,6 +473,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

1 0

[PATCH v2] shell32: IPersistFile::Save(NULL) should use previously stored file name.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/shelllink.c | 16 ++++++++++++---- dlls/shell32/tests/shelllink.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 46d9bc994ff..69d610f2503 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -367,7 +367,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName)); if (!pszFileName) - return E_FAIL; + { + if (!This->filepath) return S_OK; + + pszFileName = This->filepath; + fRemember = FALSE; + } r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); if( SUCCEEDED( r ) ) @@ -379,9 +384,12 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile { StartLinkProcessor( pszFileName ); - /* update file path */ - heap_free(This->filepath); - This->filepath = strdupW(pszFileName); + if (fRemember) + { + /* update file path */ + heap_free(This->filepath); + This->filepath = strdupW(pszFileName); + } This->bDirty = FALSE; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 20c48814f1d..60271ace2ce 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -451,6 +451,12 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) IPersistFile_GetCurFile(pf, NULL); } + r = IPersistFile_Save(pf, NULL, FALSE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + /* test GetCurFile before ::Save */ str = (LPWSTR)0xdeadbeef; r = IPersistFile_GetCurFile(pf, &str); @@ -467,6 +473,16 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc) lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); CoTaskMemFree(str); + r = IPersistFile_Save(pf, NULL, TRUE); + lok(r == S_OK, "save failed (0x%08x)\n", r); + + /* test GetCurFile after ::Save */ + r = IPersistFile_GetCurFile(pf, &str); + lok(r == S_OK, "got 0x%08x\n", r); + lok(str != NULL, "Didn't expect NULL\n"); + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); + CoTaskMemFree(str); + IPersistFile_Release(pf); } -- 2.29.2

2 1

[PATCH 2/2] msvcp90: Add _Wcsxfrm implementation.
by Piotr Caban 03 Feb '21

03 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 +++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] msvcp90: Return required buffer size in _Strxfrm.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH] msvcr120: Run strtof tests once.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] wbemprox: Fix Windows 8/8.1 caption.
by Hans Leidekker 03 Feb '21

03 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) ); -- 2.30.0

1 0

[PATCH v2 1/2] wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

For some reason testbot chokes on UTF-8 character in Copyright while applying the patch, this version of the patch doesn't change the Copyright header. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 27 +++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..1e06a2089e9 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +68,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a37954f2f94..c41ca7b5ffa 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal; -- 2.29.2

2 1

[PATCH v2 2/2] wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Dmitry Timoshkov 03 Feb '21

03 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/main.c | 1 - dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 74 ++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 dlls/wevtapi/tests/Makefile.in create mode 100644 dlls/wevtapi/tests/wevtapi.c diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..a0a21aa9971 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,74 @@ +/* + * Copyright 2021 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index c41ca7b5ffa..f9f73ba18c4 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, -- 2.29.2

1 0

[PATCH v2 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye 03 Feb '21

03 Feb '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..9d74caca986 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,83 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} START_TEST(iphlpapi) { @@ -2370,6 +2447,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

1 1

[PATCH] mscoree: Improve non-neutral assembly lookup logic.
by Rémi Bernon 03 Feb '21

03 Feb '21

And neutral logic too, and the combinations with custom privatePath config. This fixes a crash with Mafia III launcher, when it tries to load its localized strings from culture-specific assemblies to display its warning popup message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mscoree/metahost.c | 75 ++++++-- dlls/mscoree/tests/loadpaths.dll.cs | 33 ++++ dlls/mscoree/tests/loadpaths.exe.config | 8 + dlls/mscoree/tests/loadpaths.exe.cs | 28 +++ dlls/mscoree/tests/mscoree.c | 226 ++++++++++++++++++++++++ dlls/mscoree/tests/resource.rc | 9 + 6 files changed, 360 insertions(+), 19 deletions(-) create mode 100644 dlls/mscoree/tests/loadpaths.dll.cs create mode 100644 dlls/mscoree/tests/loadpaths.exe.config create mode 100644 dlls/mscoree/tests/loadpaths.exe.cs diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a3ed1534753..d9b599fadc7 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winternl.h" #include "ole2.h" +#include "shlwapi.h" #include "corerror.h" #include "cor.h" @@ -87,6 +88,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); +const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -193,6 +195,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_get_image); LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); + LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1651,24 +1654,48 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } +static MonoAssembly* mono_assembly_try_load(WCHAR *path) +{ + MonoAssembly *result = NULL; + MonoImageOpenStatus stat; + char *pathA; + + if (!(pathA = WtoA(path))) return NULL; + + result = mono_assembly_open(pathA, &stat); + HeapFree(GetProcessHeap(), 0, pathA); + + if (result) TRACE("found: %s\n", debugstr_w(path)); + return result; +} + static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; const char *assemblyname; - LPWSTR stringnameW; - int stringnameW_size; + const char *culture; + LPWSTR stringnameW, cultureW; + int stringnameW_size, cultureW_size; WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; DWORD search_flags; int i; static const WCHAR dotdllW[] = {'.','d','l','l',0}; - static const WCHAR slashW[] = {'\\',0}; + static const WCHAR dotexeW[] = {'.','e','x','e',0}; stringname = mono_stringify_assembly_name(aname); assemblyname = mono_assembly_name_get_name(aname); + culture = mono_assembly_name_get_culture(aname); + if (culture) + { + cultureW_size = MultiByteToWideChar(CP_UTF8, 0, culture, -1, NULL, 0); + cultureW = HeapAlloc(GetProcessHeap(), 0, cultureW_size * sizeof(WCHAR)); + if (cultureW) MultiByteToWideChar(CP_UTF8, 0, culture, -1, cultureW, cultureW_size); + } + else cultureW = NULL; TRACE("%s\n", debugstr_a(stringname)); @@ -1684,26 +1711,34 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); for (i = 0; private_path[i] != NULL; i++) { + /* This is the lookup order used in Mono */ + /* 1st try: [culture]/[name].dll (culture may be empty) */ wcscpy(path, private_path[i]); - wcscat(path, slashW); - wcscat(path, stringnameW); + if (cultureW) PathAppendW(path, cultureW); + PathAppendW(path, stringnameW); wcscat(path, dotdllW); - pathA = WtoA(path); - if (pathA) - { - result = mono_assembly_open(pathA, &stat); - if (result) - { - TRACE("found: %s\n", debugstr_w(path)); - HeapFree(GetProcessHeap(), 0, pathA); - HeapFree(GetProcessHeap(), 0, stringnameW); - mono_free(stringname); - return result; - } - HeapFree(GetProcessHeap(), 0, pathA); - } + result = mono_assembly_try_load(path); + if (result) break; + + /* 2nd try: [culture]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 3rd try: [culture]/[name]/[name].dll (culture may be empty) */ + path[wcslen(path) - wcslen(dotexeW)] = 0; + PathAppendW(path, stringnameW); + wcscat(path, dotdllW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 4th try: [culture]/[name]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; } HeapFree(GetProcessHeap(), 0, stringnameW); + if (result) goto done; } } @@ -1745,6 +1780,8 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname else TRACE("skipping Windows GAC search due to override setting\n"); +done: + if (cultureW) HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); return result; diff --git a/dlls/mscoree/tests/loadpaths.dll.cs b/dlls/mscoree/tests/loadpaths.dll.cs new file mode 100644 index 00000000000..99732b011d8 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.dll.cs @@ -0,0 +1,33 @@ +/* + * 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 + */ + +using System.Reflection; + +#if NEUTRAL +[assembly: AssemblyCulture("")] +#else +[assembly: AssemblyCulture("en")] +#endif + +namespace LoadPaths +{ + public class Test2 + { + public int Foo() { return 0; } + } +} diff --git a/dlls/mscoree/tests/loadpaths.exe.config b/dlls/mscoree/tests/loadpaths.exe.config new file mode 100644 index 00000000000..be6d9fb95cd --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.config @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <probing privatePath="private"/> + </assemblyBinding> + </runtime> +</configuration> diff --git a/dlls/mscoree/tests/loadpaths.exe.cs b/dlls/mscoree/tests/loadpaths.exe.cs new file mode 100644 index 00000000000..22c32603c59 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.cs @@ -0,0 +1,28 @@ +/* + * 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 + */ + +namespace LoadPaths +{ + public static class Test + { + static int Main(string[] args) + { + return new Test2().Foo(); + } + } +} diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 26c06246a94..4be3da8c731 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -538,6 +538,229 @@ static void test_createinstance(void) } } +static BOOL write_resource(const WCHAR *resource, const WCHAR *filename) +{ + HANDLE file; + HRSRC rsrc; + void *data; + DWORD size; + BOOL ret; + + rsrc = FindResourceW(GetModuleHandleW(NULL), resource, MAKEINTRESOURCEW(RT_RCDATA)); + if (!rsrc) return FALSE; + + data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!data) return FALSE; + + size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!size) return FALSE; + + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(file, data, size, &size, NULL); + CloseHandle(file); + return ret; +} + +static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *type, const WCHAR *args) +{ + static const WCHAR *csc = L"C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + WCHAR cmdline[2 * MAX_PATH + 74]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + BOOL ret; + + if (!PathFileExistsW(csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); + + si.cb = sizeof(si); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsW(target); + ok(ret, "Compilation failed\n"); + + return ret; +} + +static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, const WCHAR *cfg_name, + const WCHAR *dll_dest, BOOL expect_failure, BOOL todo) +{ + WCHAR tmp[MAX_PATH], tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + WCHAR *ptr, *end; + DWORD exit_code = 0xdeadbeef; + LUID id; + BOOL ret; + + GetTempPathW(MAX_PATH, tmp); + ret = AllocateLocallyUniqueId(&id); + ok(ret, "AllocateLocallyUniqueId failed: %u\n", GetLastError()); + ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); + ok(ret, "GetTempFileNameW failed: %u\n", GetLastError()); + + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + + wcscpy(tmpexe, tmpdir); + PathAppendW(tmpexe, exe_name); + ret = CopyFileW(exe_name, tmpexe, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (cfg_name) + { + wcscpy(tmpcfg, tmpdir); + PathAppendW(tmpcfg, cfg_name); + ret = CopyFileW(cfg_name, tmpcfg, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + + ptr = tmpdir + wcslen(tmpdir); + PathAppendW(tmpdir, dll_dest); + while (*ptr && (ptr = wcschr(ptr + 1, '\\'))) + { + *ptr = '\0'; + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\\'; + } + + wcscpy(tmpdll, tmpdir); + if ((ptr = wcsrchr(tmpdir, '\\'))) *ptr = '\0'; + + ret = CopyFileW(dll_name, tmpdll, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + + si.cb = sizeof(si); + ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 500); + else + { + ret = WaitForSingleObject(pi.hProcess, 5000); + ok(ret == WAIT_OBJECT_0, "%s: WaitForSingleObject returned %d: %u\n", debugstr_w(dll_dest), ret, GetLastError()); + } + + GetExitCodeProcess(pi.hProcess, &exit_code); + if (ret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0xdeadbeef); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + if (expect_failure) todo_wine_if(todo) ok(exit_code != 0, "%s: Succeeded to execute process\n", debugstr_w(dll_dest)); + else ok(exit_code == 0, "%s: Failed to execute process\n", debugstr_w(dll_dest)); + + /* sometimes the failing process never returns, in which case cleaning up won't work */ + if (ret == WAIT_TIMEOUT && expect_failure) return; + + if (cfg_name) + { + ret = DeleteFileW(tmpcfg); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + ret = DeleteFileW(tmpdll); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + ret = DeleteFileW(tmpexe); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + end = tmpdir + wcslen(tmp); + ptr = tmpdir + wcslen(tmpdir) - 1; + while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) + { + ret = RemoveDirectoryW(tmpdir); + ok(ret, "RemoveDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\0'; + } +} + +static void test_loadpaths(BOOL neutral) +{ + static const WCHAR *loadpaths[] = {L"", L"en", L"libloadpaths", L"en\\libloadpaths"}; + static const WCHAR *dll_source = L"loadpaths.dll.cs"; + static const WCHAR *dll_name = L"libloadpaths.dll"; + static const WCHAR *exe_source = L"loadpaths.exe.cs"; + static const WCHAR *exe_name = L"loadpaths.exe"; + static const WCHAR *cfg_name = L"loadpaths.exe.config"; + WCHAR tmp[MAX_PATH]; + BOOL ret; + int i; + + DeleteFileW(dll_source); + ret = write_resource(dll_source, dll_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(dll_name); + ret = compile_cs(dll_source, dll_name, L"library", neutral ? L"-define:NEUTRAL" : L""); + if (!ret) return; + ret = DeleteFileW(dll_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(exe_source); + ret = write_resource(exe_source, exe_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(exe_name); + ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + if (!ret) return; + ret = DeleteFileW(exe_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(cfg_name); + ret = write_resource(cfg_name, cfg_name); + ok(ret, "Could not write resource: %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(loadpaths); ++i) + { + const WCHAR *path = loadpaths[i]; + BOOL expect_failure = neutral ? wcsstr(path, L"en") != NULL + : wcsstr(path, L"en") == NULL; + + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, !neutral && !*path); + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + + /* exe name for dll should work too */ + if (*path) + { + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, FALSE); + } + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + } + + ret = DeleteFileW(cfg_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(exe_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(dll_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); +} + static void test_createdomain(void) { static const WCHAR test_name[] = {'t','e','s','t',0}; @@ -650,5 +873,8 @@ START_TEST(mscoree) test_createdomain(); } + test_loadpaths(FALSE); + test_loadpaths(TRUE); + FreeLibrary(hmscoree); } diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc index 9a1b89f6569..34516f744a0 100644 --- a/dlls/mscoree/tests/resource.rc +++ b/dlls/mscoree/tests/resource.rc @@ -28,3 +28,12 @@ comtest_exe.manifest RCDATA comtest_exe.manifest /* @makedep: comtest_dll.manifest */ comtest_dll.manifest RCDATA comtest_dll.manifest + +/* @makedep: loadpaths.exe.cs */ +loadpaths.exe.cs RCDATA loadpaths.exe.cs + +/* @makedep: loadpaths.dll.cs */ +loadpaths.dll.cs RCDATA loadpaths.dll.cs + +/* @makedep: loadpaths.exe.config */ +loadpaths.exe.config RCDATA loadpaths.exe.config -- 2.30.0

2 1

[PATCH] gdiplus/tests: Test image brush transformation.
by Haoyang Chen 03 Feb '21

03 Feb '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdiplus/tests/brush.c | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 78939e68991..0287078bc80 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <math.h> #include "objbase.h" @@ -274,6 +275,37 @@ static void test_transform(void) GpPointF start, end; GpRectF rectf; REAL elements[6]; + UINT buf[15]; + HBITMAP hbmp,old; + HDC dcmem; + BITMAP bm; + GpImage *image; + IStream *stream; + HGLOBAL hglob; + VOID *data; + HRESULT hr; + LONG size; + + /* 3*5 bmp 32bit*/ + static const unsigned char bmpimage[] = { + 0x42,0x4d,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00, + 0x00,0x00,0x28,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00, + 0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x3e,0x00, + 0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00, + 0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00, + 0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00, + 0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00, + 0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00, + 0x00,0x00,0x00,0x00}; + + static const UINT buf_rotate_180[15] = { + 0xffffffff, 0xffffffff, 0xffffffff, + 0xffff11ff, 0xffff11ff, 0xffff11ff, + 0xffff33ff, 0xffff33ff, 0xffff33ff, + 0xffff55ff, 0xffff55ff, 0xffff55ff, + 0xffffaaff, 0xffffaaff, 0xffffaaff}; /* GpTexture */ status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); @@ -556,6 +588,38 @@ static void test_transform(void) expect(Ok, status); status = GdipDeleteBrush((GpBrush*)line); expect(Ok,status); + GdipDeleteGraphics(graphics); + + dcmem = CreateCompatibleDC(hdc); + hbmp = CreateBitmap(3, 5, 1, 32, NULL); + old = SelectObject(dcmem, hbmp); + status = GdipCreateFromHDC(dcmem, &graphics); + expect(Ok, status); + hglob = GlobalAlloc(0, sizeof(bmpimage)); + data = GlobalLock (hglob); + memcpy(data, bmpimage, sizeof(bmpimage)); + GlobalUnlock(hglob); + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + expect(S_OK, hr); + status = GdipLoadImageFromStream(stream, &image); + expect(Ok, status); + status = GdipCreateTexture(image, WrapModeTile, &texture); + expect(Ok, status); + status = GdipRotateTextureTransform(texture, 180.0f, MatrixOrderPrepend); + expect(Ok, status); + status = GdipFillRectangle(graphics, (GpBrush*)texture, .0f, .0f, (REAL)3, (REAL)5); + expect(Ok, status); + GdipDeleteBrush((GpBrush*)texture); + GdipDisposeImage(image); + GdipDeleteGraphics(graphics); + IStream_Release(stream); + hbmp = SelectObject(dcmem, old); + GetObjectW(hbmp, sizeof(bm), &bm); + size = GetBitmapBits(hbmp, sizeof(buf), buf); + expect(sizeof(buf), size); + DeleteObject(hbmp); + DeleteDC(dcmem); + ok(!memcmp(buf, buf_rotate_180, sizeof(buf)), "Failed to rotate image.\n"); if(0){ /* enable to visually compare with Windows */ -- 2.20.1

2 1

[tools] testbot/PatchUtils: Only update the Wine files list for Wine patches.
by Francois Gouget 03 Feb '21

03 Feb '21

Only update the list of Wine files if the patch is a Wine patch or will trigger a make_makefiles run (which means any new file could be used). Also reset IsWinePatch to evaluate later parts on their own merits. But note that if we had MakeMakefiles=1 despite IsWinePatch=0 (previous parts modified a Makefile.in file but are not unambiguously a Wine patch), if the last part modifies one of the files newly added to the Wine files list it will automatically get IsWinePatch=1; whereas if presented as a single patch it would still have had MakeMakefiles=1 + IsWinePatch=0. Fortunately the two cases are equivalent as far as Patches::Submit() is concerned. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite test: WTBS S6.2 - Patch to a non-Wine file. testbot/lib/WineTestBot/PatchUtils.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dda855d11..aeb874321 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -393,10 +393,14 @@ sub GetPatchImpacts($) # Build a copy of the Wine files list reflecting the current situation. $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; - $Impacts->{NewFiles} = {}; - $Impacts->{DeletedFiles} = {}; + if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) + { + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; + $Impacts->{NewFiles} = {}; + $Impacts->{DeletedFiles} = {}; + delete $Impacts->{IsWinePatch}; + } # The modules impacted by previous parts will still need to be built, # but only if the last part justifies a build. So make a backup. -- 2.20.1

1 0

[tools] testbot/TestWTBS: Convert the job ranges into patch ranges.
by Francois Gouget 03 Feb '21

03 Feb '21

Check all patches that have a job that falls in the job ranges, or are in the set of no-job patches surrounding those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This ensures any test that results in a no-job patch disposition (e.g. "Part is not a Wine patch") will be checked, even if they are at the start or end of the job list. testbot/tests/TestWTBS | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index f6ca54e84..87b53fea5 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,7 +131,7 @@ while (@ARGV) } } -my @JobRanges; +my $JobRanges = []; if (!defined $Usage) { if (defined $OptJobs) @@ -140,11 +140,11 @@ if (!defined $Usage) { if ($Range =~ /^([0-9]+)$/) { - push @JobRanges, [$1, $1]; + push @$JobRanges, [$1, $1]; } elsif ($Range =~ /^([0-9]*)\.\.([0-9]*)/) { - push @JobRanges, [$1 || 0, $2 || 0]; + push @$JobRanges, [$1 || 0, $2 || 0]; } else { @@ -983,15 +983,16 @@ sub CheckJob($$) } } -sub IsJobInRange($) +sub IsInRange($$) { - my ($Job) = @_; + my ($Ranges, $Id) = @_; - return 1 if (!@JobRanges); - foreach my $Range (@JobRanges) + return 0 if (!$Id); + return 1 if (!$Ranges or !@$Ranges); + foreach my $Range (@$Ranges) { - return 1 if (($Range->[0] == 0 or $Range->[0] <= $Job->Id) and - ($Range->[1] == 0 or $Job->Id <= $Range->[1])); + return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and + ($Range->[1] == 0 or $Id <= $Range->[1])); } return 0; } @@ -1040,7 +1041,7 @@ but not parts 3 and 4. sub CheckJobTree($;$) { my ($Job, $TestInfo) = @_; - return if (!IsJobInRange($Job)); + return if (!IsInRange($JobRanges, $Job->Id)); my $JobId = $Job->Id; # Simplify use in strings return if ($CheckedJobs{$JobId}); @@ -1267,28 +1268,20 @@ sub CheckPatch($$$) { $Job = $Jobs->GetItem($1); } - # The job range restriction extends to their associated patches... - return if ($Job and !IsJobInRange($Job)); - # ..and to patches with no job - return if (!$Job and @JobRanges); my $PatchInfo = $TestInfo->{patch}; if (CheckValue($PatchInfo->{Disposition})) { is($Patch->Disposition, $PatchInfo->{Disposition}, "Check Disposition for patch ". $Patch->Id .": ". $Patch->Subject); } - elsif ($Patch->Disposition =~ /^Submitted job (.*)$/) + elsif ($Job) { - isnt($Job, undef, "Check job $1 for patch ". $Patch->Id .": ". $Patch->Subject); - if (!$Job or $Job->Status eq "canceled") - { - ; # Nothing to check - } - elsif ($Job->Status =~ /^(?:queued|running)$/) + isnt($Job, undef, "Check job ". $Job->Id ." for patch ". $Patch->Id .": ". $Patch->Subject); + if ($Job->Status =~ /^(?:queued|running)$/) { print "...skipping job ". $Job->Id ." because it is not complete yet (". $Job->Status .")\n"; } - else + elsif ($Job->Status ne "canceled") { # Provide defaults for the job checks my $Remarks = $Patch->Subject; @@ -1310,8 +1303,46 @@ sub CheckPatches() { my $Jobs = CreateJobs(); my $Patches = CreatePatches(); + + my $PatchRanges = []; + if (@$JobRanges) + { + # Convert the job ranges into a list of patch ranges so that these patches: + # 1. either have a job in the allowed job ranges, + # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + my ($First, $Last, $AddRange); + foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) + { + if ($Patch->Disposition =~ /^Submitted job (\d+)$/) + { + my $Job = $Jobs->GetItem($1); + if ($Job and IsInRange($JobRanges, $Job->Id)) + { + $AddRange = 1; + } + elsif ($AddRange) + { + push @$PatchRanges, [$First, $Last]; + $First = $Last = $AddRange = undef; + next; + } + else + { + $First = $Last = $AddRange = undef; + next; + } + } + + $First = $Patch->Id if (!$First); + $Last = $Patch->Id; + } + push @$PatchRanges, [$First, $Last] if ($AddRange); + } + foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { + next if (!IsInRange($PatchRanges, $Patch->Id)); + my $PatchFileName = "$DataDir/patches/". $Patch->Id; if (-f $PatchFileName) { -- 2.20.1

1 0

[tools] testbot/WinRun*: Simplify LogTaskError().
by Francois Gouget 03 Feb '21

03 Feb '21

The TestBot engine redirects stderr to testbot.log so there is no need to manually open and append to that file. This also makes the Debug() call in LogTaskError() redundant. Add the "tool:error:" prefix. This clarifies which errors come from the script, and which come from the TestBot Engine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48658 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 14 +------------- testbot/bin/WineRunReconfig.pl | 14 +------------- testbot/bin/WineRunTask.pl | 14 +------------- testbot/bin/WineRunWineTest.pl | 12 +----------- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2764ffc92..ff130526e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -178,19 +178,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 8047d3e6e..004987f5b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -179,19 +179,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 303648807..6056806f3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -207,19 +207,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index bcf89bfa7..7892bca74 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -204,17 +204,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; -- 2.20.1

1 0

[tools 1/2] testbot: Fix the webpatches setup instructions.
by Francois Gouget 03 Feb '21

03 Feb '21

The webpatches directory should be created in the TestBot directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The current configuration of the TestBot and patches websites are ok of course. This just fixes the documentation on how to replicate it. It's a bit untested since I did not feel like re-setting up my box from scratch but it should match what I have. testbot/doc/INSTALL.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0dd5710f7..7565d6b4d 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -79,9 +79,8 @@ Setup for Wine's patches site: using the WineTestBot web interface and that the results are sane. You may also want to run with $PatchFromEMailOverride set for a while to spot any issue under load. -- In $HOME/tools/testbot/var, set up the webpatches symbolic link to point to - where the patches website stores its patches and test results. Typically: - ln -s $HOME/patches $HOME/tools/testbot/var/webpatches +- In $HOME/tools/testbot/var, create the webpatches directory: + mkdir $HOME/tools/testbot/var/webpatches - Use a cron job to run WinePatchesWebSubmit.pl periodically. For instance: */5 * * * * $HOME/tools/testbot/bin/WinePatchesWebSubmit.pl -- 2.20.1

1 1

[PATCH 1/5] kernel32/tests: Correctly check for failure from FindFirstFile().
by Zebediah Figura 03 Feb '21

03 Feb '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/file.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2814ab194b2..6d2a216e39c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2928,7 +2928,7 @@ static void test_FindFirstFile_wildcards(void) {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {1, " *..", ", '.aaa'"}, + {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, {1, "?", ", '.', '..', 'a'"}, {1, "?.", ", '.', '..', 'a'"}, @@ -2954,23 +2954,26 @@ static void test_FindFirstFile_wildcards(void) correct[0] = incorrect[0] = 0; handle = FindFirstFileA(tests[i].pattern, &find_data); - if (handle) do { - char* ptr; - char quoted[16]; + if (handle != INVALID_HANDLE_VALUE) + { + do { + char *ptr; + char quoted[16]; - sprintf( quoted, ", '%.10s'", find_data.cFileName ); + sprintf(quoted, ", '%.10s'", find_data.cFileName); - if ((ptr = strstr(missing, quoted))) - { - int len = strlen(quoted); - while ((ptr[0] = ptr[len]) != 0) - ++ptr; - strcat(correct, quoted); - } - else - strcat(incorrect, quoted); - } while (FindNextFileA(handle, &find_data)); - FindClose(handle); + if ((ptr = strstr(missing, quoted))) + { + int len = strlen(quoted); + while ((ptr[0] = ptr[len]) != 0) + ++ptr; + strcat(correct, quoted); + } + else + strcat(incorrect, quoted); + } while (FindNextFileA(handle, &find_data)); + FindClose(handle); + } todo_wine_if (tests[i].todo) ok(missing[0] == 0 && incorrect[0] == 0, -- 2.20.1

1 4

[PATCH 1/5] winegstreamer: Move the "mutex" field to struct wg_parser.
by Zebediah Figura 03 Feb '21

03 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 143 ++++++++++++++++------------------ 1 file changed, 65 insertions(+), 78 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1ddbc954fb4..9f733396d92 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -56,6 +56,8 @@ struct wg_parser pthread_t push_thread; + pthread_mutex_t mutex; + pthread_cond_t init_cond; bool no_more_pads, has_duration, error; @@ -95,8 +97,6 @@ struct parser uint64_t next_pull_offset; - pthread_mutex_t mutex; - HANDLE read_thread; BOOL (*init_gst)(struct parser *filter); @@ -706,7 +706,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct parser_event *event) { - struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser *parser = impl_from_strmbase_filter(pin->pin.pin.filter)->wg_parser; /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer * flushes here. The difference is that we can be blocked by the streaming @@ -714,17 +714,17 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct * request_buffer_src() can only be blocked by the upstream source, and that * is solved by flushing the upstream source. */ - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); + pthread_cond_wait(&pin->event_empty_cond, &parser->mutex); if (pin->flushing) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); GST_DEBUG("Filter is flushing; discarding event."); return GST_FLOW_FLUSHING; } pin->event = *event; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&pin->event_cond); GST_LOG("Event queued."); return GST_FLOW_OK; @@ -774,9 +774,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } else { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->eos = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); } break; @@ -784,7 +784,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: if (pin->pin.pin.peer) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->flushing = true; pthread_cond_signal(&pin->event_empty_cond); @@ -802,7 +802,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } pin->event.type = PARSER_EVENT_NONE; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); } break; @@ -810,9 +810,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); } break; @@ -821,9 +821,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) GstCaps *caps; gst_event_parse_caps(event, &caps); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); gst_caps_replace(&pin->caps, caps); - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; } @@ -1041,14 +1041,14 @@ static bool get_stream_event(struct parser_source *pin, struct parser_event *eve struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); struct wg_parser *parser = filter->wg_parser; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->flushing && pin->event.type == PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_cond, &filter->mutex); + pthread_cond_wait(&pin->event_cond, &parser->mutex); if (parser->flushing) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); TRACE("Filter is flushing.\n"); return false; } @@ -1056,7 +1056,7 @@ static bool get_stream_event(struct parser_source *pin, struct parser_event *eve *event = pin->event; pin->event.type = PARSER_EVENT_NONE; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&pin->event_empty_cond); return true; @@ -1121,7 +1121,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); assert(!parser->read_request.buffer); parser->read_request.buffer = *buffer; @@ -1135,11 +1135,11 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 * read_thread() not running. */ while (!parser->read_request.done) - pthread_cond_wait(&parser->read_done_cond, &filter->mutex); + pthread_cond_wait(&parser->read_done_cond, &parser->mutex); ret = parser->read_request.ret; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); GST_LOG("Request returned %s.", gst_flow_get_name(ret)); @@ -1186,12 +1186,12 @@ static DWORD CALLBACK read_thread(void *arg) TRACE("Starting read thread for filter %p.\n", filter); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (filter->sink_connected) { while (parser->sink_connected && !parser->read_request.buffer) - pthread_cond_wait(&parser->read_cond, &filter->mutex); + pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) break; @@ -1203,7 +1203,7 @@ static DWORD CALLBACK read_thread(void *arg) pthread_cond_signal(&parser->read_done_cond); } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); TRACE("Streaming stopped; exiting.\n"); return 0; @@ -1488,9 +1488,9 @@ static void no_more_pads(GstElement *decodebin, gpointer user) GST_DEBUG("filter %p.", filter); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); } @@ -1530,9 +1530,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->error = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1545,9 +1545,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) break; case GST_MESSAGE_DURATION_CHANGED: - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->has_duration = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1619,7 +1619,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->init_gst(This)) return E_FAIL; - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); for (i = 0; i < This->source_count; ++i) { @@ -1628,15 +1628,15 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); pin->seek.llCurrent = 0; while (!pin->caps && !parser->error) - pthread_cond_wait(&parser->init_cond, &This->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); return E_FAIL; } } - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); parser->next_offset = 0; This->next_pull_offset = 0; @@ -1677,6 +1677,7 @@ static void wg_parser_destroy(struct wg_parser *parser) gst_object_unref(parser->bus); } + pthread_mutex_destroy(&parser->mutex); pthread_cond_destroy(&parser->init_cond); pthread_cond_destroy(&parser->read_cond); pthread_cond_destroy(&parser->read_done_cond); @@ -1704,8 +1705,6 @@ static void parser_destroy(struct strmbase_filter *iface) wg_parser_destroy(filter->wg_parser); - pthread_mutex_destroy(&filter->mutex); - strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); @@ -1723,9 +1722,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -1764,9 +1763,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -1878,9 +1877,9 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = parser->error = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { @@ -1896,15 +1895,15 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -1998,11 +1997,6 @@ static BOOL parser_init_gstreamer(void) return TRUE; } -static void parser_init_common(struct parser *object) -{ - pthread_mutex_init(&object->mutex, NULL); -} - static struct wg_parser *wg_parser_create(void) { struct wg_parser *parser; @@ -2010,6 +2004,7 @@ static struct wg_parser *wg_parser_create(void) if (!(parser = calloc(1, sizeof(*parser)))) return NULL; + pthread_mutex_init(&parser->mutex, NULL); pthread_cond_init(&parser->init_cond, NULL); pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); @@ -2037,8 +2032,6 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); @@ -2172,9 +2165,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2221,9 +2214,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2526,13 +2519,13 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) return S_OK; /* Unblock all of our streams. */ - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); for (i = 0; i < This->source_count; ++i) { This->sources[i]->flushing = true; pthread_cond_signal(&This->sources[i]->event_empty_cond); } - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); gst_pad_unlink(parser->my_src, parser->their_sink); @@ -2543,9 +2536,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) /* read_thread() needs to stay alive to service any read requests GStreamer * sends, so we can only shut it down after GStreamer stops. */ This->sink_connected = false; - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_cond); WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); @@ -2701,8 +2694,6 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; @@ -2750,9 +2741,9 @@ static BOOL avi_splitter_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = parser->error = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { @@ -2768,15 +2759,15 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -2821,8 +2812,6 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); object->init_gst = avi_splitter_init_gst; @@ -2896,15 +2885,15 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->has_duration && !parser->error && !pin->eos) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -2972,8 +2961,6 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; -- 2.30.0

1 4

[PATCH 2/3] msvcrt: Improve sqrt accuracy and performance on i386.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)

3 3

[PATCH vkd3d 1/5] vkd3d-shader: Move instruction allocation functions to hlsl.c.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 205 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 22 ++++- libs/vkd3d-shader/hlsl.y | 205 --------------------------------------- 3 files changed, 224 insertions(+), 208 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cd0d9cbc..e73ed923 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -18,6 +18,7 @@ */ #include "hlsl.h" +#include <stdio.h> BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { @@ -102,6 +103,41 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra return type; } +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + +struct hlsl_type *new_struct_type(const char *name, struct list *fields) +{ + struct hlsl_struct_field *field; + unsigned int reg_size = 0; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; + type->name = name; + type->dimx = 0; + type->dimy = 1; + type->e.elements = fields; + + LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) + { + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); + } + type->reg_size = reg_size; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -639,6 +675,35 @@ struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, return expr_from_node(cast); } +struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) +{ + struct hlsl_ir_var *var; + + if (!(var = vkd3d_calloc(1, sizeof(*var)))) + { + hlsl_ctx.status = PARSE_ERR; + return NULL; + } + + var->name = name; + var->data_type = type; + var->loc = loc; + var->semantic = semantic; + var->modifiers = modifiers; + var->reg_reservation = reg_reservation; + return var; +} + +struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, const struct source_location loc) +{ + struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); + + if (var) + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + return var; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -780,6 +845,146 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return &assign->node; } +static BOOL type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + +struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) +{ + struct hlsl_ir_assignment *assign; + + if (!writemask && type_is_single_reg(rhs->data_type)) + writemask = (1 << rhs->data_type->dimx) - 1; + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); + assign->lhs.var = var; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); + assign->writemask = writemask; + return assign; +} + +struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + return new_assignment(lhs, NULL, rhs, 0, rhs->loc); +} + +struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); + c->value.u[0] = n; + return c; +} + +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) +{ + struct hlsl_ir_expr *expr; + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg); + return &expr->node; +} + +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) +{ + struct hlsl_ir_expr *expr; + + assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); + return &expr->node; +} + +struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = vkd3d_malloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + +struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) +{ + struct hlsl_ir_load *load; + + if (!(load = vkd3d_calloc(1, sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); + load->src.var = var; + return load; +} + +struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle; + + if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) + return NULL; + init_node(&swizzle->node, HLSL_IR_SWIZZLE, + new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + hlsl_src_from_node(&swizzle->val, val); + swizzle->swizzle = s; + return swizzle; +} + +BOOL type_is_void(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; +} + +struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) +{ + struct hlsl_ir_function_decl *decl; + + if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) + return NULL; + decl->return_type = return_type; + decl->parameters = parameters; + decl->semantic = semantic; + decl->loc = loc; + + if (!type_is_void(return_type)) + { + struct hlsl_ir_var *return_var; + char name[28]; + + sprintf(name, "<retval-%p>", decl); + if (!(return_var = new_synthetic_var(name, return_type, loc))) + { + vkd3d_free(decl); + return NULL; + } + decl->return_var = return_var; + } + + return decl; +} + static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) { const struct hlsl_type *type = RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 128de1d6..aabfbaf9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -599,19 +599,34 @@ struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, stru struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, - struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; +struct hlsl_type *new_struct_type(const char *name, struct list *fields) DECLSPEC_HIDDEN; +struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) DECLSPEC_HIDDEN; +struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) DECLSPEC_HIDDEN; BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; -struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; @@ -624,6 +639,7 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void init_functions_tree(struct rb_tree *funcs) DECLSPEC_HIDDEN; void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, BOOL intrinsic) DECLSPEC_HIDDEN; +BOOL type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e2218c5..df155a08 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -77,11 +77,6 @@ static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_locati "'row_major' or 'column_major' modifiers are only allowed for matrices."); } -static BOOL type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { BOOL ret; @@ -232,24 +227,6 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } -static BOOL type_is_void(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; -} - -static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) -{ - struct hlsl_ir_if *iff; - - if (!(iff = vkd3d_malloc(sizeof(*iff)))) - return NULL; - init_node(&iff->node, HLSL_IR_IF, NULL, loc); - hlsl_src_from_node(&iff->condition, condition); - list_init(&iff->then_instrs); - list_init(&iff->else_instrs); - return iff; -} - static BOOL append_conditional_break(struct list *cond_list) { struct hlsl_ir_node *condition, *not; @@ -352,20 +329,6 @@ static void free_parse_initializer(struct parse_initializer *initializer) vkd3d_free(initializer->args); } -static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, - struct hlsl_ir_node *val, struct source_location *loc) -{ - struct hlsl_ir_swizzle *swizzle; - - if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) - return NULL; - init_node(&swizzle->node, HLSL_IR_SWIZZLE, - new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); - hlsl_src_from_node(&swizzle->val, val); - swizzle->swizzle = s; - return swizzle; -} - static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, struct source_location *loc) { @@ -448,60 +411,6 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } -static struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, - const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) -{ - struct hlsl_ir_var *var; - - if (!(var = vkd3d_calloc(1, sizeof(*var)))) - { - hlsl_ctx.status = PARSE_ERR; - return NULL; - } - - var->name = name; - var->data_type = type; - var->loc = loc; - var->semantic = semantic; - var->modifiers = modifiers; - var->reg_reservation = reg_reservation; - return var; -} - -static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, - const struct source_location loc) -{ - struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); - - if (var) - list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); - return var; -} - -static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) -{ - struct hlsl_ir_assignment *assign; - - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; - - if (!(assign = vkd3d_malloc(sizeof(*assign)))) - return NULL; - - init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); - assign->lhs.var = var; - hlsl_src_from_node(&assign->lhs.offset, offset); - hlsl_src_from_node(&assign->rhs, rhs); - assign->writemask = writemask; - return assign; -} - -static struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) -{ - return new_assignment(lhs, NULL, rhs, 0, rhs->loc); -} - static struct hlsl_ir_jump *add_return(struct list *instrs, struct hlsl_ir_node *return_value, struct source_location loc) { @@ -534,56 +443,6 @@ static struct hlsl_ir_jump *add_return(struct list *instrs, return jump; } -static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) -{ - struct hlsl_ir_constant *c; - - if (!(c = vkd3d_malloc(sizeof(*c)))) - return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); - c->value.u[0] = n; - return c; -} - -struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) -{ - struct hlsl_ir_expr *expr; - - if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg); - return &expr->node; -} - -struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, - struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) -{ - struct hlsl_ir_expr *expr; - - assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); - - if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg1); - hlsl_src_from_node(&expr->operands[1], arg2); - return &expr->node; -} - -static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) -{ - struct hlsl_ir_load *load; - - if (!(load = vkd3d_calloc(1, sizeof(*load)))) - return NULL; - init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); - load->src.var = var; - return load; -} - static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct source_location loc) { @@ -777,41 +636,6 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s return list; } -static DWORD get_array_size(const struct hlsl_type *type) -{ - if (type->type == HLSL_CLASS_ARRAY) - return get_array_size(type->e.array.type) * type->e.array.elements_count; - return 1; -} - -static struct hlsl_type *new_struct_type(const char *name, struct list *fields) -{ - struct hlsl_struct_field *field; - unsigned int reg_size = 0; - struct hlsl_type *type; - - if (!(type = vkd3d_calloc(1, sizeof(*type)))) - return NULL; - type->type = HLSL_CLASS_STRUCT; - type->base_type = HLSL_TYPE_VOID; - type->name = name; - type->dimx = 0; - type->dimy = 1; - type->e.elements = fields; - - LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) - { - field->reg_offset = reg_size; - reg_size += field->type->reg_size; - type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); - } - type->reg_size = reg_size; - - list_add_tail(&hlsl_ctx.types, &type->entry); - - return type; -} - static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) { struct parse_variable_def *v, *v_next; @@ -1203,35 +1027,6 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, return statements_list; } -static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, - struct list *parameters, const char *semantic, struct source_location loc) -{ - struct hlsl_ir_function_decl *decl; - - if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) - return NULL; - decl->return_type = return_type; - decl->parameters = parameters; - decl->semantic = semantic; - decl->loc = loc; - - if (!type_is_void(return_type)) - { - struct hlsl_ir_var *return_var; - char name[28]; - - sprintf(name, "<retval-%p>", decl); - if (!(return_var = new_synthetic_var(name, return_type, loc))) - { - vkd3d_free(decl); - return NULL; - } - decl->return_var = return_var; - } - - return decl; -} - %} %locations -- 2.30.0

3 14

unsubscribe
by Tobias Stevenson 02 Feb '21

02 Feb '21

Tobias Stevenson Software Engineer codenamekt(a)gmail.com 1-(713)-725-7977

1 0

[PATCH] msxml3: Fold in reset_output_buffer.
by Jefferson Carpenter 02 Feb '21

02 Feb '21

2 1

[v2 PATCH 1/5] mfplat/tests: Add some tests for D3D11-aware sample allocator.
by Nikolay Sivov 02 Feb '21

02 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: skip test on win8 dlls/mfplat/tests/mfplat.c | 395 +++++++++++++++++++++++++++++++++++++ include/mfapi.h | 3 + include/mfobjects.idl | 28 +++ 3 files changed, 426 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 77ac299c918..63926d56028 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -70,6 +70,13 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -124,6 +131,9 @@ static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_t static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); +static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); +static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); static HWND create_window(void) { @@ -780,12 +790,14 @@ static void init_functions(void) X(MFCopyImage); X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); + X(MFCreateDXGISurfaceBuffer); X(MFCreateDXSurfaceBuffer); X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); X(MFCreateTrackedSample); X(MFCreateTransformActivate); + X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); X(MFMapDXGIFormatToDX9Format); @@ -5246,6 +5258,7 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMF2DBuffer, TRUE); /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); @@ -6025,6 +6038,386 @@ static void test_MFMapDXGIFormatToDX9Format(void) } } +static HRESULT WINAPI test_notify_callback_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_notify_callback_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI test_notify_callback_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI test_notify_callback_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl test_notify_callback_vtbl = +{ + test_notify_callback_QueryInterface, + test_notify_callback_AddRef, + test_notify_callback_Release, + test_notify_callback_NotifyRelease, +}; + +static IMFMediaType * create_video_type(const GUID *subtype) +{ + IMFMediaType *video_type; + HRESULT hr; + + hr = MFCreateMediaType(&video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return video_type; +} + +static ID3D11Device *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + unsigned int feature_level_count; + ID3D11Device *device; + + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + +static void test_dxgi_surface_buffer(void) +{ + IMFDXGIBuffer *dxgi_buffer; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IMFMediaBuffer *buffer; + ID3D11Device *device; + UINT index, size; + IUnknown *obj; + HRESULT hr; + BYTE *data; + + if (!pMFCreateDXGISurfaceBuffer) + { + skip("MFCreateDXGISurfaceBuffer() is not available.\n"); + return; + } + + device = create_d3d11_device(); + + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Failed to create a texture, hr %#x.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, FALSE, &buffer); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win8 */, "Failed to create a buffer, hr %#x.\n", hr); + + if (FAILED(hr)) + { + ID3D11Texture2D_Release(texture); + ID3D11Device_Release(device); + return; + } + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + EXPECT_REF(texture, 2); + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&obj); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + EXPECT_REF(texture, 3); + ok(obj == (IUnknown *)texture, "Unexpected resource pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, &index); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(index == 0, "Unexpected subresource index.\n"); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, (void *)device); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3D11Texture2D_GetPrivateData(texture, &IID_IMFDXGIBuffer, &size, &data); + ok(hr == DXGI_ERROR_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_ID3D11Device, (void **)&obj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(obj == (IUnknown *)device, "Unexpected pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_IUnknown, (void **)&obj); + ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + IMFDXGIBuffer_Release(dxgi_buffer); + + IMFMediaBuffer_Release(buffer); + + ID3D11Texture2D_Release(texture); + + ID3D11Device_Release(device); +} + +static void test_sample_allocator(void) +{ + IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; + IMFVideoSampleAllocatorCallback *allocator_cb; + IMFVideoSampleAllocatorEx *allocatorex; + IMFMediaType *media_type, *video_type; + IMFVideoSampleAllocator *allocator; + IMFDXGIDeviceManager *manager; + IMFSample *sample, *sample2; + IMFMediaBuffer *buffer; + ID3D11Device *device; + LONG refcount, count; + unsigned int token; + IUnknown *unk; + HRESULT hr; + BYTE *data; + + if (!pMFCreateVideoSampleAllocatorEx) + { + skip("MFCreateVideoSampleAllocatorEx() is not available.\n"); + return; + } + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(unk, &IID_IMFVideoSampleAllocator, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorEx, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorCallback, TRUE); + + IUnknown_Release(unk); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 10; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + video_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + /* Frame size is required. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + sample = NULL; + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + refcount = get_refcount(sample); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + /* Reinitialize with active sample. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + check_interface(sample, &IID_IMFTrackedSample, TRUE); + check_interface(sample, &IID_IMFDesiredSample, FALSE); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + + IMFMediaBuffer_Release(buffer); + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocator_Release(allocator); + + /* IMFVideoSampleAllocatorEx */ + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_QueryInterface(allocatorex, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 1, 0, NULL, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, NULL, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocatorEx_Release(allocatorex); + + /* Using device manager */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create device manager, hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IMFDXGIDeviceManager_Release(manager); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { char **argv; @@ -6085,6 +6478,8 @@ START_TEST(mfplat) test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); test_MFMapDXGIFormatToDX9Format(); + test_dxgi_surface_buffer(); + test_sample_allocator(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 77875486e54..7bac3e21fa9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -510,6 +510,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); +HRESULT WINAPI MFCreateDXGISurfaceBuffer(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateDXSurfaceBuffer(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, @@ -522,6 +524,7 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); +HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **allocator); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index ee49be35af0..b2d0e5d06ec 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -167,6 +167,34 @@ interface IMF2DBuffer2 : IMF2DBuffer HRESULT Copy2DTo([in] IMF2DBuffer2 *dest_buffer); } +[ + object, + uuid(e7174cfa-1c9e-48b1-8866-626226bfc258), + local +] +interface IMFDXGIBuffer : IUnknown +{ + HRESULT GetResource( + [in] REFIID riid, + [out] void **object + ); + + HRESULT GetSubresourceIndex( + [out] UINT *index + ); + + HRESULT GetUnknown( + [in] REFIID guid, + [in] REFIID riid, + [out] void **object + ); + + HRESULT SetUnknown( + [in] REFIID guid, + [in] IUnknown *data + ); +} + [ object, uuid(44ae0fa8-ea31-4109-8d2e-4cae4997c555), -- 2.30.0

2 6

[PATCH 2/2] msvcr110: Copy utf16 strings in _Gettnames.
by Piotr Caban 02 Feb '21

02 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50409 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 13 ++++++++++--- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/tests/locale.c | 4 ++++ 3 files changed, 26 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] msvcrt: Make __lc_time_data more similar to native.
by Piotr Caban 02 Feb '21

02 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 6 ++++++ dlls/msvcrt/msvcrt.h | 2 ++ 2 files changed, 8 insertions(+)

1 0

[PATCH] ucrtbase: Fix _Syserror_map behavior on unknown error.
by Piotr Caban 02 Feb '21

02 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50407 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 14 ++++++++++++++ dlls/msvcp140/tests/msvcp140.c | 15 +++++++++++++++ dlls/msvcp90/misc.c | 4 ++++ 3 files changed, 33 insertions(+)

1 0

[PATCH v2] gdi32: Fail in ExtTextOut if count is larger than INT_MAX.
by Gabriel Ivăncescu 02 Feb '21

02 Feb '21

Some applications pass values like -1 and crash when BIDI_Reorder can't allocate the memory. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 3 +++ dlls/gdi32/tests/font.c | 2 ++ dlls/gdi32/tests/metafile.c | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 74ca482..de50bf0 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5823,6 +5823,8 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, BOOL ret; LPINT lpDxW = NULL; + if (count > INT_MAX) return FALSE; + if (flags & ETO_GLYPH_INDEX) return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); @@ -5932,6 +5934,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, static int quietfixme = 0; if (!dc) return FALSE; + if (count > INT_MAX) return FALSE; align = dc->textAlign; breakRem = dc->breakRem; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 461eecf..3e1f1e9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6916,6 +6916,8 @@ static void test_bitmap_font_glyph_index(void) hBmpPrev = SelectObject(hdc, hBmp[j]); switch (j) { case 0: + ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, -1, NULL); + ok(!ret, "ExtTextOutW succeeded\n"); ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, lstrlenW(text), NULL); break; case 1: diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8dae908..15af24a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -222,7 +222,13 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); - /* 4. test with unmatched BeginPath/EndPath calls */ + /* 4. pass -1 to length */ + SetLastError(0xdeadbeef); + ret = ExtTextOutA(hdcMetafile, 0, 0, 0, &rc, text, -1, NULL); + ok( !ret, "ExtTextOutA succeeded\n"); + ok( GetLastError() == 0xdeadbeef, "ExtTextOutA error %d\n", GetLastError()); + + /* 5. test with unmatched BeginPath/EndPath calls */ ret = BeginPath(hdcMetafile); ok( ret, "BeginPath error %d\n", GetLastError()); ret = BeginPath(hdcMetafile); -- 2.29.2

2 2

[PATCH] include: Rename class parameters to mmcss_class.
by Rémi Bernon 02 Feb '21

02 Feb '21

In MFGetWorkQueueMMCSSClass and Rtwq MMCSS functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It causes unnecessary trouble when including the files in C++ sources. include/mfapi.h | 2 +- include/rtworkq.idl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 77875486e54..6789093d5e6 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -535,7 +535,7 @@ HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride); HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); -HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length); +HRESULT WINAPI MFGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length); HRESULT WINAPI MFGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority); HRESULT WINAPI MFGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, diff --git a/include/rtworkq.idl b/include/rtworkq.idl index e7ff768074c..32132961bd8 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -92,13 +92,13 @@ cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") cpp_quote("HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") -cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") +cpp_quote("HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *mmcss_class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state);") cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD *taskid);") -cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length);") +cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *mmcss_class, DWORD *length);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority);") cpp_quote("HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") @@ -109,7 +109,7 @@ cpp_quote("HRESULT WINAPI RtwqLockWorkQueue(DWORD queue);") cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncResult *result, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRegisterPlatformEvents(IRtwqPlatformEvents *events);") -cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *class, DWORD *taskid, LONG priority);") +cpp_quote("HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *mmcss_class, DWORD *taskid, LONG priority);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") cpp_quote("HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request);") -- 2.30.0

1 0

[PATCH] d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha.
by Zebediah Figura 02 Feb '21

02 Feb '21

From: Christian Costa <titan.costa(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48563 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Changes from staging patch: use malloc()/free(); move the code into a helper function. dlls/d3dx9_36/surface.c | 38 +++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 045d7267c96..362113386ea 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -887,6 +887,41 @@ static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) return TRUE; } +/* windowscodecs always returns xRGB, but we should return ARGB if and only if + * at least one pixel has a non-zero alpha component. */ +static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *info) +{ + unsigned int size, i; + BYTE *buffer; + HRESULT hr; + + if (info->Format != D3DFMT_X8R8G8B8 || info->ImageFileFormat != D3DXIFF_BMP) + return FALSE; + + size = info->Width * info->Height * 4; + if (!(buffer = malloc(size))) + return FALSE; + + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, info->Width * 4, size, buffer))) + { + ERR("Failed to copy pixels, hr %#x.\n", hr); + free(buffer); + return FALSE; + } + + for (i = 0; i < info->Width * info->Height; ++i) + { + if (buffer[i * 4 + 3]) + { + free(buffer); + return TRUE; + } + } + + free(buffer); + return FALSE; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -1006,6 +1041,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } } + if (SUCCEEDED(hr) && image_is_argb(frame, info)) + info->Format = D3DFMT_A8R8G8B8; + if (frame) IWICBitmapFrameDecode_Release(frame); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4590a758d78..1d32b68c3a6 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -698,7 +698,7 @@ static void test_D3DXGetImageInfo(void) ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format); hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); + ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); /* Grayscale PNG */ hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info); -- 2.30.0

2 1

[PATCH 2/2] server: Grant implicit DACL_SECURITY_INFORMATION permission to an object owner.
by Dmitry Timoshkov 02 Feb '21

02 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 4 ---- server/handle.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 91c49378e7f..f6a64b316e8 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7898,15 +7898,11 @@ static void test_regkey_security(void) sd = NULL; dacl = NULL; ret = GetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, &dacl, NULL, &sd); -todo_wine ok(ret == ERROR_SUCCESS, "got %u\n", ret); -todo_wine ok(sd != NULL, "sd should not be NULL\n"); -todo_wine ok(dacl != NULL, "dacl should not be NULL\n"); ret = SetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, dacl, NULL); -todo_wine ok(ret == ERROR_SUCCESS, "got %u\n", ret); LocalFree(sd); diff --git a/server/handle.c b/server/handle.c index 2556a03901e..fd17be3d40c 100644 --- a/server/handle.c +++ b/server/handle.c @@ -479,6 +479,17 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ return NULL; } + if (access & (READ_CONTROL | WRITE_DAC)) + { + const struct security_descriptor *sd = obj->ops->get_sd( obj ); + if (sd) + { + struct token *token = current->token ? current->token : current->process->token; + const SID *owner = sd_get_owner( sd ); + if (token_sid_present( token, owner, FALSE )) + access &= ~(READ_CONTROL | WRITE_DAC); + } + } if ((entry->access & access) != access) { set_error( STATUS_ACCESS_DENIED ); -- 2.29.2

1 0

[PATCH v2 1/2] mmdevapi: Implement SpatialAudio features.
by Arkadiusz Hiler 02 Feb '21

02 Feb '21

From: Andrew Eikum <aeikum(a)codeweavers.com> This makes car radio / ambient noises audible in Cyberpunk 2077. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 3 +- dlls/mmdevapi/audiovolume.c | 1 + dlls/mmdevapi/devenum.c | 5 + dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 1 + dlls/mmdevapi/spatialaudio.c | 988 +++++++++++++++++++++++++++++++++ include/spatialaudioclient.idl | 121 ++++ 7 files changed, 1119 insertions(+), 1 deletion(-) create mode 100644 dlls/mmdevapi/spatialaudio.c diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 5f44f7ba53b..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ audiovolume.c \ devenum.c \ - main.c + main.c \ + spatialaudio.c IDL_SRCS = mmdevapi_classes.idl diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 9214980120e..6f403cf348a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -33,6 +33,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9e4a29816ce..07b4dca028b 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -35,6 +35,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "devpkey.h" @@ -635,6 +636,10 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSoundCapture_Release((IDirectSoundCapture*)*ppv); } } + else if (IsEqualIID(riid, &IID_ISpatialAudioClient)) + { + hr = SpatialAudioClient_Create(iface, (ISpatialAudioClient**)ppv); + } else ERR("Invalid/unknown iid %s\n", debugstr_guid(riid)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 247ebc3b001..eac1da28f18 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -37,6 +37,7 @@ #include "audiopolicy.h" #include "devpkey.h" #include "winreg.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "wine/debug.h" diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index bc9788e95c8..3bcf568cddf 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -71,5 +71,6 @@ typedef struct MMDevice { extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; +extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c new file mode 100644 index 00000000000..cbca57b4890 --- /dev/null +++ b/dlls/mmdevapi/spatialaudio.c @@ -0,0 +1,988 @@ +/* + * Copyright 2020 Andrew Eikum 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 + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/heap.h" +#include "wine/debug.h" +#include "wine/list.h" + +#include "ole2.h" +#include "mmdeviceapi.h" +#include "mmsystem.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" +#include "spatialaudioclient.h" + +#include "mmdevapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#define MAX_PERIODS 3 + +static UINT32 AudioObjectType_to_index(AudioObjectType type) +{ + UINT32 o = 0; + while(type){ + type >>= 1; + ++o; + } + return o - 2; +} + +typedef struct SpatialAudioImpl SpatialAudioImpl; +typedef struct SpatialAudioStreamImpl SpatialAudioStreamImpl; +typedef struct SpatialAudioObjectImpl SpatialAudioObjectImpl; + +struct SpatialAudioObjectImpl { + ISpatialAudioObject ISpatialAudioObject_iface; + LONG ref; + + SpatialAudioStreamImpl *sa_stream; + AudioObjectType type; + UINT32 static_idx; + + float *buf; + + struct list entry; +}; + +struct SpatialAudioStreamImpl { + ISpatialAudioObjectRenderStream ISpatialAudioObjectRenderStream_iface; + LONG ref; + CRITICAL_SECTION lock; + + SpatialAudioImpl *sa_client; + SpatialAudioObjectRenderStreamActivationParams params; + + IAudioClient *client; + IAudioRenderClient *render; + + UINT32 period_frames, update_frames; + WAVEFORMATEXTENSIBLE stream_fmtex; + + float *buf; + + UINT32 static_object_map[17]; + + struct list objects; +}; + +struct SpatialAudioImpl { + ISpatialAudioClient ISpatialAudioClient_iface; + IAudioFormatEnumerator IAudioFormatEnumerator_iface; + IMMDevice *mmdev; + LONG ref; + WAVEFORMATEXTENSIBLE object_fmtex; +}; + +static inline SpatialAudioObjectImpl *impl_from_ISpatialAudioObject(ISpatialAudioObject *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioObjectImpl, ISpatialAudioObject_iface); +} + +static inline SpatialAudioStreamImpl *impl_from_ISpatialAudioObjectRenderStream(ISpatialAudioObjectRenderStream *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioStreamImpl, ISpatialAudioObjectRenderStream_iface); +} + +static inline SpatialAudioImpl *impl_from_ISpatialAudioClient(ISpatialAudioClient *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, ISpatialAudioClient_iface); +} + +static inline SpatialAudioImpl *impl_from_IAudioFormatEnumerator(IAudioFormatEnumerator *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, IAudioFormatEnumerator_iface); +} + +static HRESULT WINAPI SAO_QueryInterface(ISpatialAudioObject *iface, + REFIID riid, void **ppv) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectBase) || + IsEqualIID(riid, &IID_ISpatialAudioObject)) { + *ppv = &This->ISpatialAudioObject_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAO_AddRef(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAO_Release(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + EnterCriticalSection(&This->sa_stream->lock); + list_remove(&This->entry); + LeaveCriticalSection(&This->sa_stream->lock); + + ISpatialAudioObjectRenderStream_Release(&This->sa_stream->ISpatialAudioObjectRenderStream_iface); + heap_free(This->buf); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAO_GetBuffer(ISpatialAudioObject *iface, + BYTE **buffer, UINT32 *bytes) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p, %p)\n", This, buffer, bytes); + + EnterCriticalSection(&This->sa_stream->lock); + + if(This->sa_stream->update_frames == ~0){ + LeaveCriticalSection(&This->sa_stream->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + *buffer = (BYTE *)This->buf; + *bytes = This->sa_stream->update_frames * + This->sa_stream->sa_client->object_fmtex.Format.nBlockAlign; + + LeaveCriticalSection(&This->sa_stream->lock); + + return S_OK; +} + +static HRESULT WINAPI SAO_SetEndOfStream(ISpatialAudioObject *iface, UINT32 frames) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%u)\n", This, frames); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_IsActive(ISpatialAudioObject *iface, BOOL *active) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%p)\n", This, active); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_GetAudioObjectType(ISpatialAudioObject *iface, + AudioObjectType *type) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p)\n", This, type); + + *type = This->type; + + return S_OK; +} + +static HRESULT WINAPI SAO_SetPosition(ISpatialAudioObject *iface, float x, + float y, float z) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f, %f, %f)\n", This, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_SetVolume(ISpatialAudioObject *iface, float vol) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f)\n", This, vol); + return E_NOTIMPL; +} + +static ISpatialAudioObjectVtbl ISpatialAudioObject_vtbl = { + SAO_QueryInterface, + SAO_AddRef, + SAO_Release, + SAO_GetBuffer, + SAO_SetEndOfStream, + SAO_IsActive, + SAO_GetAudioObjectType, + SAO_SetPosition, + SAO_SetVolume, +}; + +static HRESULT WINAPI SAORS_QueryInterface(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **ppv) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStreamBase) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)) { + *ppv = &This->ISpatialAudioObjectRenderStream_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAORS_AddRef(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAORS_Release(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + IAudioClient_Stop(This->client); + if(This->update_frames != ~0 && This->update_frames > 0) + IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + IAudioRenderClient_Release(This->render); + IAudioClient_Release(This->client); + if(This->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(This->params.NotifyObject); + heap_free((void*)This->params.ObjectFormat); + CloseHandle(This->params.EventHandle); + DeleteCriticalSection(&This->lock); + ISpatialAudioClient_Release(&This->sa_client->ISpatialAudioClient_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( + ISpatialAudioObjectRenderStream *iface, UINT32 *count) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **service) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(riid), service); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_Start(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Start(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Start failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Stop(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Stop(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Stop failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Reset(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface, + UINT32 *dyn_count, UINT32 *frames) +{ + static BOOL fixme_once = FALSE; + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + UINT32 pad; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); + + EnterCriticalSection(&This->lock); + + if(This->update_frames != ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + hr = IAudioClient_GetCurrentPadding(This->client, &pad); + if(FAILED(hr)){ + WARN("GetCurrentPadding failed: %08x\n", hr); + LeaveCriticalSection(&This->lock); + return hr; + } + + if(pad < This->period_frames * MAX_PERIODS){ + This->update_frames = This->period_frames * MAX_PERIODS - pad; + }else{ + This->update_frames = 0; + } + + if(This->update_frames > 0){ + hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + This->update_frames = ~0; + LeaveCriticalSection(&This->lock); + return hr; + } + + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + memset(object->buf, 0, This->update_frames * This->sa_client->object_fmtex.Format.nBlockAlign); + } + }else if (!fixme_once){ + fixme_once = TRUE; + FIXME("Zero frame update.\n"); + } + + *dyn_count = 0; + *frames = This->update_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static void mix_static_object(SpatialAudioStreamImpl *stream, SpatialAudioObjectImpl *object) +{ + float *in = object->buf, *out; + UINT32 i; + if(object->static_idx == ~0 || + stream->static_object_map[object->static_idx] == ~0){ + WARN("Got unmapped static object?! Not mixing. Type: 0x%x\n", object->type); + return; + } + out = stream->buf + stream->static_object_map[object->static_idx]; + for(i = 0; i < stream->update_frames; ++i){ + *out += *in; + ++in; + out += stream->stream_fmtex.Format.nChannels; + } +} + +static HRESULT WINAPI SAORS_EndUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + HRESULT hr; + + TRACE("(%p)->()\n", This); + + EnterCriticalSection(&This->lock); + + if(This->update_frames == ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + if(This->update_frames > 0){ + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + if(object->type != AudioObjectType_Dynamic) + mix_static_object(This, object); + else + WARN("Don't know how to mix dynamic object yet. %p\n", object); + } + + hr = IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + if(FAILED(hr)) + WARN("ReleaseBuffer failed: %08x\n", hr); + } + + This->update_frames = ~0; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRenderStream *iface, + AudioObjectType type, ISpatialAudioObject **object) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *obj; + + TRACE("(%p)->(0x%x, %p)\n", This, type, object); + + if(type == AudioObjectType_Dynamic) + return SPTLAUDCLNT_E_NO_MORE_OBJECTS; + + if(type & ~This->params.StaticObjectTypeMask) + return SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE; + + LIST_FOR_EACH_ENTRY(obj, &This->objects, SpatialAudioObjectImpl, entry){ + if(obj->static_idx == AudioObjectType_to_index(type)) + return SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE; + } + + obj = heap_alloc_zero(sizeof(*obj)); + obj->ISpatialAudioObject_iface.lpVtbl = &ISpatialAudioObject_vtbl; + obj->ref = 1; + obj->type = type; + if(type == AudioObjectType_None){ + FIXME("AudioObjectType_None not implemented yet!\n"); + obj->static_idx = ~0; + }else{ + obj->static_idx = AudioObjectType_to_index(type); + } + + obj->sa_stream = This; + SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); + + obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + + EnterCriticalSection(&This->lock); + + list_add_tail(&This->objects, &obj->entry); + + LeaveCriticalSection(&This->lock); + + *object = &obj->ISpatialAudioObject_iface; + + return S_OK; +} + +static ISpatialAudioObjectRenderStreamVtbl ISpatialAudioObjectRenderStream_vtbl = { + SAORS_QueryInterface, + SAORS_AddRef, + SAORS_Release, + SAORS_GetAvailableDynamicObjectCount, + SAORS_GetService, + SAORS_Start, + SAORS_Stop, + SAORS_Reset, + SAORS_BeginUpdatingAudioObjects, + SAORS_EndUpdatingAudioObjects, + SAORS_ActivateSpatialAudioObject, +}; + +static HRESULT WINAPI SAC_QueryInterface(ISpatialAudioClient *iface, REFIID riid, void **ppv) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioClient)) { + *ppv = &This->ISpatialAudioClient_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAC_AddRef(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAC_Release(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if (!ref) { + IMMDevice_Release(This->mmdev); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAC_GetStaticObjectPosition(ISpatialAudioClient *iface, + AudioObjectType type, float *x, float *y, float *z) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(0x%x, %p, %p, %p)\n", This, type, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetNativeStaticObjectTypeMask(ISpatialAudioClient *iface, + AudioObjectType *mask) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, mask); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetMaxDynamicObjectCount(ISpatialAudioClient *iface, + UINT32 *value) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, value); + + *value = 0; + + return S_OK; +} + +static HRESULT WINAPI SAC_GetSupportedAudioObjectFormatEnumerator( + ISpatialAudioClient *iface, IAudioFormatEnumerator **enumerator) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%p)\n", This, enumerator); + + *enumerator = &This->IAudioFormatEnumerator_iface; + SAC_AddRef(iface); + + return S_OK; +} + +static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, + const WAVEFORMATEX *format, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + /* FIXME: should get device period from the device */ + static const REFERENCE_TIME period = 100000; + + TRACE("(%p)->(%p, %p)\n", This, format, count); + + *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + + return S_OK; +} + +static HRESULT WINAPI SAC_IsAudioObjectFormatSupported(ISpatialAudioClient *iface, + const WAVEFORMATEX *format) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_IsSpatialAudioStreamAvailable(ISpatialAudioClient *iface, + REFIID stream_uuid, const PROPVARIANT *info) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(stream_uuid), info); + return E_NOTIMPL; +} + +static WAVEFORMATEX *clone_fmtex(const WAVEFORMATEX *src) +{ + WAVEFORMATEX *r = heap_alloc(sizeof(WAVEFORMATEX) + src->cbSize); + memcpy(r, src, sizeof(WAVEFORMATEX) + src->cbSize); + return r; +} + +static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) +{ + static char buf[2048]; + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%x), rate: %u, depth: %u", + fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), + fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + }else{ + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %u, depth: %u", + fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + } + return buf; +} + +static void static_mask_to_channels(AudioObjectType static_mask, WORD *count, DWORD *mask, UINT32 *map) +{ + UINT32 out_chan = 0, map_idx = 0; + *count = 0; + *mask = 0; +#define CONVERT_MASK(f, t) \ + if(static_mask & f){ \ + *count += 1; \ + *mask |= t; \ + map[map_idx++] = out_chan++; \ + TRACE("mapping 0x%x to %u\n", f, out_chan - 1); \ + }else{ \ + map[map_idx++] = ~0; \ + } + CONVERT_MASK(AudioObjectType_FrontLeft, SPEAKER_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_FrontRight, SPEAKER_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_FrontCenter, SPEAKER_FRONT_CENTER); + CONVERT_MASK(AudioObjectType_LowFrequency, SPEAKER_LOW_FREQUENCY); + CONVERT_MASK(AudioObjectType_SideLeft, SPEAKER_SIDE_LEFT); + CONVERT_MASK(AudioObjectType_SideRight, SPEAKER_SIDE_RIGHT); + CONVERT_MASK(AudioObjectType_BackLeft, SPEAKER_BACK_LEFT); + CONVERT_MASK(AudioObjectType_BackRight, SPEAKER_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_TopFrontLeft, SPEAKER_TOP_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_TopFrontRight, SPEAKER_TOP_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_TopBackLeft, SPEAKER_TOP_BACK_LEFT); + CONVERT_MASK(AudioObjectType_TopBackRight, SPEAKER_TOP_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_BackCenter, SPEAKER_BACK_CENTER); +} + +static HRESULT activate_stream(SpatialAudioStreamImpl *stream) +{ + WAVEFORMATEXTENSIBLE *object_fmtex = (WAVEFORMATEXTENSIBLE *)stream->params.ObjectFormat; + HRESULT hr; + REFERENCE_TIME period; + + if(!(object_fmtex->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (object_fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&object_fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))){ + FIXME("Only float formats are supported for now\n"); + return E_INVALIDARG; + } + + hr = IMMDevice_Activate(stream->sa_client->mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&stream->client); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + return hr; + } + + hr = IAudioClient_GetDevicePeriod(stream->client, &period, NULL); + if(FAILED(hr)){ + WARN("GetDevicePeriod failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->stream_fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + static_mask_to_channels(stream->params.StaticObjectTypeMask, + &stream->stream_fmtex.Format.nChannels, &stream->stream_fmtex.dwChannelMask, + stream->static_object_map); + stream->stream_fmtex.Format.nSamplesPerSec = stream->params.ObjectFormat->nSamplesPerSec; + stream->stream_fmtex.Format.wBitsPerSample = stream->params.ObjectFormat->wBitsPerSample; + stream->stream_fmtex.Format.nBlockAlign = (stream->stream_fmtex.Format.nChannels * stream->stream_fmtex.Format.wBitsPerSample) / 8; + stream->stream_fmtex.Format.nAvgBytesPerSec = stream->stream_fmtex.Format.nSamplesPerSec * stream->stream_fmtex.Format.nBlockAlign; + stream->stream_fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + stream->stream_fmtex.Samples.wValidBitsPerSample = stream->stream_fmtex.Format.wBitsPerSample; + stream->stream_fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, + period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + if(FAILED(hr)){ + WARN("Initialize failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + hr = IAudioClient_SetEventHandle(stream->client, stream->params.EventHandle); + if(FAILED(hr)){ + WARN("SetEventHandle failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + hr = IAudioClient_GetService(stream->client, &IID_IAudioRenderClient, (void**)&stream->render); + if(FAILED(hr)){ + WARN("GetService(AudioRenderClient) failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->period_frames = MulDiv(period, stream->stream_fmtex.Format.nSamplesPerSec, 10000000); + + return S_OK; +} + +static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, + const PROPVARIANT *prop, REFIID riid, void **stream) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + SpatialAudioObjectRenderStreamActivationParams *params; + HRESULT hr; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), stream); + + if(IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)){ + SpatialAudioStreamImpl *obj; + + if(prop && + (prop->vt != VT_BLOB || + prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + WARN("Got invalid params\n"); + *stream = NULL; + return E_INVALIDARG; + } + + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + + if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ + *stream = NULL; + return E_INVALIDARG; + } + + if(params->EventHandle == INVALID_HANDLE_VALUE || + params->EventHandle == 0){ + *stream = NULL; + return E_INVALIDARG; + } + + if(!params->ObjectFormat || + memcmp(params->ObjectFormat, &This->object_fmtex.Format, sizeof(*params->ObjectFormat) + params->ObjectFormat->cbSize)){ + *stream = NULL; + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + obj = heap_alloc_zero(sizeof(SpatialAudioStreamImpl)); + + obj->ISpatialAudioObjectRenderStream_iface.lpVtbl = &ISpatialAudioObjectRenderStream_vtbl; + obj->ref = 1; + memcpy(&obj->params, params, sizeof(obj->params)); + + obj->update_frames = ~0; + + InitializeCriticalSection(&obj->lock); + list_init(&obj->objects); + + obj->sa_client = This; + SAC_AddRef(&This->ISpatialAudioClient_iface); + + obj->params.ObjectFormat = clone_fmtex(obj->params.ObjectFormat); + + DuplicateHandle(GetCurrentProcess(), obj->params.EventHandle, + GetCurrentProcess(), &obj->params.EventHandle, 0, FALSE, + DUPLICATE_SAME_ACCESS); + + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_AddRef(obj->params.NotifyObject); + + if(TRACE_ON(mmdevapi)){ + TRACE("ObjectFormat: {%s}\n", debugstr_fmtex(obj->params.ObjectFormat)); + TRACE("StaticObjectTypeMask: 0x%x\n", obj->params.StaticObjectTypeMask); + TRACE("MinDynamicObjectCount: 0x%x\n", obj->params.MinDynamicObjectCount); + TRACE("MaxDynamicObjectCount: 0x%x\n", obj->params.MaxDynamicObjectCount); + TRACE("Category: 0x%x\n", obj->params.Category); + TRACE("EventHandle: %p\n", obj->params.EventHandle); + TRACE("NotifyObject: %p\n", obj->params.NotifyObject); + } + + hr = activate_stream(obj); + if(FAILED(hr)){ + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(obj->params.NotifyObject); + DeleteCriticalSection(&obj->lock); + heap_free((void*)obj->params.ObjectFormat); + CloseHandle(obj->params.EventHandle); + ISpatialAudioClient_Release(&obj->sa_client->ISpatialAudioClient_iface); + heap_free(obj); + *stream = NULL; + return hr; + } + + *stream = &obj->ISpatialAudioObjectRenderStream_iface; + }else{ + FIXME("Unsupported audio stream IID: %s\n", debugstr_guid(riid)); + *stream = NULL; + return E_NOTIMPL; + } + + return S_OK; +} + +static ISpatialAudioClientVtbl ISpatialAudioClient_vtbl = { + SAC_QueryInterface, + SAC_AddRef, + SAC_Release, + SAC_GetStaticObjectPosition, + SAC_GetNativeStaticObjectTypeMask, + SAC_GetMaxDynamicObjectCount, + SAC_GetSupportedAudioObjectFormatEnumerator, + SAC_GetMaxFrameCount, + SAC_IsAudioObjectFormatSupported, + SAC_IsSpatialAudioStreamAvailable, + SAC_ActivateSpatialAudioStream, +}; + +static HRESULT WINAPI SAOFE_QueryInterface(IAudioFormatEnumerator *iface, + REFIID riid, void **ppvObject) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_QueryInterface(&This->ISpatialAudioClient_iface, riid, ppvObject); +} + +static ULONG WINAPI SAOFE_AddRef(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_AddRef(&This->ISpatialAudioClient_iface); +} + +static ULONG WINAPI SAOFE_Release(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_Release(&This->ISpatialAudioClient_iface); +} + +static HRESULT WINAPI SAOFE_GetCount(IAudioFormatEnumerator *iface, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%p)\n", This, count); + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI SAOFE_GetFormat(IAudioFormatEnumerator *iface, + UINT32 index, WAVEFORMATEX **format) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%u, %p)\n", This, index, format); + + if(index > 0) + return E_INVALIDARG; + + *format = &This->object_fmtex.Format; + + return S_OK; +} + +static IAudioFormatEnumeratorVtbl IAudioFormatEnumerator_vtbl = { + SAOFE_QueryInterface, + SAOFE_AddRef, + SAOFE_Release, + SAOFE_GetCount, + SAOFE_GetFormat, +}; + +HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) +{ + SpatialAudioImpl *obj; + IAudioClient *aclient; + WAVEFORMATEX *closest; + HRESULT hr; + + obj = heap_alloc_zero(sizeof(*obj)); + + obj->ref = 1; + obj->ISpatialAudioClient_iface.lpVtbl = &ISpatialAudioClient_vtbl; + obj->IAudioFormatEnumerator_iface.lpVtbl = &IAudioFormatEnumerator_vtbl; + + obj->object_fmtex.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + obj->object_fmtex.Format.nChannels = 1; + obj->object_fmtex.Format.nSamplesPerSec = 48000; + obj->object_fmtex.Format.wBitsPerSample = sizeof(float) * 8; + obj->object_fmtex.Format.nBlockAlign = (obj->object_fmtex.Format.nChannels * obj->object_fmtex.Format.wBitsPerSample) / 8; + obj->object_fmtex.Format.nAvgBytesPerSec = obj->object_fmtex.Format.nSamplesPerSec * obj->object_fmtex.Format.nBlockAlign; + obj->object_fmtex.Format.cbSize = 0; + + hr = IMMDevice_Activate(mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&aclient); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + hr = IAudioClient_IsFormatSupported(aclient, AUDCLNT_SHAREMODE_SHARED, &obj->object_fmtex.Format, &closest); + + IAudioClient_Release(aclient); + + if(hr == S_FALSE){ + if(sizeof(WAVEFORMATEX) + closest->cbSize > sizeof(obj->object_fmtex)){ + ERR("Returned format too large: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else if(!((closest->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE *)closest)->SubFormat, + &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) && + closest->wBitsPerSample == 32)){ + ERR("Returned format not 32-bit float: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + WARN("The audio stack doesn't support 48kHz 32bit float. Using the closest match. Audio may be glitchy. %s\n", debugstr_fmtex(closest)); + memcpy(&obj->object_fmtex, + closest, + sizeof(WAVEFORMATEX) + closest->cbSize); + CoTaskMemFree(closest); + } else if(hr != S_OK){ + WARN("Checking supported formats failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + obj->mmdev = mmdev; + IMMDevice_AddRef(mmdev); + + *out = &obj->ISpatialAudioClient_iface; + + return S_OK; +} diff --git a/include/spatialaudioclient.idl b/include/spatialaudioclient.idl index 16a1541fd1d..08c84965566 100644 --- a/include/spatialaudioclient.idl +++ b/include/spatialaudioclient.idl @@ -43,6 +43,47 @@ typedef [v1_enum] enum AudioObjectType AudioObjectType_BackCenter = 0x00020000, } AudioObjectType; +cpp_quote("#define SPTLAUDCLNT_E_DESTROYED AUDCLNT_ERR(0x100)") +cpp_quote("#define SPTLAUDCLNT_E_OUT_OF_ORDER AUDCLNT_ERR(0x101)") +cpp_quote("#define SPTLAUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x102)") +cpp_quote("#define SPTLAUDCLNT_E_NO_MORE_OBJECTS AUDCLNT_ERR(0x103)") +cpp_quote("#define SPTLAUDCLNT_E_PROPERTY_NOT_SUPPORTED AUDCLNT_ERR(0x104)") +cpp_quote("#define SPTLAUDCLNT_E_ERRORS_IN_OBJECT_CALLS AUDCLNT_ERR(0x105)") +cpp_quote("#define SPTLAUDCLNT_E_METADATA_FORMAT_NOT_SUPPORTED AUDCLNT_ERR(0x106)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_AVAILABLE AUDCLNT_ERR(0x107)") +cpp_quote("#define SPTLAUDCLNT_E_INVALID_LICENSE AUDCLNT_ERR(0x108)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_STOPPED AUDCLNT_ERR(0x10a)") +cpp_quote("#define SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE AUDCLNT_ERR(0x10b)") +cpp_quote("#define SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE AUDCLNT_ERR(0x10c)") +cpp_quote("#define SPTLAUDCLNT_E_INTERNAL AUDCLNT_ERR(0x10d)") + +interface ISpatialAudioObjectRenderStreamBase; + +[ + object, + uuid(dddf83e6-68d7-4c70-883f-a1836afb4a50), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamNotify : IUnknown +{ + HRESULT OnAvailableDynamicObjectCountChange( + [in] ISpatialAudioObjectRenderStreamBase *stream, + [in] LONGLONG deadline, + [in] UINT32 object_count); +} + +typedef struct tagSpatialAudioObjectRenderStreamActivationParams +{ + const WAVEFORMATEX *ObjectFormat; + AudioObjectType StaticObjectTypeMask; + UINT32 MinDynamicObjectCount; + UINT32 MaxDynamicObjectCount; + AUDIO_STREAM_CATEGORY Category; + HANDLE EventHandle; + ISpatialAudioObjectRenderStreamNotify *NotifyObject; +} SpatialAudioObjectRenderStreamActivationParams; + [ object, uuid(dcdaa858-895a-4a22-a5eb-67bda506096d), @@ -98,3 +139,83 @@ interface ISpatialAudioClient : IUnknown [in] REFIID riid, [out, iid_is(riid)] void **stream); } + +[ + object, + uuid(cce0b8f2-8d4d-4efb-a8cf-3d6ecf1c30e0), + pointer_default(unique), + local +] +interface ISpatialAudioObjectBase : IUnknown +{ + HRESULT GetBuffer( + [out] BYTE **buffer, + [out] UINT32 *bytes); + + HRESULT SetEndOfStream( + [in] UINT32 frames); + + HRESULT IsActive( + [out] BOOL *active); + + HRESULT GetAudioObjectType( + [out] AudioObjectType *type); +} + +[ + object, + uuid(dde28967-521b-46e5-8f00-bd6f2bc8ab1d), + pointer_default(unique), + local +] +interface ISpatialAudioObject : ISpatialAudioObjectBase +{ + HRESULT SetPosition( + [in] float x, + [in] float y, + [in] float z); + + HRESULT SetVolume( + [in] float vol); +} + +[ + object, + uuid(feaaf403-c1d8-450d-aa05-e0ccee7502a8), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamBase : IUnknown +{ + HRESULT GetAvailableDynamicObjectCount( + [out] UINT32 *count); + + HRESULT GetService( + [in] REFIID riid, + [out] void **service); + + HRESULT Start(); + + HRESULT Stop(); + + HRESULT Reset(); + + HRESULT BeginUpdatingAudioObjects( + [out] UINT32 *count, + [out] UINT32 *frames); + + HRESULT EndUpdatingAudioObjects(); +} + +[ + object, + uuid(bab5f473-b423-477b-85f5-b5a332a04153), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStream : ISpatialAudioObjectRenderStreamBase +{ + HRESULT ActivateSpatialAudioObject( + [in] AudioObjectType type, + [out] ISpatialAudioObject **object); +} -- 2.30.0

1 1

[PATCH 1/2] advapi32/tests: Test implicit DACL_SECURITY_INFORMATION permission on a registry key.
by Dmitry Timoshkov 02 Feb '21

02 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/security.c | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 020e69277e0..91c49378e7f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7878,6 +7878,43 @@ static void test_create_process_token_child(void) } } +static void test_regkey_security(void) +{ + HKEY hkey; + DWORD ret; + PSECURITY_DESCRIPTOR sd; + ACL *dacl; + + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Winetest", &hkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + RegCloseKey(hkey); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Winetest", 0, KEY_QUERY_VALUE, &hkey); + ok(ret == ERROR_SUCCESS, "got %u\n", ret); + + ret = get_obj_access(hkey); + ok(ret == KEY_QUERY_VALUE, "got %#x\n", ret); + + sd = NULL; + dacl = NULL; + ret = GetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, &dacl, NULL, &sd); +todo_wine + ok(ret == ERROR_SUCCESS, "got %u\n", ret); +todo_wine + ok(sd != NULL, "sd should not be NULL\n"); +todo_wine + ok(dacl != NULL, "dacl should not be NULL\n"); + + ret = SetSecurityInfo(hkey, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, NULL, NULL, dacl, NULL); +todo_wine + ok(ret == ERROR_SUCCESS, "got %u\n", ret); + + LocalFree(sd); + + RegDeleteKeyW(hkey, L""); + RegCloseKey(hkey); +} + START_TEST(security) { init(); @@ -7940,6 +7977,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_regkey_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.29.2

1 0

[tools] testbot/PatchUtils: Add support for .com program tests in _LoadWineFiles().
by Francois Gouget 02 Feb '21

02 Feb '21

_LoadWineFiles() must use the correct module name so that the lookups succeed in _CreateTestInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Wine does not have any .com test so far so this bug did not have any impact yet. testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b2749c4e5..dda855d11 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -107,7 +107,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs"); + $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); $_TestList->{$Module}->{$File} = 1; } } -- 2.20.1

1 0

[PATCH] d2d1/tests: Add return value test (Coverity).
by Nikolay Sivov 02 Feb '21

02 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Only for consistency with other tests. dlls/d2d1/tests/d2d1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c1ff9dc197..8d584605819 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7701,7 +7701,8 @@ static void test_gdi_interop(BOOL d3d11) todo_wine ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); - ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); ID2D1RenderTarget_Release(rt); -- 2.30.0

2 1

[PATCH 1/5] mfplat/tests: Add some tests for D3D11-aware sample allocator.
by Nikolay Sivov 02 Feb '21

02 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 388 +++++++++++++++++++++++++++++++++++++ include/mfapi.h | 3 + include/mfobjects.idl | 28 +++ 3 files changed, 419 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 77ac299c918..cdd8830bad3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -70,6 +70,13 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -124,6 +131,9 @@ static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_t static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); +static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **allocator); +static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); static HWND create_window(void) { @@ -780,12 +790,14 @@ static void init_functions(void) X(MFCopyImage); X(MFCreate2DMediaBuffer); X(MFCreateDXGIDeviceManager); + X(MFCreateDXGISurfaceBuffer); X(MFCreateDXSurfaceBuffer); X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); X(MFCreateTrackedSample); X(MFCreateTransformActivate); + X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); X(MFMapDXGIFormatToDX9Format); @@ -5246,6 +5258,7 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMF2DBuffer, TRUE); /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); @@ -6025,6 +6038,379 @@ static void test_MFMapDXGIFormatToDX9Format(void) } } +static HRESULT WINAPI test_notify_callback_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_notify_callback_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI test_notify_callback_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI test_notify_callback_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl test_notify_callback_vtbl = +{ + test_notify_callback_QueryInterface, + test_notify_callback_AddRef, + test_notify_callback_Release, + test_notify_callback_NotifyRelease, +}; + +static IMFMediaType * create_video_type(const GUID *subtype) +{ + IMFMediaType *video_type; + HRESULT hr; + + hr = MFCreateMediaType(&video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(video_type, &MF_MT_SUBTYPE, subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + return video_type; +} + +static ID3D11Device *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + unsigned int feature_level_count; + ID3D11Device *device; + + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, + feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + +static void test_dxgi_surface_buffer(void) +{ + IMFDXGIBuffer *dxgi_buffer; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IMFMediaBuffer *buffer; + ID3D11Device *device; + UINT index, size; + IUnknown *obj; + HRESULT hr; + BYTE *data; + + if (!pMFCreateDXGISurfaceBuffer) + { + skip("MFCreateDXGISurfaceBuffer() is not available.\n"); + return; + } + + device = create_d3d11_device(); + + memset(&desc, 0, sizeof(desc)); + desc.Width = 64; + desc.Height = 64; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(hr == S_OK, "Failed to create a texture, hr %#x.\n", hr); + + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 5, FALSE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + EXPECT_REF(texture, 2); + hr = IMFDXGIBuffer_GetResource(dxgi_buffer, &IID_ID3D11Texture2D, (void **)&obj); + ok(hr == S_OK, "Failed to get resource, hr %#x.\n", hr); + EXPECT_REF(texture, 3); + ok(obj == (IUnknown *)texture, "Unexpected resource pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetSubresourceIndex(dxgi_buffer, &index); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(index == 5, "Unexpected index.\n"); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, (void *)device); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = ID3D11Texture2D_GetPrivateData(texture, &IID_IMFDXGIBuffer, &size, &data); + ok(hr == DXGI_ERROR_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_ID3D11Device, (void **)&obj); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(obj == (IUnknown *)device, "Unexpected pointer.\n"); + IUnknown_Release(obj); + + hr = IMFDXGIBuffer_SetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFDXGIBuffer_GetUnknown(dxgi_buffer, &IID_IMFDXGIBuffer, &IID_IUnknown, (void **)&obj); + ok(hr == MF_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + + IMFDXGIBuffer_Release(dxgi_buffer); + + IMFMediaBuffer_Release(buffer); + + ID3D11Texture2D_Release(texture); + + ID3D11Device_Release(device); +} + +static void test_sample_allocator(void) +{ + IMFVideoSampleAllocatorNotify test_notify = { &test_notify_callback_vtbl }; + IMFVideoSampleAllocatorCallback *allocator_cb; + IMFVideoSampleAllocatorEx *allocatorex; + IMFMediaType *media_type, *video_type; + IMFVideoSampleAllocator *allocator; + IMFDXGIDeviceManager *manager; + IMFSample *sample, *sample2; + IMFMediaBuffer *buffer; + ID3D11Device *device; + LONG refcount, count; + unsigned int token; + IUnknown *unk; + HRESULT hr; + BYTE *data; + + if (!pMFCreateVideoSampleAllocatorEx) + { + skip("MFCreateVideoSampleAllocatorEx() is not available.\n"); + return; + } + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(unk, &IID_IMFVideoSampleAllocator, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorEx, TRUE); + check_interface(unk, &IID_IMFVideoSampleAllocatorCallback, TRUE); + + IUnknown_Release(unk); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_QueryInterface(allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, &test_notify); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 10; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + video_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + /* Frame size is required. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + sample = NULL; + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + refcount = get_refcount(sample); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + /* Reinitialize with active sample. */ + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); + + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %d.\n", count); + + check_interface(sample, &IID_IMFTrackedSample, TRUE); + check_interface(sample, &IID_IMFDesiredSample, FALSE); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + + IMFMediaBuffer_Release(buffer); + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocator_Release(allocator); + + /* IMFVideoSampleAllocatorEx */ + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&allocatorex); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_QueryInterface(allocatorex, &IID_IMFVideoSampleAllocatorCallback, (void **)&allocator_cb); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 1, 0, NULL, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, NULL, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %d.\n", count); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2); + ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocatorCallback_Release(allocator_cb); + IMFVideoSampleAllocatorEx_Release(allocatorex); + + /* Using device manager */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create a D3D11 device, skipping tests.\n"); + return; + } + + hr = pMFCreateDXGIDeviceManager(&token, &manager); + ok(hr == S_OK, "Failed to create device manager, hr %#x.\n", hr); + + hr = IMFDXGIDeviceManager_ResetDevice(manager, (IUnknown *)device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = pMFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 1, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, TRUE); + check_interface(buffer, &IID_IMFGetService, FALSE); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IMFDXGIDeviceManager_Release(manager); + ID3D11Device_Release(device); +} + START_TEST(mfplat) { char **argv; @@ -6085,6 +6471,8 @@ START_TEST(mfplat) test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame(); test_MFMapDXGIFormatToDX9Format(); + test_dxgi_surface_buffer(); + test_sample_allocator(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 77875486e54..7bac3e21fa9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -510,6 +510,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); +HRESULT WINAPI MFCreateDXGISurfaceBuffer(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, + IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateDXSurfaceBuffer(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, @@ -522,6 +524,7 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMediaType **media_type); +HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **allocator); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index ee49be35af0..b2d0e5d06ec 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -167,6 +167,34 @@ interface IMF2DBuffer2 : IMF2DBuffer HRESULT Copy2DTo([in] IMF2DBuffer2 *dest_buffer); } +[ + object, + uuid(e7174cfa-1c9e-48b1-8866-626226bfc258), + local +] +interface IMFDXGIBuffer : IUnknown +{ + HRESULT GetResource( + [in] REFIID riid, + [out] void **object + ); + + HRESULT GetSubresourceIndex( + [out] UINT *index + ); + + HRESULT GetUnknown( + [in] REFIID guid, + [in] REFIID riid, + [out] void **object + ); + + HRESULT SetUnknown( + [in] REFIID guid, + [in] IUnknown *data + ); +} + [ object, uuid(44ae0fa8-ea31-4109-8d2e-4cae4997c555), -- 2.30.0

2 6

[PATCH] wbemprox: Report the real OS version.
by Hans Leidekker 02 Feb '21

02 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50580 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9ae34a50c0d..f1cf75ab380 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3514,13 +3514,13 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct { struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - OSVERSIONINFOEXW ver; + RTL_OSVERSIONINFOEXW ver; UINT row = 0; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; ver.dwOSVersionInfoSize = sizeof(ver); - GetVersionExW( (OSVERSIONINFOW *)&ver ); + RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver ); -- 2.30.0

1 0

[tools] testbot: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/vhost_winetestbot.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 7b84564a5..48a3917ce 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -23,11 +23,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> @@ -61,11 +56,6 @@ PerlOptions +ParseHeaders Options +ExecCGI DirectoryIndex index.pl - - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> -- 2.20.1

1 0

[tools] winetest: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/vhost_winetest.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 797aac3f4..081025b1c 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -32,10 +32,6 @@ RewriteEngine On RewriteRule "^$" "/data/" [R] - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> -- 2.20.1

1 0

[tools] patches: Remove the Apache 2.2 instructions.
by Francois Gouget 02 Feb '21

02 Feb '21

Apache 2.2 is very old so simplify the sample configuration files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- patches/doc/vhost_source.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 03c25c6df..01c6dee15 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -6,10 +6,6 @@ ServerAdmin winehq(a)example.com <Directory /home/winehq/opt/source> - # Access control the Apache 2.2 way - Order allow,deny - Allow from all - # And the Apache 2.4 way Require all granted </Directory> </VirtualHost> -- 2.20.1

1 0

[PATCH v2 resend 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang 02 Feb '21

02 Feb '21

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 3 -- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..b8071dc2155 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2783,7 +2783,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0

[PATCH v2 resend 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 02 Feb '21

02 Feb '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 198913~198914. Remove a todo_wine for a test that succeeds now. v2 resend: Supersede 198919~198920. 198920 seems to be mistakenly marked as superseded. Thus the resend. dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..926b288da11 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1995,7 +2000,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2023,6 +2031,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

1 0

[PATCH] include: Pack HID_DESCRIPTOR.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ddk/hidport.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/hidport.h b/include/ddk/hidport.h index 3ebe273583b..2c881c87921 100644 --- a/include/ddk/hidport.h +++ b/include/ddk/hidport.h @@ -49,6 +49,7 @@ typedef struct _HID_DEVICE_ATTRIBUTES USHORT Reserved[11]; } HID_DEVICE_ATTRIBUTES, *PHID_DEVICE_ATTRIBUTES; +#include <pshpack1.h> typedef struct _HID_DESCRIPTOR { UCHAR bLength; @@ -62,6 +63,7 @@ typedef struct _HID_DESCRIPTOR USHORT wReportLength; } DescriptorList[1]; } HID_DESCRIPTOR, *PHID_DESCRIPTOR; +#include <poppack.h> #define HID_HID_DESCRIPTOR_TYPE 0x21 #define HID_REPORT_DESCRIPTOR_TYPE 0x22 -- 2.20.1

1 0

[PATCH] winebus.sys: Fix the definition of ABS_TO_HID_MAP.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winebus.sys/bus_udev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1473579c72c..74cf6a28a1a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -141,6 +141,11 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELERATOR}, /*ABS_GAS*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ + {0,0}, + {0,0}, + {0,0}, + {0,0}, + {0,0}, {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -160,6 +165,7 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) +C_ASSERT(ARRAY_SIZE(ABS_TO_HID_MAP) == HID_ABS_MAX); #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) static const BYTE REL_TO_HID_MAP[][2] = { -- 2.20.1

1 0

[PATCH] ntoskrnl: Do not destroy the device list in enumerate_new_device().
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6a0e82ec0e2..713e469ee7e 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -336,7 +336,6 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); - SetupDiDestroyDeviceInfoList( set ); return; } @@ -353,10 +352,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) } if (need_driver && !install_device_driver( device, set, &sp_device )) - { - SetupDiDestroyDeviceInfoList( set ); return; - } start_device( device, set, &sp_device ); } -- 2.20.1

1 0

[PATCH 1/5] winegstreamer: Move the "push_thread" field to struct wg_parser.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 734984d7fed..21d6e324add 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -53,6 +53,8 @@ struct wg_parser GstPad *my_src, *their_sink; guint64 file_size, start_offset, next_offset, stop_offset; + + pthread_t push_thread; }; struct parser @@ -82,8 +84,6 @@ struct parser pthread_cond_t init_cond; bool no_more_pads, has_duration, error; - pthread_t push_thread; - HANDLE read_thread; pthread_cond_t read_cond, read_done_cond; struct @@ -635,7 +635,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) gboolean flush; guint32 seqnum; GstEvent *tevent; - BOOL thread = !!This->push_thread; + BOOL thread = !!parser->push_thread; gst_event_parse_seek(event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); @@ -1436,19 +1436,19 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct wg_parser *parser = This->wg_parser; if (!activate) { - if (This->push_thread) { - pthread_join(This->push_thread, NULL); - This->push_thread = 0; + if (parser->push_thread) { + pthread_join(parser->push_thread, NULL); + parser->push_thread = 0; } if (This->filter.state == State_Stopped) parser->next_offset = parser->start_offset; - } else if (!This->push_thread) { + } else if (!parser->push_thread) { int ret; - if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) + if ((ret = pthread_create(&parser->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); - This->push_thread = 0; + parser->push_thread = 0; return FALSE; } } -- 2.30.0

1 4

[PATCH] ntoskrnl.exe: add KdDisableDebugger/KdEnableDebugger stubs
by Austin English 01 Feb '21

01 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50599 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e6131c32c7..9dc5809614a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4256,6 +4256,18 @@ void WINAPI KeUnstackDetachProcess(KAPC_STATE *apc_state) FIXME("apc_state %p stub.\n", apc_state); } +NTSTATUS WINAPI KdDisableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + +NTSTATUS WINAPI KdEnableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d57a2f81df6..22968913300 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,8 +515,8 @@ @ stub IoWriteTransferCount @ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent -@ stub KdDisableDebugger -@ stub KdEnableDebugger +@ stdcall KdDisableDebugger() +@ stdcall KdEnableDebugger() @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition -- 2.28.0

1 0

[PATCH 3/3] msvcrt: Imporve __libm_sse2_sqrt_precise implementation.
by Piotr Caban 01 Feb '21

01 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] msvcrt: Imporve sqrt accuracy and performance on x86_64.
by Piotr Caban 01 Feb '21

01 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- The goal of this series is to update sqrt functions so it returns the same values and modifies sse/x87 status word in the same way as native ucrtbase. dlls/msvcrt/math.c | 88 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 26 deletions(-)

1 0

[PATCH v2 2/2] winmm/tests: Get rid of unused functions.
by Akihiro Sagawa 01 Feb '21

01 Feb '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/wave.c | 12 ------------ dlls/winmm/tests/winmm_test.h | 1 - 2 files changed, 13 deletions(-)

3 2

[PATCH v2 1/2] winmm/tests: Strictly test returned time format of waveInGetPostion().
by Akihiro Sagawa 01 Feb '21

01 Feb '21

In v2, split the patch into two parts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/capture.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-)

2 1

[PATCH] Add RtlDosPathNameToRelativeNtPathName_U
by Louis Lenders 01 Feb '21

01 Feb '21

Trying to get scoop running in wine, turned out it needs robocopy.exe. As wine lacks robocopy, i had to fall back to native robocopy, in this case from windows 8.1. Then one gets crash below. Call from 7BC2C17A to unimplemented function ntdll.dll.RtlDosPathNameToRelativeNtPathName_U, aborting wine: Unimplemented function ntdll.dll.RtlDosPathNameToRelativeNtPathName_U called at address 7BC2C17A (thread 0024), starting debugger... So I added similar code as for RtlDosPathNameToNtPathName_U --> RtlDosPathNameToNtPathName_U_WithStatus and that makes robocopy work Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/path.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 740030f2066..bfdf61f1e7a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -605,6 +605,7 @@ # @ stub RtlDosApplyFileIsolationRedirection_Ustr @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U_WithStatus(wstr ptr ptr ptr) +@ stdcall RtlDosPathNameToRelativeNtPathName_U(wstr ptr ptr ptr) @ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus(wstr ptr ptr ptr) @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) # @ stub RtlDosSearchPath_Ustr diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 86760f178e1..0262c1db18e 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -263,6 +263,17 @@ NTSTATUS WINAPI RtlDosPathNameToRelativeNtPathName_U_WithStatus(const WCHAR *dos return RtlDosPathNameToNtPathName_U_WithStatus(dos_path, ntpath, file_part, NULL); } +/************************************************************************** + * RtlDosPathNameToRelativeNtPathName_U [NTDLL.@] + * + * See RtlDosPathNameToRelativeNtPathName_U_WithStatus + */ +BOOLEAN WINAPI RtlDosPathNameToRelativeNtPathName_U(const WCHAR *dos_path, + UNICODE_STRING *ntpath, WCHAR **file_part, RTL_RELATIVE_NAME *relative) +{ + return RtlDosPathNameToRelativeNtPathName_U_WithStatus(dos_path, ntpath, file_part, relative) == STATUS_SUCCESS; +} + /************************************************************************** * RtlReleaseRelativeName [NTDLL.@] */ -- 2.30.0

1 0

[PATCH] mmdevapi: Implement SpatialAudio features
by Arkadiusz Hiler 01 Feb '21

01 Feb '21

From: Andrew Eikum <aeikum(a)codeweavers.com> This makes car radio / ambient noises audible in Cyberpunk 2077. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 3 +- dlls/mmdevapi/audiovolume.c | 1 + dlls/mmdevapi/devenum.c | 5 + dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 1 + dlls/mmdevapi/spatialaudio.c | 980 +++++++++++++++++++++++++++++ dlls/mmdevapi/tests/Makefile.in | 3 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/spatialaudio.c | 441 +++++++++++++ include/spatialaudioclient.idl | 121 ++++ 10 files changed, 1555 insertions(+), 2 deletions(-) create mode 100644 dlls/mmdevapi/spatialaudio.c create mode 100644 dlls/mmdevapi/tests/spatialaudio.c diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 5f44f7ba53b..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ audiovolume.c \ devenum.c \ - main.c + main.c \ + spatialaudio.c IDL_SRCS = mmdevapi_classes.idl diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 9214980120e..6f403cf348a 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -33,6 +33,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9e4a29816ce..07b4dca028b 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -35,6 +35,7 @@ #include "audioclient.h" #include "endpointvolume.h" #include "audiopolicy.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "devpkey.h" @@ -635,6 +636,10 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSoundCapture_Release((IDirectSoundCapture*)*ppv); } } + else if (IsEqualIID(riid, &IID_ISpatialAudioClient)) + { + hr = SpatialAudioClient_Create(iface, (ISpatialAudioClient**)ppv); + } else ERR("Invalid/unknown iid %s\n", debugstr_guid(riid)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 247ebc3b001..eac1da28f18 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -37,6 +37,7 @@ #include "audiopolicy.h" #include "devpkey.h" #include "winreg.h" +#include "spatialaudioclient.h" #include "mmdevapi.h" #include "wine/debug.h" diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index bc9788e95c8..3bcf568cddf 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -71,5 +71,6 @@ typedef struct MMDevice { extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; +extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient **out) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c new file mode 100644 index 00000000000..c45acb7fec2 --- /dev/null +++ b/dlls/mmdevapi/spatialaudio.c @@ -0,0 +1,980 @@ +/* + * Copyright 2020 Andrew Eikum 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 + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wine/heap.h" +#include "wine/debug.h" +#include "wine/list.h" + +#include "ole2.h" +#include "mmdeviceapi.h" +#include "mmsystem.h" +#include "audioclient.h" +#include "endpointvolume.h" +#include "audiopolicy.h" +#include "spatialaudioclient.h" + +#include "mmdevapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +#define MAX_PERIODS 3 + +static UINT32 AudioObjectType_to_index(AudioObjectType type) +{ + UINT32 o = 0; + while(type){ + type >>= 1; + ++o; + } + return o - 2; +} + +typedef struct SpatialAudioImpl SpatialAudioImpl; +typedef struct SpatialAudioStreamImpl SpatialAudioStreamImpl; +typedef struct SpatialAudioObjectImpl SpatialAudioObjectImpl; + +struct SpatialAudioObjectImpl { + ISpatialAudioObject ISpatialAudioObject_iface; + LONG ref; + + SpatialAudioStreamImpl *sa_stream; + AudioObjectType type; + UINT32 static_idx; + + float *buf; + + struct list entry; +}; + +struct SpatialAudioStreamImpl { + ISpatialAudioObjectRenderStream ISpatialAudioObjectRenderStream_iface; + LONG ref; + CRITICAL_SECTION lock; + + SpatialAudioImpl *sa_client; + SpatialAudioObjectRenderStreamActivationParams params; + + IAudioClient *client; + IAudioRenderClient *render; + + UINT32 period_frames, update_frames; + WAVEFORMATEXTENSIBLE stream_fmtex; + + float *buf; + + UINT32 static_object_map[17]; + + struct list objects; +}; + +struct SpatialAudioImpl { + ISpatialAudioClient ISpatialAudioClient_iface; + IAudioFormatEnumerator IAudioFormatEnumerator_iface; + IMMDevice *mmdev; + LONG ref; + WAVEFORMATEXTENSIBLE object_fmtex; +}; + +static inline SpatialAudioObjectImpl *impl_from_ISpatialAudioObject(ISpatialAudioObject *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioObjectImpl, ISpatialAudioObject_iface); +} + +static inline SpatialAudioStreamImpl *impl_from_ISpatialAudioObjectRenderStream(ISpatialAudioObjectRenderStream *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioStreamImpl, ISpatialAudioObjectRenderStream_iface); +} + +static inline SpatialAudioImpl *impl_from_ISpatialAudioClient(ISpatialAudioClient *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, ISpatialAudioClient_iface); +} + +static inline SpatialAudioImpl *impl_from_IAudioFormatEnumerator(IAudioFormatEnumerator *iface) +{ + return CONTAINING_RECORD(iface, SpatialAudioImpl, IAudioFormatEnumerator_iface); +} + +static HRESULT WINAPI SAO_QueryInterface(ISpatialAudioObject *iface, + REFIID riid, void **ppv) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectBase) || + IsEqualIID(riid, &IID_ISpatialAudioObject)) { + *ppv = &This->ISpatialAudioObject_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAO_AddRef(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAO_Release(ISpatialAudioObject *iface) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + EnterCriticalSection(&This->sa_stream->lock); + list_remove(&This->entry); + LeaveCriticalSection(&This->sa_stream->lock); + + ISpatialAudioObjectRenderStream_Release(&This->sa_stream->ISpatialAudioObjectRenderStream_iface); + heap_free(This->buf); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAO_GetBuffer(ISpatialAudioObject *iface, + BYTE **buffer, UINT32 *bytes) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p, %p)\n", This, buffer, bytes); + + EnterCriticalSection(&This->sa_stream->lock); + + if(This->sa_stream->update_frames == ~0){ + LeaveCriticalSection(&This->sa_stream->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + *buffer = (BYTE *)This->buf; + *bytes = This->sa_stream->update_frames * + This->sa_stream->sa_client->object_fmtex.Format.nBlockAlign; + + LeaveCriticalSection(&This->sa_stream->lock); + + return S_OK; +} + +static HRESULT WINAPI SAO_SetEndOfStream(ISpatialAudioObject *iface, UINT32 frames) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%u)\n", This, frames); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_IsActive(ISpatialAudioObject *iface, BOOL *active) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%p)\n", This, active); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_GetAudioObjectType(ISpatialAudioObject *iface, + AudioObjectType *type) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + + TRACE("(%p)->(%p)\n", This, type); + + *type = This->type; + + return S_OK; +} + +static HRESULT WINAPI SAO_SetPosition(ISpatialAudioObject *iface, float x, + float y, float z) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f, %f, %f)\n", This, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAO_SetVolume(ISpatialAudioObject *iface, float vol) +{ + SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); + FIXME("(%p)->(%f)\n", This, vol); + return E_NOTIMPL; +} + +static ISpatialAudioObjectVtbl ISpatialAudioObject_vtbl = { + SAO_QueryInterface, + SAO_AddRef, + SAO_Release, + SAO_GetBuffer, + SAO_SetEndOfStream, + SAO_IsActive, + SAO_GetAudioObjectType, + SAO_SetPosition, + SAO_SetVolume, +}; + +static HRESULT WINAPI SAORS_QueryInterface(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **ppv) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStreamBase) || + IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)) { + *ppv = &This->ISpatialAudioObjectRenderStream_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAORS_AddRef(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAORS_Release(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if(!ref){ + IAudioClient_Stop(This->client); + if(This->update_frames != ~0 && This->update_frames > 0) + IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + IAudioRenderClient_Release(This->render); + IAudioClient_Release(This->client); + if(This->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(This->params.NotifyObject); + heap_free((void*)This->params.ObjectFormat); + CloseHandle(This->params.EventHandle); + DeleteCriticalSection(&This->lock); + ISpatialAudioClient_Release(&This->sa_client->ISpatialAudioClient_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAORS_GetAvailableDynamicObjectCount( + ISpatialAudioObjectRenderStream *iface, UINT32 *count) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_GetService(ISpatialAudioObjectRenderStream *iface, + REFIID riid, void **service) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(riid), service); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_Start(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Start(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Start failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Stop(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + HRESULT hr; + + TRACE("(%p)->()\n", This); + + hr = IAudioClient_Stop(This->client); + if(FAILED(hr)){ + WARN("IAudioClient::Stop failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI SAORS_Reset(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface, + UINT32 *dyn_count, UINT32 *frames) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + UINT32 pad; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); + + EnterCriticalSection(&This->lock); + + if(This->update_frames != ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + hr = IAudioClient_GetCurrentPadding(This->client, &pad); + if(FAILED(hr)){ + WARN("GetCurrentPadding failed: %08x\n", hr); + LeaveCriticalSection(&This->lock); + return hr; + } + + if(pad < This->period_frames * MAX_PERIODS){ + This->update_frames = This->period_frames * MAX_PERIODS - pad; + }else{ + This->update_frames = 0; + } + + if(This->update_frames > 0){ + hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + This->update_frames = ~0; + LeaveCriticalSection(&This->lock); + return hr; + } + + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + memset(object->buf, 0, This->update_frames * This->sa_client->object_fmtex.Format.nBlockAlign); + } + } + + *dyn_count = 0; + *frames = This->update_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static void mix_static_object(SpatialAudioStreamImpl *stream, SpatialAudioObjectImpl *object) +{ + float *in = object->buf, *out; + UINT32 i; + if(object->static_idx == ~0 || + stream->static_object_map[object->static_idx] == ~0){ + WARN("Got unmapped static object?! Not mixing. Type: 0x%x\n", object->type); + return; + } + out = stream->buf + stream->static_object_map[object->static_idx]; + for(i = 0; i < stream->update_frames; ++i){ + *out += *in; + ++in; + out += stream->stream_fmtex.Format.nChannels; + } +} + +static HRESULT WINAPI SAORS_EndUpdatingAudioObjects(ISpatialAudioObjectRenderStream *iface) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *object; + HRESULT hr; + + TRACE("(%p)->()\n", This); + + EnterCriticalSection(&This->lock); + + if(This->update_frames == ~0){ + LeaveCriticalSection(&This->lock); + return SPTLAUDCLNT_E_OUT_OF_ORDER; + } + + if(This->update_frames > 0){ + LIST_FOR_EACH_ENTRY(object, &This->objects, SpatialAudioObjectImpl, entry){ + if(object->type != AudioObjectType_Dynamic) + mix_static_object(This, object); + else + WARN("Don't know how to mix dynamic object yet. %p\n", object); + } + + hr = IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); + if(FAILED(hr)) + WARN("ReleaseBuffer failed: %08x\n", hr); + } + + This->update_frames = ~0; + + LeaveCriticalSection(&This->lock); + + return S_OK; +} + +static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRenderStream *iface, + AudioObjectType type, ISpatialAudioObject **object) +{ + SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); + SpatialAudioObjectImpl *obj; + + TRACE("(%p)->(0x%x, %p)\n", This, type, object); + + if(type == AudioObjectType_Dynamic) + return SPTLAUDCLNT_E_NO_MORE_OBJECTS; + + if(type & ~This->params.StaticObjectTypeMask) + return SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE; + + LIST_FOR_EACH_ENTRY(obj, &This->objects, SpatialAudioObjectImpl, entry){ + if(obj->static_idx == AudioObjectType_to_index(type)) + return SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE; + } + + obj = heap_alloc_zero(sizeof(*obj)); + obj->ISpatialAudioObject_iface.lpVtbl = &ISpatialAudioObject_vtbl; + obj->ref = 1; + obj->type = type; + if(type == AudioObjectType_None){ + FIXME("AudioObjectType_None not implemented yet!\n"); + obj->static_idx = ~0; + }else{ + obj->static_idx = AudioObjectType_to_index(type); + } + + obj->sa_stream = This; + SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); + + obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + + EnterCriticalSection(&This->lock); + + list_add_tail(&This->objects, &obj->entry); + + LeaveCriticalSection(&This->lock); + + *object = &obj->ISpatialAudioObject_iface; + + return S_OK; +} + +static ISpatialAudioObjectRenderStreamVtbl ISpatialAudioObjectRenderStream_vtbl = { + SAORS_QueryInterface, + SAORS_AddRef, + SAORS_Release, + SAORS_GetAvailableDynamicObjectCount, + SAORS_GetService, + SAORS_Start, + SAORS_Stop, + SAORS_Reset, + SAORS_BeginUpdatingAudioObjects, + SAORS_EndUpdatingAudioObjects, + SAORS_ActivateSpatialAudioObject, +}; + +static HRESULT WINAPI SAC_QueryInterface(ISpatialAudioClient *iface, REFIID riid, void **ppv) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_ISpatialAudioClient)) { + *ppv = &This->ISpatialAudioClient_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI SAC_AddRef(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + return ref; +} + +static ULONG WINAPI SAC_Release(ISpatialAudioClient *iface) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) new ref %u\n", This, ref); + if (!ref) { + IMMDevice_Release(This->mmdev); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI SAC_GetStaticObjectPosition(ISpatialAudioClient *iface, + AudioObjectType type, float *x, float *y, float *z) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(0x%x, %p, %p, %p)\n", This, type, x, y, z); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetNativeStaticObjectTypeMask(ISpatialAudioClient *iface, + AudioObjectType *mask) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, mask); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_GetMaxDynamicObjectCount(ISpatialAudioClient *iface, + UINT32 *value) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, value); + + *value = 0; + + return S_OK; +} + +static HRESULT WINAPI SAC_GetSupportedAudioObjectFormatEnumerator( + ISpatialAudioClient *iface, IAudioFormatEnumerator **enumerator) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + TRACE("(%p)->(%p)\n", This, enumerator); + + *enumerator = &This->IAudioFormatEnumerator_iface; + SAC_AddRef(iface); + + return S_OK; +} + +static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, + const WAVEFORMATEX *format, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + + /* FIXME: should get device period from the device */ + static const REFERENCE_TIME period = 100000; + + TRACE("(%p)->(%p, %p)\n", This, format, count); + + *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + + return S_OK; +} + +static HRESULT WINAPI SAC_IsAudioObjectFormatSupported(ISpatialAudioClient *iface, + const WAVEFORMATEX *format) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%p)\n", This, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI SAC_IsSpatialAudioStreamAvailable(ISpatialAudioClient *iface, + REFIID stream_uuid, const PROPVARIANT *info) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(stream_uuid), info); + return E_NOTIMPL; +} + +static WAVEFORMATEX *clone_fmtex(const WAVEFORMATEX *src) +{ + WAVEFORMATEX *r = heap_alloc(sizeof(WAVEFORMATEX) + src->cbSize); + memcpy(r, src, sizeof(WAVEFORMATEX) + src->cbSize); + return r; +} + +static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) +{ + static char buf[2048]; + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%x), rate: %u, depth: %u", + fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), + fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + }else{ + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %u, depth: %u", + fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + } + return buf; +} + +static void static_mask_to_channels(AudioObjectType static_mask, WORD *count, DWORD *mask, UINT32 *map) +{ + UINT32 out_chan = 0, map_idx = 0; + *count = 0; + *mask = 0; +#define CONVERT_MASK(f, t) \ + if(static_mask & f){ \ + *count += 1; \ + *mask |= t; \ + map[map_idx++] = out_chan++; \ + TRACE("mapping 0x%x to %u\n", f, out_chan - 1); \ + }else{ \ + map[map_idx++] = ~0; \ + } + CONVERT_MASK(AudioObjectType_FrontLeft, SPEAKER_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_FrontRight, SPEAKER_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_FrontCenter, SPEAKER_FRONT_CENTER); + CONVERT_MASK(AudioObjectType_LowFrequency, SPEAKER_LOW_FREQUENCY); + CONVERT_MASK(AudioObjectType_SideLeft, SPEAKER_SIDE_LEFT); + CONVERT_MASK(AudioObjectType_SideRight, SPEAKER_SIDE_RIGHT); + CONVERT_MASK(AudioObjectType_BackLeft, SPEAKER_BACK_LEFT); + CONVERT_MASK(AudioObjectType_BackRight, SPEAKER_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_TopFrontLeft, SPEAKER_TOP_FRONT_LEFT); + CONVERT_MASK(AudioObjectType_TopFrontRight, SPEAKER_TOP_FRONT_RIGHT); + CONVERT_MASK(AudioObjectType_TopBackLeft, SPEAKER_TOP_BACK_LEFT); + CONVERT_MASK(AudioObjectType_TopBackRight, SPEAKER_TOP_BACK_RIGHT); + CONVERT_MASK(AudioObjectType_BackCenter, SPEAKER_BACK_CENTER); +} + +static HRESULT activate_stream(SpatialAudioStreamImpl *stream) +{ + WAVEFORMATEXTENSIBLE *object_fmtex = (WAVEFORMATEXTENSIBLE *)stream->params.ObjectFormat; + HRESULT hr; + REFERENCE_TIME period; + + if(!(object_fmtex->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (object_fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&object_fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))){ + FIXME("Only float formats are supported for now\n"); + return E_INVALIDARG; + } + + hr = IMMDevice_Activate(stream->sa_client->mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&stream->client); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + return hr; + } + + hr = IAudioClient_GetDevicePeriod(stream->client, &period, NULL); + if(FAILED(hr)){ + WARN("GetDevicePeriod failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->stream_fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + static_mask_to_channels(stream->params.StaticObjectTypeMask, + &stream->stream_fmtex.Format.nChannels, &stream->stream_fmtex.dwChannelMask, + stream->static_object_map); + stream->stream_fmtex.Format.nSamplesPerSec = stream->params.ObjectFormat->nSamplesPerSec; + stream->stream_fmtex.Format.wBitsPerSample = stream->params.ObjectFormat->wBitsPerSample; + stream->stream_fmtex.Format.nBlockAlign = (stream->stream_fmtex.Format.nChannels * stream->stream_fmtex.Format.wBitsPerSample) / 8; + stream->stream_fmtex.Format.nAvgBytesPerSec = stream->stream_fmtex.Format.nSamplesPerSec * stream->stream_fmtex.Format.nBlockAlign; + stream->stream_fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + stream->stream_fmtex.Samples.wValidBitsPerSample = stream->stream_fmtex.Format.wBitsPerSample; + stream->stream_fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, + period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + if(FAILED(hr)){ + WARN("Initialize failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + /* XXX: OK that this is the user's handle? */ + hr = IAudioClient_SetEventHandle(stream->client, stream->params.EventHandle); + if(FAILED(hr)){ + WARN("SetEventHandle failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + hr = IAudioClient_GetService(stream->client, &IID_IAudioRenderClient, (void**)&stream->render); + if(FAILED(hr)){ + WARN("GetService(AudioRenderClient) failed: %08x\n", hr); + IAudioClient_Release(stream->client); + return hr; + } + + stream->period_frames = MulDiv(period, stream->stream_fmtex.Format.nSamplesPerSec, 10000000); + + return S_OK; +} + +static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, + const PROPVARIANT *prop, REFIID riid, void **stream) +{ + SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); + SpatialAudioObjectRenderStreamActivationParams *params; + HRESULT hr; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), stream); + + if(IsEqualIID(riid, &IID_ISpatialAudioObjectRenderStream)){ + SpatialAudioStreamImpl *obj; + + if(prop && + (prop->vt != VT_BLOB || + prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + WARN("Got invalid params\n"); + *stream = NULL; + return E_INVALIDARG; + } + + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + + if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ + *stream = NULL; + return E_INVALIDARG; + } + + if(!params->ObjectFormat || memcmp(params->ObjectFormat, &This->object_fmtex.Format, sizeof(*params->ObjectFormat) + params->ObjectFormat->cbSize)) { + *stream = NULL; + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + + obj = heap_alloc_zero(sizeof(SpatialAudioStreamImpl)); + + obj->ISpatialAudioObjectRenderStream_iface.lpVtbl = &ISpatialAudioObjectRenderStream_vtbl; + obj->ref = 1; + memcpy(&obj->params, params, sizeof(obj->params)); + + obj->update_frames = ~0; + + InitializeCriticalSection(&obj->lock); + list_init(&obj->objects); + + obj->sa_client = This; + SAC_AddRef(&This->ISpatialAudioClient_iface); + + obj->params.ObjectFormat = clone_fmtex(obj->params.ObjectFormat); + + if(obj->params.EventHandle != INVALID_HANDLE_VALUE && + obj->params.EventHandle != 0) + DuplicateHandle(GetCurrentProcess(), obj->params.EventHandle, + GetCurrentProcess(), &obj->params.EventHandle, 0, FALSE, + DUPLICATE_SAME_ACCESS); + + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_AddRef(obj->params.NotifyObject); + + if(TRACE_ON(mmdevapi)){ + TRACE("ObjectFormat: {%s}\n", debugstr_fmtex(obj->params.ObjectFormat)); + TRACE("StaticObjectTypeMask: 0x%x\n", obj->params.StaticObjectTypeMask); + TRACE("MinDynamicObjectCount: 0x%x\n", obj->params.MinDynamicObjectCount); + TRACE("MaxDynamicObjectCount: 0x%x\n", obj->params.MaxDynamicObjectCount); + TRACE("Category: 0x%x\n", obj->params.Category); + TRACE("EventHandle: %p\n", obj->params.EventHandle); + TRACE("NotifyObject: %p\n", obj->params.NotifyObject); + } + + hr = activate_stream(obj); + if(FAILED(hr)){ + if(obj->params.NotifyObject) + ISpatialAudioObjectRenderStreamNotify_Release(obj->params.NotifyObject); + DeleteCriticalSection(&obj->lock); + heap_free((void*)obj->params.ObjectFormat); + CloseHandle(obj->params.EventHandle); + ISpatialAudioClient_Release(&obj->sa_client->ISpatialAudioClient_iface); + heap_free(obj); + *stream = NULL; + return hr; + } + + *stream = &obj->ISpatialAudioObjectRenderStream_iface; + }else{ + FIXME("Unsupported audio stream IID: %s\n", debugstr_guid(riid)); + *stream = NULL; + return E_NOTIMPL; + } + + return S_OK; +} + +static ISpatialAudioClientVtbl ISpatialAudioClient_vtbl = { + SAC_QueryInterface, + SAC_AddRef, + SAC_Release, + SAC_GetStaticObjectPosition, + SAC_GetNativeStaticObjectTypeMask, + SAC_GetMaxDynamicObjectCount, + SAC_GetSupportedAudioObjectFormatEnumerator, + SAC_GetMaxFrameCount, + SAC_IsAudioObjectFormatSupported, + SAC_IsSpatialAudioStreamAvailable, + SAC_ActivateSpatialAudioStream, +}; + +static HRESULT WINAPI SAOFE_QueryInterface(IAudioFormatEnumerator *iface, + REFIID riid, void **ppvObject) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_QueryInterface(&This->ISpatialAudioClient_iface, riid, ppvObject); +} + +static ULONG WINAPI SAOFE_AddRef(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_AddRef(&This->ISpatialAudioClient_iface); +} + +static ULONG WINAPI SAOFE_Release(IAudioFormatEnumerator *iface) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + return SAC_Release(&This->ISpatialAudioClient_iface); +} + +static HRESULT WINAPI SAOFE_GetCount(IAudioFormatEnumerator *iface, UINT32 *count) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%p)\n", This, count); + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI SAOFE_GetFormat(IAudioFormatEnumerator *iface, + UINT32 index, WAVEFORMATEX **format) +{ + SpatialAudioImpl *This = impl_from_IAudioFormatEnumerator(iface); + + TRACE("(%p)->(%u, %p)\n", This, index, format); + + if(index > 0) + return E_INVALIDARG; + + *format = &This->object_fmtex.Format; + + return S_OK; +} + +static IAudioFormatEnumeratorVtbl IAudioFormatEnumerator_vtbl = { + SAOFE_QueryInterface, + SAOFE_AddRef, + SAOFE_Release, + SAOFE_GetCount, + SAOFE_GetFormat, +}; + +HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) +{ + SpatialAudioImpl *obj; + IAudioClient *aclient; + WAVEFORMATEX *closest; + HRESULT hr; + + obj = heap_alloc_zero(sizeof(*obj)); + + obj->ref = 1; + obj->ISpatialAudioClient_iface.lpVtbl = &ISpatialAudioClient_vtbl; + obj->IAudioFormatEnumerator_iface.lpVtbl = &IAudioFormatEnumerator_vtbl; + + obj->object_fmtex.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + obj->object_fmtex.Format.nChannels = 1; + obj->object_fmtex.Format.nSamplesPerSec = 48000; + obj->object_fmtex.Format.wBitsPerSample = sizeof(float) * 8; + obj->object_fmtex.Format.nBlockAlign = (obj->object_fmtex.Format.nChannels * obj->object_fmtex.Format.wBitsPerSample) / 8; + obj->object_fmtex.Format.nAvgBytesPerSec = obj->object_fmtex.Format.nSamplesPerSec * obj->object_fmtex.Format.nBlockAlign; + obj->object_fmtex.Format.cbSize = 0; + + hr = IMMDevice_Activate(mmdev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&aclient); + if(FAILED(hr)){ + WARN("Activate failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + hr = IAudioClient_IsFormatSupported(aclient, AUDCLNT_SHAREMODE_SHARED, &obj->object_fmtex.Format, &closest); + + IAudioClient_Release(aclient); + + if(hr == S_FALSE){ + if(sizeof(WAVEFORMATEX) + closest->cbSize > sizeof(obj->object_fmtex)){ + ERR("Returned format too large: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else if(!((closest->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE *)closest)->SubFormat, + &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) && + closest->wBitsPerSample == 32)){ + ERR("Returned format not 32-bit float: %s\n", debugstr_fmtex(closest)); + CoTaskMemFree(closest); + heap_free(obj); + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + WARN("The audio stack doesn't support 48kHz 32bit float. Using the closest match. Audio may be glitchy. %s\n", debugstr_fmtex(closest)); + memcpy(&obj->object_fmtex, + closest, + sizeof(WAVEFORMATEX) + closest->cbSize); + CoTaskMemFree(closest); + } else if(hr != S_OK){ + WARN("Checking supported formats failed: %08x\n", hr); + heap_free(obj); + return hr; + } + + obj->mmdev = mmdev; + IMMDevice_AddRef(mmdev); + + *out = &obj->ISpatialAudioClient_iface; + + return S_OK; +} diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 0f17ea31923..062ad413922 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -6,4 +6,5 @@ C_SRCS = \ dependency.c \ mmdevenum.c \ propstore.c \ - render.c + render.c \ + spatialaudio.c diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 350d6474a46..1fd1c7d4aca 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -24,6 +24,7 @@ #include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "spatialaudioclient.h" #include "audiopolicy.h" #include "dshow.h" #include "dsound.h" diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c new file mode 100644 index 00000000000..8e4d4a874ef --- /dev/null +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -0,0 +1,441 @@ +/* + * Copyright 2021 Arkadiusz Hiler 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 <math.h> +#include <stdio.h> + +#include "wine/test.h" + +#define COBJMACROS + +#ifdef STANDALONE +#include "initguid.h" +#endif + +#include "mmdeviceapi.h" +#include "spatialaudioclient.h" + +static IMMDeviceEnumerator *mme = NULL; +static IMMDevice *dev = NULL; +static ISpatialAudioClient *sac = NULL; +static UINT32 max_dyn_count; +static HANDLE event; +static WAVEFORMATEX format; + +static void test_formats(void) +{ + HRESULT hr; + IAudioFormatEnumerator *afe; + UINT32 format_count = 0; + WAVEFORMATEX *fmt = NULL; + + hr = ISpatialAudioClient_GetSupportedAudioObjectFormatEnumerator(sac, &afe); + ok(hr == S_OK, "Getting format enumerator failed: 0x%08x\n", hr); + + hr = IAudioFormatEnumerator_GetCount(afe, &format_count); + ok(hr == S_OK, "Getting format count failed: 0x%08x\n", hr); + ok(format_count == 1, "Got wrong format count, expected 1 got %u\n", format_count); + + hr = IAudioFormatEnumerator_GetFormat(afe, 0, &fmt); + ok(hr == S_OK, "Getting format failed: 0x%08x\n", hr); + ok(fmt != NULL, "Expected to get non-NULL format\n"); + + ok(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT, "Wrong format, expected WAVE_FORMAT_IEEE_FLOAT got %hx\n", fmt->wFormatTag); + ok(fmt->nChannels == 1, "Wrong number of channels, expected 1 got %hu\n", fmt->nChannels); + ok(fmt->nSamplesPerSec == 48000, "Wrong sample ret, expected 48000 got %u\n", fmt->nSamplesPerSec); + ok(fmt->wBitsPerSample == 32, "Wrong bits per sample, expected 32 got %hu\n", fmt->wBitsPerSample); + ok(fmt->nBlockAlign == 4, "Wrong block align, expected 4 got %hu\n", fmt->nBlockAlign); + ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %u\n", fmt->nAvgBytesPerSec); + ok(fmt->cbSize == 0, "Wrong cbSize for simple format, expected 0, got %hu\n", fmt->cbSize); + + memcpy(&format, fmt, sizeof(format)); + + IAudioFormatEnumerator_Release(afe); +} + +static void fill_activation_params(SpatialAudioObjectRenderStreamActivationParams *activation_params) +{ + activation_params->StaticObjectTypeMask = \ + AudioObjectType_FrontLeft | + AudioObjectType_FrontRight | + AudioObjectType_FrontCenter | + AudioObjectType_LowFrequency | + AudioObjectType_SideLeft | + AudioObjectType_SideRight | + AudioObjectType_BackLeft | + AudioObjectType_BackRight | + AudioObjectType_TopFrontLeft | + AudioObjectType_TopFrontRight | + AudioObjectType_TopBackLeft | + AudioObjectType_TopBackRight; + + activation_params->MinDynamicObjectCount = 0; + activation_params->MaxDynamicObjectCount = 0; + activation_params->Category = AudioCategory_GameEffects; + activation_params->EventHandle = event; + activation_params->NotifyObject = NULL; + + activation_params->ObjectFormat = &format; +} + +typedef struct NotifyObject +{ + ISpatialAudioObjectRenderStreamNotify ISpatialAudioObjectRenderStreamNotify_iface; + LONG ref; +} NotifyObject; + +static WINAPI HRESULT notifyobj_QueryInterface( + ISpatialAudioObjectRenderStreamNotify *This, + REFIID riid, + void **ppvObject) +{ + return S_OK; +} + +static WINAPI ULONG notifyobj_AddRef( + ISpatialAudioObjectRenderStreamNotify *This) +{ + NotifyObject *obj = CONTAINING_RECORD(This, NotifyObject, ISpatialAudioObjectRenderStreamNotify_iface); + ULONG ref = InterlockedIncrement(&obj->ref); + return ref; +} + +static WINAPI ULONG notifyobj_Release( + ISpatialAudioObjectRenderStreamNotify *This) +{ + NotifyObject *obj = CONTAINING_RECORD(This, NotifyObject, ISpatialAudioObjectRenderStreamNotify_iface); + ULONG ref = InterlockedDecrement(&obj->ref); + return ref; +} + +static WINAPI HRESULT notifyobj_OnAvailableDynamicObjectCountChange( + ISpatialAudioObjectRenderStreamNotify *This, + ISpatialAudioObjectRenderStreamBase *stream, + LONGLONG deadline, + UINT32 object_count) +{ + ok(FALSE, "Expected to never be notified of dynamic object count change\n"); + return S_OK; +} + +static const ISpatialAudioObjectRenderStreamNotifyVtbl notifyobjvtbl = +{ + notifyobj_QueryInterface, + notifyobj_AddRef, + notifyobj_Release, + notifyobj_OnAvailableDynamicObjectCountChange +}; + +static void test_stream_activation(void) +{ + HRESULT hr; + WAVEFORMATEX wrong_format; + ISpatialAudioObjectRenderStream *sas = NULL; + + SpatialAudioObjectRenderStreamActivationParams activation_params; + PROPVARIANT activation_params_prop; + NotifyObject notify_object; + + PropVariantInit(&activation_params_prop); + activation_params_prop.vt = VT_BLOB; + activation_params_prop.blob.cbSize = sizeof(activation_params); + activation_params_prop.blob.pBlobData = (BYTE*) &activation_params; + + /* correct params */ + fill_activation_params(&activation_params); + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n"); + + /* no event handle */ + fill_activation_params(&activation_params); + activation_params.EventHandle = NULL; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == E_INVALIDARG, "Expected lack of no EventHandle to be invalid: 0x%08x\n", hr); + ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); + + /* must use only queried sample rate */ + fill_activation_params(&activation_params); + memcpy(&wrong_format, &format, sizeof(format)); + activation_params.ObjectFormat = &wrong_format; + wrong_format.nSamplesPerSec = 44100; + wrong_format.nAvgBytesPerSec = wrong_format.nSamplesPerSec * wrong_format.nBlockAlign; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected format to be unsupported: 0x%08x\n", hr); + ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); + + /* dynamic objects are not supported */ + if (max_dyn_count == 0) + { + fill_activation_params(&activation_params); + activation_params.StaticObjectTypeMask |= AudioObjectType_Dynamic; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == E_INVALIDARG, "Expected dynamic objects type be invalid: 0x%08x\n", hr); + ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); + } + + activation_params.MinDynamicObjectCount = max_dyn_count + 1; + activation_params.MaxDynamicObjectCount = max_dyn_count + 1; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + if (max_dyn_count) + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected dynamic object count exceeding max to be unsupported: 0x%08x\n", hr); + else + ok(hr == E_INVALIDARG, "Expected setting dynamic object count to be invalid: 0x%08x\n", hr); + + /* ISpatialAudioObjectRenderStreamNotify */ + fill_activation_params(&activation_params); + notify_object.ISpatialAudioObjectRenderStreamNotify_iface.lpVtbl = &notifyobjvtbl; + notify_object.ref = 0; + activation_params.NotifyObject = &notify_object.ISpatialAudioObjectRenderStreamNotify_iface; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(notify_object.ref == 1, "Expected to get increased NotifyObject's ref count\n"); + ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n"); + ok(notify_object.ref == 0, "Expected to get lowered NotifyObject's ref count\n"); +} + +static void test_audio_object_activation(void) +{ + HRESULT hr; + BOOL is_active; + ISpatialAudioObjectRenderStream *sas = NULL; + ISpatialAudioObject *sao1, *sao2; + + SpatialAudioObjectRenderStreamActivationParams activation_params; + PROPVARIANT activation_params_prop; + + PropVariantInit(&activation_params_prop); + activation_params_prop.vt = VT_BLOB; + activation_params_prop.blob.cbSize = sizeof(activation_params); + activation_params_prop.blob.pBlobData = (BYTE*) &activation_params; + + fill_activation_params(&activation_params); + activation_params.StaticObjectTypeMask &= ~AudioObjectType_FrontRight; + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao1); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + hr = ISpatialAudioObject_IsActive(sao1, &is_active); + todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08x\n", hr); + todo_wine ok(is_active, "Expected spaital audio object to be active\n"); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao2); + ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao2); + ok(hr == SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE, "Expected static object to be not available: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_Dynamic, &sao2); + ok(hr == SPTLAUDCLNT_E_NO_MORE_OBJECTS, "Expected to not have no more dynamic objects: 0x%08x\n", hr); + + ISpatialAudioObject_Release(sao1); + ISpatialAudioObjectRenderStream_Release(sas); +} + +static BOOL is_buffer_zeroed(BYTE *buffer, UINT32 buffer_length) +{ + UINT32 i; + + for (i = 0; i < buffer_length; i++) + { + if (buffer[i] != 0) + return FALSE; + } + return TRUE; +} + +static void test_audio_object_buffers(void) +{ + HRESULT hr; + ISpatialAudioObjectRenderStream *sas = NULL; + ISpatialAudioObject *sao[4]; + UINT32 dyn_object_count, frame_count, buffer_length; + BYTE *buffer; + INT i; + + SpatialAudioObjectRenderStreamActivationParams activation_params; + PROPVARIANT activation_params_prop; + + PropVariantInit(&activation_params_prop); + activation_params_prop.vt = VT_BLOB; + activation_params_prop.blob.cbSize = sizeof(activation_params); + activation_params_prop.blob.pBlobData = (BYTE*) &activation_params; + + fill_activation_params(&activation_params); + hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_Start(sas); + ok(hr == S_OK, "Failed to activate spatial audio render stream: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao[1]); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + + hr = WaitForSingleObject(event, 200); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideLeft, &sao[2]); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count > 0, "Expected to get non-zero frames to update\n"); + + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + + for (i = 0; i < ARRAYSIZE(sao); i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); + ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", + frame_count * format.wBitsPerSample / 8, buffer_length); + ok(is_buffer_zeroed(buffer, buffer_length), "Expected audio object's buffer to be zeroed\n"); + } + + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + + hr = WaitForSingleObject(event, 200); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count > 0, "Expected to get non-zero frames to update\n"); + + /* one more iteration but not with every object */ + for (i = 0; i < ARRAYSIZE(sao) - 1; i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); + ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", + frame_count * format.wBitsPerSample / 8, buffer_length); + ok(is_buffer_zeroed(buffer, buffer_length), "Expected audio object's buffer to be zeroed\n"); + } + + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + + /* ending the stream */ + hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + + hr = WaitForSingleObject(event, 10000); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + + hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count > 0, "Expected to get non-zero frames to update\n"); + + /* expect the object that was not updated last cycle to be invalidated */ + hr = ISpatialAudioObject_GetBuffer(sao[ARRAYSIZE(sao) - 1], &buffer, &buffer_length); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + + for (i = 0; i < ARRAYSIZE(sao) - 1; i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + + hr = ISpatialAudioObject_SetEndOfStream(sao[i], 0); + todo_wine ok(hr == S_OK, "Failed to end the stream: 0x%08x\n", hr); + + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + } + + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + + for (i = 0; i < ARRAYSIZE(sao); i++) + { + ISpatialAudioObject_Release(sao[i]); + } + + ISpatialAudioObjectRenderStream_Release(sas); +} + +START_TEST(spatialaudio) +{ + HRESULT hr; + + event = CreateEventA(NULL, FALSE, FALSE, "spatial-audio-test-prog-event"); + ok (event != NULL, "Failed to create event, last error: 0x%08x\n", GetLastError()); + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); + if (FAILED(hr)) + { + skip("mmdevapi not available: 0x%08x\n", hr); + goto cleanup; + } + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + if (hr != S_OK || !dev) + { + if (hr == E_NOTFOUND) + skip("No sound card available\n"); + else + skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + goto cleanup; + } + + hr = IMMDevice_Activate(dev, &IID_ISpatialAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&sac); + ok(hr == S_OK || hr == E_NOINTERFACE, "ISpatialAudioClient Activation failed: 0x%08x\n", hr); + if (hr != S_OK || !dev) + { + if (hr == E_NOINTERFACE) + skip("ISpatialAudioClient interface not found\n"); + else + skip("ISpatialAudioClient Activation returns 0x%08x\n", hr); + goto cleanup; + } + + hr = ISpatialAudioClient_GetMaxDynamicObjectCount(sac, &max_dyn_count); + ok(hr == S_OK, "Failed to get max dynamic object count: 0x%08x\n", hr); + + /* that's the default, after manually enabling Windows Sonic it's possible to have max_dyn_count > 0 */ + /* ok(max_dyn_count == 0, "expected max dynamic object count to be 0 got %u\n", max_dyn_count); */ + + test_formats(); + test_stream_activation(); + test_audio_object_activation(); + test_audio_object_buffers(); + + ISpatialAudioClient_Release(sac); + +cleanup: + if (dev) + IMMDevice_Release(dev); + if (mme) + IMMDeviceEnumerator_Release(mme); + CoUninitialize(); + CloseHandle(event); +} diff --git a/include/spatialaudioclient.idl b/include/spatialaudioclient.idl index 16a1541fd1d..08c84965566 100644 --- a/include/spatialaudioclient.idl +++ b/include/spatialaudioclient.idl @@ -43,6 +43,47 @@ typedef [v1_enum] enum AudioObjectType AudioObjectType_BackCenter = 0x00020000, } AudioObjectType; +cpp_quote("#define SPTLAUDCLNT_E_DESTROYED AUDCLNT_ERR(0x100)") +cpp_quote("#define SPTLAUDCLNT_E_OUT_OF_ORDER AUDCLNT_ERR(0x101)") +cpp_quote("#define SPTLAUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x102)") +cpp_quote("#define SPTLAUDCLNT_E_NO_MORE_OBJECTS AUDCLNT_ERR(0x103)") +cpp_quote("#define SPTLAUDCLNT_E_PROPERTY_NOT_SUPPORTED AUDCLNT_ERR(0x104)") +cpp_quote("#define SPTLAUDCLNT_E_ERRORS_IN_OBJECT_CALLS AUDCLNT_ERR(0x105)") +cpp_quote("#define SPTLAUDCLNT_E_METADATA_FORMAT_NOT_SUPPORTED AUDCLNT_ERR(0x106)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_AVAILABLE AUDCLNT_ERR(0x107)") +cpp_quote("#define SPTLAUDCLNT_E_INVALID_LICENSE AUDCLNT_ERR(0x108)") +cpp_quote("#define SPTLAUDCLNT_E_STREAM_NOT_STOPPED AUDCLNT_ERR(0x10a)") +cpp_quote("#define SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE AUDCLNT_ERR(0x10b)") +cpp_quote("#define SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE AUDCLNT_ERR(0x10c)") +cpp_quote("#define SPTLAUDCLNT_E_INTERNAL AUDCLNT_ERR(0x10d)") + +interface ISpatialAudioObjectRenderStreamBase; + +[ + object, + uuid(dddf83e6-68d7-4c70-883f-a1836afb4a50), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamNotify : IUnknown +{ + HRESULT OnAvailableDynamicObjectCountChange( + [in] ISpatialAudioObjectRenderStreamBase *stream, + [in] LONGLONG deadline, + [in] UINT32 object_count); +} + +typedef struct tagSpatialAudioObjectRenderStreamActivationParams +{ + const WAVEFORMATEX *ObjectFormat; + AudioObjectType StaticObjectTypeMask; + UINT32 MinDynamicObjectCount; + UINT32 MaxDynamicObjectCount; + AUDIO_STREAM_CATEGORY Category; + HANDLE EventHandle; + ISpatialAudioObjectRenderStreamNotify *NotifyObject; +} SpatialAudioObjectRenderStreamActivationParams; + [ object, uuid(dcdaa858-895a-4a22-a5eb-67bda506096d), @@ -98,3 +139,83 @@ interface ISpatialAudioClient : IUnknown [in] REFIID riid, [out, iid_is(riid)] void **stream); } + +[ + object, + uuid(cce0b8f2-8d4d-4efb-a8cf-3d6ecf1c30e0), + pointer_default(unique), + local +] +interface ISpatialAudioObjectBase : IUnknown +{ + HRESULT GetBuffer( + [out] BYTE **buffer, + [out] UINT32 *bytes); + + HRESULT SetEndOfStream( + [in] UINT32 frames); + + HRESULT IsActive( + [out] BOOL *active); + + HRESULT GetAudioObjectType( + [out] AudioObjectType *type); +} + +[ + object, + uuid(dde28967-521b-46e5-8f00-bd6f2bc8ab1d), + pointer_default(unique), + local +] +interface ISpatialAudioObject : ISpatialAudioObjectBase +{ + HRESULT SetPosition( + [in] float x, + [in] float y, + [in] float z); + + HRESULT SetVolume( + [in] float vol); +} + +[ + object, + uuid(feaaf403-c1d8-450d-aa05-e0ccee7502a8), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStreamBase : IUnknown +{ + HRESULT GetAvailableDynamicObjectCount( + [out] UINT32 *count); + + HRESULT GetService( + [in] REFIID riid, + [out] void **service); + + HRESULT Start(); + + HRESULT Stop(); + + HRESULT Reset(); + + HRESULT BeginUpdatingAudioObjects( + [out] UINT32 *count, + [out] UINT32 *frames); + + HRESULT EndUpdatingAudioObjects(); +} + +[ + object, + uuid(bab5f473-b423-477b-85f5-b5a332a04153), + pointer_default(unique), + local +] +interface ISpatialAudioObjectRenderStream : ISpatialAudioObjectRenderStreamBase +{ + HRESULT ActivateSpatialAudioObject( + [in] AudioObjectType type, + [out] ISpatialAudioObject **object); +} -- 2.30.0

2 1

[PATCH] conhost: Keep horizontal position of cursor within screen width.
by Roman Pišl 01 Feb '21

01 Feb '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50581 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- programs/conhost/conhost.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0ac1c5f507b..418098420c6 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -357,7 +357,9 @@ static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) size = WideCharToMultiByte( get_tty_cp( screen_buffer->console ), 0, &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); tty_write( screen_buffer->console, buf, size ); - screen_buffer->console->tty_cursor_x++; + + if (screen_buffer->console->tty_cursor_x < screen_buffer->width - 1) + screen_buffer->console->tty_cursor_x++; } } -- 2.20.1

2 1

Re: TestBot job 84836 results: [PATCH] mmdevapi: Implement SpatialAudio features
by Arkadiusz Hiler 01 Feb '21

01 Feb '21

On Mon, Feb 01, 2021 at 09:47:02AM -0600, Marvin wrote: > debiant failed 12 > debiant failed 8 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=84836 > > === debiant (32 bit report) === > > mmdevapi: > render.c:1431: Test failed: Activation failed with 8889000a > render.c:1962: Test failed: Activation failed with 8889000a AUDCLNT_E_DEVICE_IN_USE, I have to look into that. > spatialaudio.c:236: Test succeeded inside todo block: Expected spaital audio object to be active IsActive() is not implemented and doesn't set the variable, so it's just checking whatever ends up on the stack. Easy fix. > spatialaudio.c:326: Test failed: Expected to get non-zero frames to update That's an interesting one... -- Cheers, Arek

1 0

[PATCH 4/5] wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Dmitry Timoshkov 01 Feb '21

01 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 27 +++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 220987650a2..9cac2a16949 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -1,6 +1,7 @@ /* * Copyright 2012 Austin English * Copyright 2012 André Hentschel + * Copyright 2021 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +68,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a148dcbb094..a37cdb7297f 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal; -- 2.29.2

2 2

[PATCH 5/5] wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Dmitry Timoshkov 01 Feb '21

01 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 56 ++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 5 files changed, 64 insertions(+) create mode 100644 dlls/wevtapi/tests/Makefile.in create mode 100644 dlls/wevtapi/tests/wevtapi.c diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..89548dc71b7 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,56 @@ +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index a37cdb7297f..4f0e7d52a0e 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, -- 2.29.2

2 1

[PATCH 1/5] mf: Add shutdown state for the standard quality manager.
by Nikolay Sivov 01 Feb '21

01 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 48 ++++++++++++++++++++++++++++++++++--------- dlls/mf/tests/mf.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 10 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5034255339c..af58a47ed7a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -319,12 +319,19 @@ struct presentation_clock BOOL is_shut_down; }; +enum quality_manager_state +{ + QUALITY_MANAGER_READY = 0, + QUALITY_MANAGER_SHUT_DOWN, +}; + struct quality_manager { IMFQualityManager IMFQualityManager_iface; LONG refcount; IMFPresentationClock *clock; + unsigned int state; CRITICAL_SECTION cs; }; @@ -4794,24 +4801,35 @@ static HRESULT WINAPI standard_quality_manager_NotifyTopology(IMFQualityManager return S_OK; } +static void standard_quality_manager_release_clock(struct quality_manager *manager) +{ + if (manager->clock) + IMFPresentationClock_Release(manager->clock); + manager->clock = NULL; +} + static HRESULT WINAPI standard_quality_manager_NotifyPresentationClock(IMFQualityManager *iface, IMFPresentationClock *clock) { struct quality_manager *manager = impl_from_IMFQualityManager(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, clock); - if (!clock) - return E_POINTER; - EnterCriticalSection(&manager->cs); - if (manager->clock) - IMFPresentationClock_Release(manager->clock); - manager->clock = clock; - IMFPresentationClock_AddRef(manager->clock); + if (manager->state == QUALITY_MANAGER_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!clock) + hr = E_POINTER; + else + { + standard_quality_manager_release_clock(manager); + manager->clock = clock; + IMFPresentationClock_AddRef(manager->clock); + } LeaveCriticalSection(&manager->cs); - return S_OK; + return hr; } static HRESULT WINAPI standard_quality_manager_NotifyProcessInput(IMFQualityManager *iface, IMFTopologyNode *node, @@ -4840,9 +4858,19 @@ static HRESULT WINAPI standard_quality_manager_NotifyQualityEvent(IMFQualityMana static HRESULT WINAPI standard_quality_manager_Shutdown(IMFQualityManager *iface) { - FIXME("%p stub.\n", iface); + struct quality_manager *manager = impl_from_IMFQualityManager(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&manager->cs); + if (manager->state != QUALITY_MANAGER_SHUT_DOWN) + { + standard_quality_manager_release_clock(manager); + manager->state = QUALITY_MANAGER_SHUT_DOWN; + } + LeaveCriticalSection(&manager->cs); + + return S_OK; } static IMFQualityManagerVtbl standard_quality_manager_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 846d311c877..aad1564c3f0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3647,16 +3647,67 @@ failed: static void test_quality_manager(void) { + IMFPresentationClock *clock; IMFQualityManager *manager; HRESULT hr; + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Startup failure, hr %#x.\n", hr); + + hr = MFCreatePresentationClock(&clock); + ok(hr == S_OK, "Failed to create presentation clock, hr %#x.\n", hr); + hr = MFCreateStandardQualityManager(&manager); ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + check_interface(manager, &IID_IMFQualityManager, TRUE); +todo_wine + check_interface(manager, &IID_IMFClockStateSink, TRUE); + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + /* Set clock, then shutdown. */ + EXPECT_REF(clock, 1); + EXPECT_REF(manager, 1); + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 2); +todo_wine + EXPECT_REF(manager, 2); + + hr = IMFQualityManager_Shutdown(manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 1); + + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityManager_NotifyPresentationClock(manager, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityManager_Shutdown(manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFQualityManager_Release(manager); + + /* Set clock, then release without shutting down. */ + hr = MFCreateStandardQualityManager(&manager); + ok(hr == S_OK, "Failed to create quality manager, hr %#x.\n", hr); + + EXPECT_REF(clock, 1); + hr = IMFQualityManager_NotifyPresentationClock(manager, clock); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + EXPECT_REF(clock, 2); + IMFQualityManager_Release(manager); +todo_wine + EXPECT_REF(clock, 2); + + IMFPresentationClock_Release(clock); + + hr = MFShutdown(); + ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } static void test_sar(void) -- 2.30.0

2 8

[tools] winetest/dissect: Don't issue multiple errors in check_unit().
by Francois Gouget 01 Feb '21

01 Feb '21

Don't complain about misplaced lines after the first one has been reported (or if the test has already been tagged as broken for some other reason, e.g. missing start line). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This matches the TestBot behavior. winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 27bcf1704..12a939d28 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -483,7 +483,7 @@ sub add_test_line($$) sub check_unit($$) { my ($l_unit, $l_type) = @_; - if (!$units{$l_unit}) + if (!$units{$l_unit} and !$broken) { add_test_line("end", "Misplaced $l_type message\n"); $extra_failures++; -- 2.20.1

1 0

[tools] testbot/LogUtils: Always set IsWineTest in _CheckUnit().
by Francois Gouget 01 Feb '21

01 Feb '21

_CheckUnit() is only called on Wine test lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 15ec31a42..2f3049344 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -384,13 +384,11 @@ sub _CheckUnit($$$$) { my ($LogInfo, $Cur, $Unit, $Type) = @_; - if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") - { - $LogInfo->{IsWineTest} = 1; - } - # To avoid issuing many duplicate errors, - # only report the first misplaced message. - elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) + # _CheckUnit() is only called for Wine test lines. + $LogInfo->{IsWineTest} = 1; + + # Only report the first misplaced message to avoid duplicate errors. + if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); $Cur->{IsBroken} = 1; -- 2.20.1

1 0

[PATCH 3/5] wevtapi: Add EvtSaveChannelConfig() stub.
by Dmitry Timoshkov 01 Feb '21

01 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index d11287a5dee..220987650a2 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -108,6 +108,12 @@ EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *q return NULL; } +BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE channel, DWORD flags) +{ + FIXME("(%p,%08x) stub\n", channel, flags); + return TRUE; +} + BOOL WINAPI EvtClose(EVT_HANDLE handle) { FIXME("(%p) stub\n", handle); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index e5dd0e70572..9ef06907dc1 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -38,7 +38,7 @@ @ stdcall EvtOpenSession(long ptr long long) @ stdcall EvtQuery(ptr wstr wstr long) @ stub EvtRender -@ stub EvtSaveChannelConfig +@ stdcall EvtSaveChannelConfig(ptr long) @ stub EvtSeek @ stdcall EvtSetChannelConfigProperty(ptr long long ptr) @ stub EvtSetObjectArrayProperty diff --git a/include/winevt.h b/include/winevt.h index a37954f2f94..a148dcbb094 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -128,7 +128,7 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags); EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags); - +BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE, DWORD); #ifdef __cplusplus } /* extern "C" */ -- 2.29.2

1 0

[PATCH 2/5] wevtapi: Return TRUE from EvtSetChannelConfigProperty.
by Dmitry Timoshkov 01 Feb '21

01 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 8521ac3cae8..d11287a5dee 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -72,7 +72,7 @@ BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, PEVT_VARIANT PropertyValue) { FIXME("(%p %i %u %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValue); - return FALSE; + return TRUE; } EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath, -- 2.29.2

1 0

[PATCH 1/5] wevtapi: Return fake handle from EvtOpenChannelConfig.
by Dmitry Timoshkov 01 Feb '21

01 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..8521ac3cae8 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -99,7 +99,7 @@ BOOL WINAPI EvtNextChannelPath(EVT_HANDLE channel_enum, DWORD buffer_len, WCHAR EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); - return NULL; + return (EVT_HANDLE)0xdeadbeef; } EVT_HANDLE WINAPI EvtQuery(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, DWORD flags) -- 2.29.2

1 0

[PATCH] dwrite: Fix vtable variables types.
by Nikolay Sivov 01 Feb '21

01 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 6 ++++-- dlls/dwrite/font.c | 6 +++--- dlls/dwrite/gdiinterop.c | 8 +++++--- dlls/dwrite/main.c | 6 +++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7446665674a..8d573ed530d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1815,7 +1815,8 @@ static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAna return hr; } -static const struct IDWriteTextAnalyzer2Vtbl textanalyzervtbl = { +static const IDWriteTextAnalyzer2Vtbl textanalyzervtbl = +{ dwritetextanalyzer_QueryInterface, dwritetextanalyzer_AddRef, dwritetextanalyzer_Release, @@ -1891,7 +1892,8 @@ static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution * return ref; } -static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { +static const IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = +{ dwritenumbersubstitution_QueryInterface, dwritenumbersubstitution_AddRef, dwritenumbersubstitution_Release diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 014240a1c8f..f1db6dd732b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4567,7 +4567,7 @@ err: return hr; } -static const struct IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = +static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = { systemfontfileenumerator_QueryInterface, systemfontfileenumerator_AddRef, @@ -5450,7 +5450,7 @@ static HRESULT WINAPI localfontfileloader_GetLastWriteTimeFromKey(IDWriteLocalFo return S_OK; } -static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = +static const IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_QueryInterface, localfontfileloader_AddRef, @@ -5873,7 +5873,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys return S_OK; } -static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = +static const IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { glyphrunanalysis_QueryInterface, glyphrunanalysis_AddRef, diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ae421822a77..84d1f615f75 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -911,7 +911,8 @@ static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 * return E_NOTIMPL; } -static const struct IDWriteGdiInterop1Vtbl gdiinteropvtbl = { +static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = +{ gdiinterop_QueryInterface, gdiinterop_AddRef, gdiinterop_Release, @@ -1022,7 +1023,7 @@ static HRESULT WINAPI memresourcestream_GetLastWriteTime(IDWriteFontFileStream * return E_NOTIMPL; } -static const struct IDWriteFontFileStreamVtbl memresourcestreamvtbl = +static const IDWriteFontFileStreamVtbl memresourcestreamvtbl = { memresourcestream_QueryInterface, memresourcestream_AddRef, @@ -1082,7 +1083,8 @@ static HRESULT WINAPI memresourceloader_CreateStreamFromKey(IDWriteFontFileLoade return S_OK; } -static const struct IDWriteFontFileLoaderVtbl memresourceloadervtbl = { +static const IDWriteFontFileLoaderVtbl memresourceloadervtbl = +{ memresourceloader_QueryInterface, memresourceloader_AddRef, memresourceloader_Release, diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0cc0edd1ffc..f550c204b6d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -204,7 +204,7 @@ static DWRITE_RENDERING_MODE1 WINAPI renderingparams3_GetRenderingMode1(IDWriteR return params->mode; } -static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = +static const IDWriteRenderingParams3Vtbl renderingparamsvtbl = { renderingparams_QueryInterface, renderingparams_AddRef, @@ -1756,7 +1756,7 @@ static HRESULT WINAPI dwritefactory7_GetSystemFontCollection(IDWriteFactory7 *if return E_NOTIMPL; } -static const struct IDWriteFactory7Vtbl dwritefactoryvtbl = +static const IDWriteFactory7Vtbl dwritefactoryvtbl = { dwritefactory_QueryInterface, dwritefactory_AddRef, @@ -1831,7 +1831,7 @@ static ULONG WINAPI shareddwritefactory_Release(IDWriteFactory7 *iface) return 1; } -static const struct IDWriteFactory7Vtbl shareddwritefactoryvtbl = +static const IDWriteFactory7Vtbl shareddwritefactoryvtbl = { dwritefactory_QueryInterface, shareddwritefactory_AddRef, -- 2.30.0

1 0

[PATCH] mfreadwrite: Fix vtable variables types.
by Nikolay Sivov 01 Feb '21

01 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 85aec9aaedc..0e0fe1ad9cd 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2011,7 +2011,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface return hr; } -struct IMFSourceReaderVtbl srcreader_vtbl = +static const IMFSourceReaderVtbl srcreader_vtbl = { src_reader_QueryInterface, src_reader_AddRef, @@ -2536,7 +2536,7 @@ static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) return S_OK; } -static const struct IClassFactoryVtbl classfactoryvtbl = +static const IClassFactoryVtbl classfactoryvtbl = { classfactory_QueryInterface, classfactory_AddRef, -- 2.30.0

1 0

[PATCH V3 1/2] msxml3/tests: Test mxwriter DOMDocument output.
by Jefferson Carpenter 01 Feb '21

01 Feb '21

Re-submit

2 6

[tools] testbot/TestWTBS: Allow mission-specific directives, e.g. for test=module.
by Francois Gouget 01 Feb '21

01 Feb '21

A different set of tests are run depending on whether a VM's mission is test=test (the default) or test=module. Being unable to distinguish these two cases prevents checking that the right set of test units is being run in many cases. So add support for the wine:build, wine:test, wine:module categories to allow providing specific checks for the test=build/test/module cases respectively. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 184 +++++++++++++++++++++++++++++------------ 1 file changed, 131 insertions(+), 53 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index bc4e0d9ba..f6ca54e84 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -48,6 +48,7 @@ use WineTestBot::Config; # For $PatchesMailingList use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Patches; use WineTestBot::VMs; @@ -190,13 +191,15 @@ Property names are of the form 'category.name' where the category is one of: - build for checks to perform on the build task. - win32, win64 for checks to perform on the Windows 32- or 64-bit test results respectively. -- win for the checks to perform on both the 32- and 64-bit test results; that - is equivalent to duplicating the directive for the win32 and win64 - categories. -- wine for the checks to perform on the Wine test results. +- win for the checks to perform on both the 32- and 64-bit test results. This + is equivalent to duplicating the directive for win32 and win64. +- wine:build, wine:test, wine:module for checks to perform on test results of + missions with test=build, test=test and test=module respectively. +- wine for the checks to perform on the Wine test results. This is equivalent + to duplicating the directive for the wine:build, wine:test and wine:module. - tests for checks to perform on all test results, that is equivalent to - duplicating the directive for the win32, win64 and wine categories (but not - build since it does not run the tests). + duplicating the directive for the win and wine categories (but not build + since it does not run the tests). A corollary is that any property which is documented as being valid for a category can also be specified for any of its subcategories. So for instance if @@ -208,8 +211,9 @@ sub DumpTestInfo($) { my ($TestInfo) = @_; - foreach my $Category ("webpatch", "patch", "job", "tasks", "tests", "win", - "build", "win32", "win64", "wine") + foreach my $Category ("webpatch", "patch", "job", "tasks", "tests", "build", + "win", "win32", "win64", + "wine", "wine:build", "wine:test", "wine:module") { WineTestBot::LogUtils::_WriteLogErrorsToFh(*STDERR, $TestInfo->{$Category}); WineTestBot::LogUtils::_DumpErrors($Category, $TestInfo->{$Category}); @@ -293,14 +297,15 @@ sub LoadTestInfo($) # Split up the information to jobs, tasks, etc. my $TestInfo = { webpatch => {}, patch => {}, job => {}, - tasks => {}, tests => {}, win => {}, - build => {}, win32 => {}, win64 => {}, wine => {}, + tasks => {}, tests => {}, build => {}, + win => {}, win32 => {}, win64 => {}, + wine => {}, "wine:build" => {}, "wine:test" => {}, "wine:module" => {}, }; my $HasTestInfo; foreach my $Entry (keys %{$RawInfo}) { my $Field = lcfirst($Entry); - if ($Field =~ s/^(webpatch|patch|job|tasks|tests|win|build|win32|win64|wine)\.//) + if ($Field =~ s/^(webpatch|patch|job|tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.//) { my $TaskType = $1; $TestInfo->{$TaskType}->{$Field} = $RawInfo->{$Entry}; @@ -314,7 +319,7 @@ sub LoadTestInfo($) foreach my $RawGroupName (@{$RawInfo->{ErrGroupNames}}) { my $GroupName = lcfirst($RawGroupName); - if ($GroupName =~ s/^(tasks|build|tests|win|win32|win64|wine)\.(report|log|testbot)\.//) + if ($GroupName =~ s/^(tasks|tests|build|win|win32|win64|wine|wine:build|wine:test|wine:module)\.(report|log|testbot)\.//) { my $ErrInfo = ($TestInfo->{$1}->{"$2.errors"} ||= {}); push @{$ErrInfo->{ErrGroupNames}}, $GroupName; @@ -338,11 +343,16 @@ sub LoadTestInfo($) SetDefault($TestInfo, "tasks", "Status", "completed"); SetDefault($TestInfo, "tasks", "HasTask", 1); } + if (defined $TestInfo->{"wine:build"}->{TestUnits}) + { + fail("wine:build.TestUnits should not be set"); + } # Then propagate the defaults foreach my $Pair (["tasks", ["build", "tests"]], ["tests", ["win", "wine"]], - ["win", ["win32", "win64"]]) + ["win", ["win32", "win64"]], + ["wine", ["wine:test", "wine:module"]]) { my ($Src, $TaskTypes) = @$Pair; foreach my $Field (keys %{$TestInfo->{$Src}}) @@ -368,41 +378,51 @@ sub LoadTestInfo($) } } } + # Reset the inherited wine:build.TestUnits since it makes no sense + delete $TestInfo->{"wine:build"}->{TestUnits}; # Automatically check the Task: lines in simple cases - # Make sure no test is run for build tasks - my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); - push @$GrepV, '.'; - $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); - push @$GrepV, '^Task: tests$'; - if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or - $TestInfo->{build}->{HasTimeout}) - { - push @$GrepV, '^Task: ok$'; - } - else + foreach my $Build ("build", "wine:build") { - my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); - push @$Grep, '^Task: ok$'; + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{$Build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{$Build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + + if (($TestInfo->{$Build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{$Build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{$Build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } } - # Note: Depending on where the timeout occurs, the wine task log may or - # may not have a 'Task: ok' line. - if (($TestInfo->{wine}->{Status} || "") eq "completed" and - !$TestInfo->{wine}->{HasTimeout}) + foreach my $Test ("test", "module") { - my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); - if (CheckValue($TestInfo->{wine}->{TestUnits})) + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{"wine:$Test"}->{Status} || "") eq "completed" and + !$TestInfo->{"wine:$Test"}->{HasTimeout}) { - push @$Grep, '^Task: tests$'; + my $Grep = ($TestInfo->{"wine:$Test"}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{"wine:$Test"}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; } - push @$Grep, '^Task: ok$'; } # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") { - foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", "wine") + foreach my $TaskType ("tasks", "tests", "build", "win", "win32", "win64", + "wine", "wine:build", "wine:test", "wine:module") { foreach my $LogType ("report", "log", "testbot") { @@ -426,15 +446,19 @@ sub LoadTestInfo($) CheckValue($TestInfo->{job}->{Status}) and !SkipCheck($TestInfo->{win32}->{TestFailures}) and !SkipCheck($TestInfo->{win64}->{TestFailures}) and - !SkipCheck($TestInfo->{wine}->{TestFailures})) + !SkipCheck($TestInfo->{"wine:test"}->{TestFailures}) and + !SkipCheck($TestInfo->{"wine:module"}->{TestFailures})) { my $Status = ($TestInfo->{job}->{Status} ne 'completed' or $TestInfo->{win32}->{TestFailures} or $TestInfo->{win64}->{TestFailures} or - $TestInfo->{wine}->{TestFailures} or + $TestInfo->{"wine:test"}->{TestFailures} or + $TestInfo->{"wine:module"}->{TestFailures} or $TestInfo->{win32}->{HasTimeout} or $TestInfo->{win64}->{HasTimeout} or - $TestInfo->{wine}->{HasTimeout}) ? "Failed" : "OK"; + $TestInfo->{"wine:build"}->{HasTimeout} or + $TestInfo->{"wine:test"}->{HasTimeout} or + $TestInfo->{"wine:module"}->{HasTimeout}) ? "Failed" : "OK"; SetDefault($TestInfo, "webpatch", "Status", $Status); } @@ -828,9 +852,30 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } + # Assume the VM's Missions field has not changed since the tests were run + my ($ErrMessage, $Missions) = ParseMissionStatement($Task->Missions); + if (@$Missions != 1) + { + fail(TaskKeyStr($Task) ." has an invalid missions field: ". $Task->Missions); + return; + } + + my %ReportTypes; + if ($TaskType =~ /^win/) + { + foreach my $Mission (@{$Missions->[0]->{Missions}}) + { + my $ReportName = GetMissionBaseName($Mission) .".report"; + my $MissionType = $TaskType; + $MissionType .= ":". ($Mission->{test} || "test") if ($TaskType eq "wine"); + $ReportTypes{$ReportName} = $MissionType; + } + } + my $CheckTimeouts = ($Task->Status eq "completed" and CheckValue($TaskInfo->{HasTimeout})); + my $ExpectedFailures; my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { @@ -838,15 +883,33 @@ sub CheckTask($$$$) my $LogInfo = LoadLogErrors($LogPath); $NewFailures += $LogInfo->{NewCount} || 0; + # Get the mission-specific "wine:xxx" report directives + my $MissionType = $ReportTypes{$LogName} || $TaskType; + my $MissionInfo = $TestInfo->{$MissionType}; my $LogType = "log"; if ($LogName =~ /\.report$/) { - $ReportCount++; $LogType = "report"; + $ReportCount++; + + ok($ReportTypes{$LogName}, "Check that $LogName is expected"); + if ($TaskType eq "wine") { my $ReportTestUnits = GetReportTestUnits($LogPath); - map { $TestUnits->{wine}->{$_} = 1 } (keys %$ReportTestUnits); + map { $TestUnits->{$MissionType}->{$_} = 1 } (keys %$ReportTestUnits); + } + + if (CheckValue($MissionInfo->{TestFailures})) + { + ok(($LogInfo->{ErrCount} || 0) <= $MissionInfo->{TestFailures}, + "Check Failures of $LogName in task ". TaskKeyStr($Task)) + or diag("report error count = ", ($LogInfo->{ErrCount} || 0), ", expected at most $MissionInfo->{TestFailures}"); + $ExpectedFailures += $MissionInfo->{TestFailures}; + } + else + { + $ExpectedFailures = undef; } } elsif ($LogName =~ /^testbot\./) @@ -854,24 +917,35 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($TaskInfo->{"$LogType.errors"} or $CheckTimeouts) + if ($MissionInfo->{"$LogType.errors"} or $CheckTimeouts) { - my $HasTimeout = CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + my $HasTimeout = CheckLogErrors($LogInfo, $MissionInfo->{"$LogType.errors"}, TaskKeyStr($Task) ."/$LogName", - $TaskInfo->{HasTimeout}); + $MissionInfo->{HasTimeout}); $TimeoutCount++ if ($HasTimeout); } - GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); + GrepTaskLog($Task, $LogName, $MissionInfo, "$LogType."); } if ($CheckTimeouts) { ok($TimeoutCount >= $ReportCount, "Expecting 1+ timeout per report: $TimeoutCount timeouts, $ReportCount reports"); } - if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) + if ($Task->Status eq "completed") { - # Scale the expected TestFailures count with the number of times the test - # was run, i.e. $ReportCount, or take it as is if no report is available. - is($Task->TestFailures, $TaskInfo->{TestFailures} * ($ReportCount || 1), "Check Failures of task ". TaskKeyStr($Task)); + if (defined $ExpectedFailures) + { + is($Task->TestFailures, $ExpectedFailures, "Check Failures of task ". TaskKeyStr($Task)); + } + elsif (CheckValue($TaskInfo->{TestFailures}) and !$ReportCount) + { + # Scale the expected TestFailures count with the number of times the test + # was run, i.e. $ReportCount, or take it as is if no report is available. + is($Task->TestFailures, $TaskInfo->{TestFailures}, "Check Failures of task ". TaskKeyStr($Task)); + } + # else there are reports for which we cannot check the TestFailures count. + # In particular this can happen if the test failure count can be checked + # for test=test but not for test=module. Then whether TestFailures can be + # checked or not depends on the missions mix. } return $NewFailures; } @@ -973,7 +1047,7 @@ sub CheckJobTree($;$) $CheckedJobs{$JobId} = 1; my ($HasTask, $HasNewFailures); - my $TestUnits = { wine => {} }; + my $TestUnits = {}; my $Email = $Emails{$JobId}; my %FailedVMs; @@ -1059,12 +1133,16 @@ sub CheckJobTree($;$) } next if ($TestUnits->{$Type}->{"*skipped*"}); - if (CheckValue($TypeInfo->{TestUnits})) + my @MissionTypes = $Type eq "wine" ? ("wine:test", "wine:module") : ($Type); + foreach my $MissionType (@MissionTypes) { - foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) + my $MissionInfo = $TestInfo->{$MissionType}; + next if (!CheckValue($MissionInfo->{TestUnits})); + + foreach my $TestUnit (split / +/, $MissionInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job $JobId") - or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); + ok($TestUnits->{$MissionType}->{$TestUnit}, "Check that $TestUnit was tested by $MissionType VMs for job $JobId") + or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$MissionType}})); } } } -- 2.20.1

1 0

[PATCH v3 1/3] windowscodecs: Use IWICImagingFactory_CreatePalette in write_source.
by Rémi Bernon 01 Feb '21

01 Feb '21

Instead of PaletteImpl_Create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Don't import palette.c anymore, use WINCODECS_CUSTOM_UNIXLIB define to guard custom encoders / decoders. Resending jxrlib integration later. Supersedes: 198861-198864 dlls/windowscodecs/wincodecs_common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c index 37ad7128f10..1b146908be9 100644 --- a/dlls/windowscodecs/wincodecs_common.c +++ b/dlls/windowscodecs/wincodecs_common.c @@ -121,9 +121,17 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (need_palette) { + IWICImagingFactory *factory; IWICPalette *palette; - hr = PaletteImpl_Create(&palette); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICImagingFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + IWICImagingFactory_Release(factory); + } + if (SUCCEEDED(hr)) { hr = IWICBitmapSource_CopyPalette(converted_source, palette); -- 2.30.0

3 7

[PATCH] gdiplus/metafile: Fix copy-paste typo when setting resolution (Coverity).
by Nikolay Sivov 01 Feb '21

01 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 3c2e8eb3aa2..d506d0dc8bf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -4078,7 +4078,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, * If clear, metafile was recorded with a DC for a printer */ (*metafile)->printer_display = !(header.EmfPlusFlags & (1u << 31)); (*metafile)->logical_dpix = header.LogicalDpiX; - (*metafile)->logical_dpix = header.LogicalDpiY; + (*metafile)->logical_dpiy = header.LogicalDpiY; list_init(&(*metafile)->containers); TRACE("<-- %p\n", *metafile); -- 2.30.0

1 0

[PATCH 1/5] include: Add IWMPVideoRenderConfig interface to wmprealestate.idl.
by Rémi Bernon 01 Feb '21

01 Feb '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/Makefile.in | 1 + include/wmprealestate.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 include/wmprealestate.idl diff --git a/include/Makefile.in b/include/Makefile.in index fc5ffbbc721..b03c2e8c602 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -797,6 +797,7 @@ SOURCES = \ wmiutils.idl \ wmp.idl \ wmpids.h \ + wmprealestate.idl \ wmsbuffer.idl \ wmsdk.h \ wmsdkidl.idl \ diff --git a/include/wmprealestate.idl b/include/wmprealestate.idl new file mode 100644 index 00000000000..cb9d6b417fb --- /dev/null +++ b/include/wmprealestate.idl @@ -0,0 +1,31 @@ +/* + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "mfidl.idl"; + +[ + odl, + uuid(6d6cf803-1ec0-4c8d-b3ca-f18e27282074), + oleautomation +] +interface IWMPVideoRenderConfig : IUnknown +{ + [propput] HRESULT presenterActivate([in] IMFActivate *activate); +} -- 2.30.0

1 4

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c
by Craig Schulstad 01 Feb '21

01 Feb '21

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

2 1

Wine staging 6.1 release
by Alistair Leslie-Hughes 31 Jan '21

31 Jan '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.1 (780 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers * winegstreamer: Correct mistaken enum value in ProcessMessage. * include: Add windows.media.speechsynthesis.idl draft. * widl: Support WinRT marshaling_behavior attribute parsing. * kernel32: Implement SetProcessDEPPolicy(). * kernel32: Implement GetSystemDEPPolicy(). * kernel32: Make system DEP policy affect GetProcessDEPPolicy(). Added: * [42695] Path of Exile fails - CoCreateInstance() called in uninitialized apartment. * [50546] xactengine3_7: Send Notification after the Wavebank is created. Updated: * mfplat-streaming-support * ntdll-NtAlertThreadByThreadId * msxml3-FreeThreadedXMLHTTP60 * dsound-EAX * widl-winrt-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] windowscodecs/tests: Fix an argument typo in ok().
by Ziqing Hui 31 Jan '21

31 Jan '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] gdiplus: Avoid negative integer overflow due to implicit type conversion.
by Haoyang Chen 31 Jan '21

31 Jan '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2e6c0d7c9c8..7b4794e3620 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -972,9 +972,9 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi { /* Tiling. Make sure co-ordinates are positive as it simplifies the math. */ if (x < 0) - x = width*2 + x % (width * 2); + x = width*2 + x % (INT)(width * 2); if (y < 0) - y = height*2 + y % (height * 2); + y = height*2 + y % (INT)(height * 2); if (attributes->wrap & WrapModeTileFlipX) { -- 2.20.1

2 1

[PATCH] po: Fix Dutch spelling errors
by Floris Renaud 30 Jan '21

30 Jan '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index c4012a6cb0b..27ef0b5aaba 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-01-26 12:00+0100\n" +"PO-Revision-Date: 2021-01-30 22:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "De volgende software kan automatisch verwijderd worden. Om een programma te " "verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de " -"lijst en druk op Wijzigen/Verwijderen." +"lijst en druk op Wijzigen of Verwijderen." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -7018,7 +7018,7 @@ msgstr "De sink is niet voltooid.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "Klok is gestopt.\n" +msgstr "Klok is gestopt\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7844,7 +7844,7 @@ msgstr "Dienst: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Bestand: [1], Map: [9], Grootte: [6]" +msgstr "Bestand: [1], Map: [9], Grootte: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" @@ -7860,7 +7860,7 @@ msgstr "Dienst: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "Bestand: [1], Afhankelijkheden: [2]" +msgstr "Bestand: [1], Afhankelijkheden: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" @@ -7872,7 +7872,7 @@ msgstr "Toepassingscontext:[1], Assemblynaam:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Bestand: [1], Map: [2], Grootte: [3]" +msgstr "Bestand: [1], Map: [2], Grootte: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" @@ -7924,7 +7924,7 @@ msgstr "Programma: [1], Opdrachtregel: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" +msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" @@ -9336,7 +9336,7 @@ msgstr "Ja op &alles" #: dlls/shell32/shell32.rc:319 msgid "About %s" -msgstr "Info %s" +msgstr "Over %s" #: dlls/shell32/shell32.rc:323 msgid "Wine &license" @@ -9794,6 +9794,7 @@ msgstr "" "binnen de voorwaarden van de GNU Lesser General Public License zoals " "gepubliceerd door de Free Software Foundation; versie 2.1 van de licentie, " "of (naar keuze) een latere versie.\n" +"\n" "Wine is gemaakt in de hoop dat het nuttig is, maar komt met GEEN ENKELE " "GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of " "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Lees de GNU Lesser General Public " @@ -12307,8 +12308,7 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE toont een bericht op het scherm waarin de gebruiker word gevraagd een\n" -"toets in te drukken.\n" +"PAUSE toont een bericht waarin wordt gevraagd een toets in te drukken.\n" "\n" "Dit is vooral handig in batchbestanden om de gebruiker in staat te stellen\n" "om de uitvoer van een voorafgaande opdracht te bekijken, voordat het van\n" @@ -15040,7 +15040,8 @@ msgid "" msgstr "" "Wine DLL Registratie Hulpprogramma\n" "\n" -"Biedt DLL-registratiediensten\n" +"Biedt DLL-registratiediensten.\n" +"\n" #: programs/regsvr32/regsvr32.rc:40 msgid "" @@ -16778,7 +16779,7 @@ msgstr "&Naam wijzigen..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "&Eigenschappent\tAlt+Enter" +msgstr "&Eigenschappen\tAlt+Enter" #: programs/winefile/winefile.rc:38 msgid "Cr&eate Directory..." -- 2.30.0

1 0

[PATCH 1/4] include: Fix the definition of NOTIFYICON_VERSION[_4].
by Zebediah Figura 30 Jan '21

30 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winemac.drv/systray.c | 2 +- dlls/winex11.drv/systray.c | 2 +- include/shellapi.h | 4 ++-- programs/explorer/systray.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 75bca5e3d51..90d2430869d 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -283,7 +283,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { wp = MAKEWPARAM(x, y); lp = MAKELPARAM(msg, icon->id); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 3be4bd65347..952bc1ef266 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -441,7 +441,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; diff --git a/include/shellapi.h b/include/shellapi.h index 0f10690f7e0..e02869f14e8 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -378,8 +378,8 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp #define NIM_SETFOCUS 0x00000003 #define NIM_SETVERSION 0x00000004 -#define NOTIFY_VERSION 3 /* supported by Windows 2000 and later */ -#define NOTIFY_VERSION_4 4 /* supported by Windows Vista */ +#define NOTIFYICON_VERSION 3 +#define NOTIFYICON_VERSION_4 4 /* callback message lParam values */ #define NIN_SELECT (WM_USER+0) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index dcd75f4e763..5f4fc60dbf3 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -723,7 +723,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { ClientToScreen( tray_window, &pt ); wp = MAKEWPARAM( pt.x, pt.y ); -- 2.30.0

1 3

[PATCH] uiautomationcore: Add stub UiaNodeFromFocus function.
by Vijay Kiran Kamuju 30 Jan '21

30 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] gdi32: Fail in ExtTextOut if count is -1.
by Gabriel Ivăncescu 30 Jan '21

30 Jan '21

Some applications pass this and crash when BIDI_Reorder can't allocate the memory. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 1 + dlls/gdi32/tests/font.c | 2 ++ dlls/gdi32/tests/metafile.c | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 74ca482..c0517f5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5932,6 +5932,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, static int quietfixme = 0; if (!dc) return FALSE; + if (count == -1) return FALSE; align = dc->textAlign; breakRem = dc->breakRem; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 461eecf..3e1f1e9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6916,6 +6916,8 @@ static void test_bitmap_font_glyph_index(void) hBmpPrev = SelectObject(hdc, hBmp[j]); switch (j) { case 0: + ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, -1, NULL); + ok(!ret, "ExtTextOutW succeeded\n"); ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, lstrlenW(text), NULL); break; case 1: diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8dae908..15af24a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -222,7 +222,13 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); - /* 4. test with unmatched BeginPath/EndPath calls */ + /* 4. pass -1 to length */ + SetLastError(0xdeadbeef); + ret = ExtTextOutA(hdcMetafile, 0, 0, 0, &rc, text, -1, NULL); + ok( !ret, "ExtTextOutA succeeded\n"); + ok( GetLastError() == 0xdeadbeef, "ExtTextOutA error %d\n", GetLastError()); + + /* 5. test with unmatched BeginPath/EndPath calls */ ret = BeginPath(hdcMetafile); ok( ret, "BeginPath error %d\n", GetLastError()); ret = BeginPath(hdcMetafile); -- 2.29.2

2 4

[PATCH 1/5] winegstreamer: Move the "bus" field of struct parser to a new "wg_parser" object.
by Zebediah Figura 30 Jan '21

30 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 70 ++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ea6808ec113..f2b015d99db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -46,6 +46,11 @@ GST_DEBUG_CATEGORY_STATIC(wine); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +struct wg_parser +{ + GstBus *bus; +}; + struct parser { struct strmbase_filter filter; @@ -60,6 +65,8 @@ struct parser LONGLONG filesize; + struct wg_parser *wg_parser; + /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -67,7 +74,6 @@ struct parser GstElement *container; GstPad *my_src, *their_sink; - GstBus *bus; guint64 start, nextofs, nextpullofs, stop; pthread_mutex_t mutex; @@ -1556,6 +1562,7 @@ static LONGLONG query_duration(GstPad *pad) static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) { + struct wg_parser *parser = This->wg_parser; unsigned int i; LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1570,13 +1577,14 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); - if (!This->bus) { - This->bus = gst_bus_new(); - gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); + if (!parser->bus) + { + parser->bus = gst_bus_new(); + gst_bus_set_sync_handler(parser->bus, watch_bus, This, NULL); } This->container = gst_bin_new(NULL); - gst_element_set_bus(This->container, This->bus); + gst_element_set_bus(This->container, parser->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); @@ -1639,6 +1647,17 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } +static void wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + free(parser); +} + static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1657,11 +1676,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - if (filter->bus) - { - gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); - gst_object_unref(filter->bus); - } + wg_parser_destroy(filter->wg_parser); pthread_cond_destroy(&filter->read_cond); pthread_cond_destroy(&filter->read_done_cond); @@ -1966,6 +1981,17 @@ static void parser_init_common(struct parser *object) object->flushing = true; } +static struct wg_parser *wg_parser_create(void) +{ + struct wg_parser *parser; + + if (!(parser = calloc(1, sizeof(*parser)))) + return NULL; + + TRACE("Created winegstreamer parser %p.\n", parser); + return parser; +} + HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) { struct parser *object; @@ -1978,6 +2004,12 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); @@ -2632,6 +2664,12 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); @@ -2745,6 +2783,12 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); @@ -2889,6 +2933,12 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); -- 2.30.0

1 4

[PATCH 1/4] widl: Support WinRT flags attribute parsing.
by Rémi Bernon 29 Jan '21

29 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6bbfed5e80b..450d92f5926 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -362,6 +362,7 @@ static const struct keyword attr_keywords[] = {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, + {"flags", tFLAGS, 1}, {"force_allocate", tFORCEALLOCATE, 0}, {"free", tFREE, 0}, {"handle", tHANDLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d12caa06b63..ef54bf13ded 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -201,6 +201,7 @@ static typelib_t *current_typelib; %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS +%token tFLAGS %token tFLOAT tFORCEALLOCATE %token tHANDLE %token tHANDLET @@ -576,6 +577,7 @@ attribute: { $$ = NULL; } $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } + | tFLAGS { $$ = make_attr(ATTR_FLAGS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_int_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } @@ -2259,6 +2261,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FLAGS */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "flags" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpcontext" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 46a44dac039..7b634c82242 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -106,6 +106,7 @@ enum attr_type ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, + ATTR_FLAGS, ATTR_FORCEALLOCATE, ATTR_HANDLE, ATTR_HELPCONTEXT, -- 2.30.0

3 9

[PATCH 1/4] d3d11/tests: Add more SwapDeviceContextState tests.
by Rémi Bernon 29 Jan '21

29 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This basically shows that the initial plan is a dead-end, and that I'll have to implement device context swap through wined3d_state swapping instead. So, just sending the tests for now. dlls/d3d11/tests/d3d11.c | 79 +++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7220be73ac7..20bf62b792e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6673,19 +6673,19 @@ static void test_device_context_state(void) 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - ID3DDeviceContextState *context_state, *previous_context_state; + ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; ID3D11SamplerState *sampler, *tmp_sampler; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D11ShaderResourceView *tmp_srv, *srv; D3D11_DEVICE_CONTEXT_TYPE context_type; - ID3D11DeviceContext1 *context = NULL; + ID3D11DeviceContext1 *context = NULL, *context2; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11GeometryShader *tmp_gs, *gs; - ID3D11VertexShader *tmp_vs, *vs; + ID3D11VertexShader *tmp_vs, *vs, *vs2; ID3D11PixelShader *tmp_ps, *ps; - ID3D11Device *d3d11_device; - ID3D11Device1 *device; + ID3D11Device *d3d11_device, *d3d11_device2; + ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *tmp_cb; ULONG refcount; @@ -6809,6 +6809,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext1_VSSetShaderResources(context, 0, 1, &srv); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); @@ -6820,11 +6822,15 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext1_PSSetShaderResources(context, 0, 1, &srv); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); + todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); + if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); ok(previous_context_state != NULL, "Failed to get previous context state\n"); + refcount = get_refcount(vs); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); @@ -6868,11 +6874,64 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSGetShaderResources(context, 0, 1, &tmp_srv); ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* updating the device context should also update the device context state */ + hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* context states may be used with other devices instances too */ + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = ID3D11VertexShader_Release(vs2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* ID3DDeviceContextState retains the previous state. */ -- 2.30.0

4 12

[PATCH] d2d1/tests: Remove superfluous cast to self
by Michael Stefaniuc 29 Jan '21

29 Jan '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e7df715dda..7c1ff9dc197 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -412,7 +412,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re ID3D11Resource_Release(src_resource); ID3D11Device_Release(device); - hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); + hr = ID3D11DeviceContext_Map(context, rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); ID3D11DeviceContext_Release(context); -- 2.26.2

2 1

[PATCH] ddraw: Remove superfluous cast to self
by Michael Stefaniuc 29 Jan '21

29 Jan '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3f1fe08c11e..4d24c22650e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3179,8 +3179,7 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock(); -- 2.26.2

3 2

[PATCH] wined3d: Implement global resource memory barriers.
by Zebediah Figura 29 Jan '21

29 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Used by "Atelier Lydie & Suelle ~The Alchemists and the Mysterious Paintings~". dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c68bb2e9b06..605dc130e0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5744,6 +5744,12 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; } + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "memoryBarrier();\n"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } + if (sync_flags) FIXME("Unhandled sync flags %#x.\n", sync_flags); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8843e6883fc..9052d217148 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1910,6 +1910,11 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3934f0d8e4..4fcfd2fb7c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -656,6 +656,7 @@ enum wined3d_shader_sync_flags { WINED3DSSF_THREAD_GROUP = 0x1, WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, + WINED3DSSF_GLOBAL_UAV = 0x8, }; enum wined3d_shader_uav_flags -- 2.29.2

2 1

[PATCH 1/2] include: Fix the definition of PNDIS_HANDLE.
by Zebediah Figura 29 Jan '21

29 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ddk/ndis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index 38eec8a7ac4..872b43b5824 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -25,7 +25,7 @@ typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; -typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; +typedef void *NDIS_HANDLE, **PNDIS_HANDLE, *PNDIS_PACKET_POOL; typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; -- 2.30.0

1 1

[PATCH v2 1/4] configure: Introduce new jxrlib dependency.
by Rémi Bernon 29 Jan '21

29 Jan '21

This library is the JPEG-XR / Windows Media Photo / HD Photo reference implementation from Microsoft, released under BSD 2-Clause license: https://archive.codeplex.com/?p=jxrlib It is available for most Linux distributions already, and is also an optional dependency for imagemagick, freeimage or calibre: * https://packages.debian.org/source/sid/jxrlib * https://rpmfind.net/linux/rpm2html/search.php?query=jxrlib * https://packages.ubuntu.com/source/xenial/jxrlib * https://www.archlinux.org/packages/community/x86_64/jxrlib/ Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Check for short reads in PATCH 3, and WARN in such case. Some jxrlib calls don't care about the returned value so ERR would be verbose. * Add an ERR message when jxrlib support isn't compiled in. Supersedes: 198075-198079 and 198035-198039 configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configure.ac b/configure.ac index 0f8b9f6c080..4f95a1325d4 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreame AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) +AC_ARG_WITH(jxrlib, AS_HELP_STRING([--without-jxrlib],[do not use JPEG-XR])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi]) @@ -1829,6 +1830,21 @@ fi WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg ${notice_platform}development files not found, JPEG won't be supported.]) +dnl **** Check for libjxrglue **** +if test "x$with_jxrlib" != "xno" +then + WINE_PACKAGE_FLAGS(JXRLIB,[jxrlib],,[${JXRLIB_CFLAGS:--I/usr/include/jxrlib}],, + [AC_CHECK_HEADERS([JXRGlue.h],,,[#define FAR]) + if test "$ac_cv_header_JXRGlue_h" = "yes" + then + WINE_CHECK_SONAME(jxrglue,PKImageDecode_Create_WMP,,[JXRLIB_CFLAGS=""],[$JXRLIB_LIBS]) + else + JXRLIB_CFLAGS="" + fi]) +fi +WINE_WARNING_WITH(jxrlib,[test "x$ac_cv_lib_soname_jxrglue" = "x"], + [jxrlib ${notice_platform}development files not found, JPEG-XR won't be supported.]) + dnl **** Check for libpng **** if test "x$with_png" != "xno" then -- 2.30.0

3 6

[PATCH vkd3d 1/2] vkd3d-compiler: Set default source type before handling --print-target-types.
by Matteo Bruni 29 Jan '21

29 Jan '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 94cce20..e98e713 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -480,14 +480,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } - if (options->print_target_types) - return true; - if (options->source_type == VKD3D_SHADER_SOURCE_NONE) options->source_type = options->preprocess_only ? VKD3D_SHADER_SOURCE_HLSL : VKD3D_SHADER_SOURCE_DXBC_TPF; if (options->target_type == VKD3D_SHADER_TARGET_NONE && !options->preprocess_only) options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + if (options->print_target_types) + return true; + if (!options->preprocess_only && !validate_target_type(options->source_type, options->target_type)) { fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", -- 2.26.2

3 5

[PATCH vkd3d v4] vkd3d-shader: Import the HLSL compiler from Wine.
by Zebediah Figura 29 Jan '21

29 Jan '21

This corresponds to Wine commit 9f9fec18799bf59df6211b7294f8d338caa7f4db. Note that for the moment, compilation messages have not been ported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: Default to "main" if the entry point is NULL. Makefile.am | 16 +- libs/vkd3d-shader/hlsl.c | 1672 ++++++++++++ libs/vkd3d-shader/hlsl.h | 644 +++++ libs/vkd3d-shader/hlsl.l | 288 +++ libs/vkd3d-shader/hlsl.y | 2961 ++++++++++++++++++++++ libs/vkd3d-shader/trace.c | 9 + libs/vkd3d-shader/vkd3d_shader_main.c | 13 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + 8 files changed, 5609 insertions(+), 3 deletions(-) create mode 100644 libs/vkd3d-shader/hlsl.c create mode 100644 libs/vkd3d-shader/hlsl.h create mode 100644 libs/vkd3d-shader/hlsl.l create mode 100644 libs/vkd3d-shader/hlsl.y diff --git a/Makefile.am b/Makefile.am index 27d933c9..96d6140d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,9 +126,22 @@ libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-sh @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< -BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h +libs/vkd3d-shader/hlsl.yy.c: $(srcdir)/libs/vkd3d-shader/hlsl.l + @$(MKDIR_P) libs/vkd3d-shader + $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< + +libs/vkd3d-shader/hlsl.tab.c libs/vkd3d-shader/hlsl.tab.h &: libs/vkd3d-shader/hlsl.y + @$(MKDIR_P) libs/vkd3d-shader + $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/hlsl.tab.c $< + +BUILT_SOURCES += \ + libs/vkd3d-shader/hlsl.tab.h \ + libs/vkd3d-shader/preproc.tab.h vkd3d_shader_yyfiles = \ + libs/vkd3d-shader/hlsl.tab.c \ + libs/vkd3d-shader/hlsl.tab.h \ + libs/vkd3d-shader/hlsl.yy.c \ libs/vkd3d-shader/preproc.tab.c \ libs/vkd3d-shader/preproc.tab.h \ libs/vkd3d-shader/preproc.yy.c @@ -146,6 +159,7 @@ libvkd3d_shader_la_SOURCES = \ include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ + libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c new file mode 100644 index 00000000..cd0d9cbc --- /dev/null +++ b/libs/vkd3d-shader/hlsl.c @@ -0,0 +1,1672 @@ +/* + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "hlsl.h" + +BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(decl->name, var->name)) + return FALSE; + } + if (local_var && scope->upper->upper == hlsl_ctx.globals) + { + /* Check whether the variable redefines a function parameter. */ + LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(decl->name, var->name)) + return FALSE; + } + } + + list_add_tail(&scope->vars, &decl->scope_entry); + return TRUE; +} + +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(name, var->name)) + return var; + } + if (!scope->upper) + return NULL; + return get_variable(scope->upper, name); +} + +void free_declaration(struct hlsl_ir_var *decl) +{ + vkd3d_free((void *)decl->name); + vkd3d_free((void *)decl->semantic); + vkd3d_free((void *)decl->reg_reservation); + vkd3d_free(decl); +} + +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->name = name; + type->type = type_class; + type->base_type = base_type; + type->dimx = dimx; + type->dimy = dimy; + if (type_class == HLSL_CLASS_MATRIX) + type->reg_size = is_row_major(type) ? dimy : dimx; + else + type->reg_size = 1; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) +{ + struct hlsl_type *type = new_hlsl_type(NULL, HLSL_CLASS_ARRAY, HLSL_TYPE_FLOAT, 1, 1); + + if (!type) + return NULL; + + type->modifiers = basic_type->modifiers; + type->e.array.elements_count = array_size; + type->e.array.type = basic_type; + type->reg_size = basic_type->reg_size * array_size; + type->dimx = basic_type->dimx; + type->dimy = basic_type->dimy; + return type; +} + +struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) +{ + struct rb_entry *entry = rb_get(&scope->types, name); + + if (entry) + return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); + + if (recursive && scope->upper) + return get_type(scope->upper, name, recursive); + return NULL; +} + +BOOL find_function(const char *name) +{ + return rb_get(&hlsl_ctx.functions, name) != NULL; +} + +unsigned int components_count_type(struct hlsl_type *type) +{ + struct hlsl_struct_field *field; + unsigned int count = 0; + + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + return type->dimx * type->dimy; + } + if (type->type == HLSL_CLASS_ARRAY) + { + return components_count_type(type->e.array.type) * type->e.array.elements_count; + } + if (type->type != HLSL_CLASS_STRUCT) + { + ERR("Unexpected data type %s.\n", debug_hlsl_type(type)); + return 0; + } + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + count += components_count_type(field->type); + } + return count; +} + +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) +{ + if (t1 == t2) + return TRUE; + + if (t1->type != t2->type) + return FALSE; + if (t1->base_type != t2->base_type) + return FALSE; + if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + return FALSE; + if ((t1->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + != (t2->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + return FALSE; + if (t1->dimx != t2->dimx) + return FALSE; + if (t1->dimy != t2->dimy) + return FALSE; + if (t1->type == HLSL_CLASS_STRUCT) + { + struct list *t1cur, *t2cur; + struct hlsl_struct_field *t1field, *t2field; + + t1cur = list_head(t1->e.elements); + t2cur = list_head(t2->e.elements); + while (t1cur && t2cur) + { + t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); + t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); + if (!compare_hlsl_types(t1field->type, t2field->type)) + return FALSE; + if (strcmp(t1field->name, t2field->name)) + return FALSE; + t1cur = list_next(t1->e.elements, t1cur); + t2cur = list_next(t2->e.elements, t2cur); + } + if (t1cur != t2cur) + return FALSE; + } + if (t1->type == HLSL_CLASS_ARRAY) + return t1->e.array.elements_count == t2->e.array.elements_count + && compare_hlsl_types(t1->e.array.type, t2->e.array.type); + + return TRUE; +} + +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) +{ + struct hlsl_struct_field *old_field, *field; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + + if (old->name) + { + type->name = vkd3d_strdup(old->name); + if (!type->name) + { + vkd3d_free(type); + return NULL; + } + } + type->type = old->type; + type->base_type = old->base_type; + type->dimx = old->dimx; + type->dimy = old->dimy; + type->modifiers = old->modifiers; + if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + type->modifiers |= default_majority; + type->sampler_dim = old->sampler_dim; + switch (old->type) + { + case HLSL_CLASS_ARRAY: + type->e.array.type = clone_hlsl_type(old->e.array.type, default_majority); + type->e.array.elements_count = old->e.array.elements_count; + type->reg_size = type->e.array.elements_count * type->e.array.type->reg_size; + break; + + case HLSL_CLASS_STRUCT: + { + unsigned int reg_size = 0; + + if (!(type->e.elements = vkd3d_malloc(sizeof(*type->e.elements)))) + { + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } + list_init(type->e.elements); + LIST_FOR_EACH_ENTRY(old_field, old->e.elements, struct hlsl_struct_field, entry) + { + if (!(field = vkd3d_calloc(1, sizeof(*field)))) + { + LIST_FOR_EACH_ENTRY_SAFE(field, old_field, type->e.elements, struct hlsl_struct_field, entry) + { + vkd3d_free((void *)field->semantic); + vkd3d_free((void *)field->name); + vkd3d_free(field); + } + vkd3d_free(type->e.elements); + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } + field->type = clone_hlsl_type(old_field->type, default_majority); + field->name = vkd3d_strdup(old_field->name); + if (old_field->semantic) + field->semantic = vkd3d_strdup(old_field->semantic); + field->modifiers = old_field->modifiers; + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + list_add_tail(type->e.elements, &field->entry); + } + type->reg_size = reg_size; + break; + } + + case HLSL_CLASS_MATRIX: + type->reg_size = is_row_major(type) ? type->dimy : type->dimx; + break; + + default: + type->reg_size = 1; + break; + } + + list_add_tail(&hlsl_ctx.types, &type->entry); + return type; +} + +static BOOL convertible_data_type(struct hlsl_type *type) +{ + return type->type != HLSL_CLASS_OBJECT; +} + +BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be cast to pretty much everything */ + if (t1->dimx == 1 && t1->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return t1->dimx >= t2->dimx; + } + + /* The other way around is true too i.e. whatever to scalar */ + if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_ARRAY) + { + if (compare_hlsl_types(t1->e.array.type, t2)) + /* e.g. float4[3] to float4 is allowed */ + return TRUE; + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + else + return components_count_type(t1) == components_count_type(t2); + } + + if (t1->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) == components_count_type(t2); + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (components_count_type(t1) >= components_count_type(t2)) + return TRUE; + return FALSE; +} + +static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be converted to any other numeric data type */ + if (t1->dimx == 1 && t1->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + /* The other way around is true too */ + if (t2->dimx == 1 && t2->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + } + + if (t1->type == HLSL_CLASS_ARRAY && t2->type == HLSL_CLASS_ARRAY) + { + return components_count_type(t1) == components_count_type(t2); + } + + if ((t1->type == HLSL_CLASS_ARRAY && t2->type <= HLSL_CLASS_LAST_NUMERIC) + || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) + { + /* e.g. float4[3] to float4 is allowed */ + if (t1->type == HLSL_CLASS_ARRAY && compare_hlsl_types(t1->e.array.type, t2)) + return TRUE; + if (components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type <= HLSL_CLASS_VECTOR && t2->type <= HLSL_CLASS_VECTOR) + { + if (t1->dimx >= t2->dimx) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX + && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) + return compare_hlsl_types(t1, t2); + + return FALSE; +} + +static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) + return FALSE; + + /* Scalar vars can be converted to pretty much everything */ + if ((t1->dimx == 1 && t1->dimy == 1) || (t2->dimx == 1 && t2->dimy == 1)) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return TRUE; + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + /* Matrix-vector conversion is apparently allowed if either they have the same components + count or the matrix is nx1 or 1xn */ + if (t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + { + if (components_count_type(t1) == components_count_type(t2)) + return TRUE; + + return (t1->type == HLSL_CLASS_MATRIX && (t1->dimx == 1 || t1->dimy == 1)) + || (t2->type == HLSL_CLASS_MATRIX && (t2->dimx == 1 || t2->dimy == 1)); + } + + /* Both matrices */ + if ((t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + || (t1->dimx <= t2->dimx && t1->dimy <= t2->dimy)) + return TRUE; + } + + return FALSE; +} + +static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) +{ + static const enum hlsl_base_type types[] = + { + HLSL_TYPE_BOOL, + HLSL_TYPE_INT, + HLSL_TYPE_UINT, + HLSL_TYPE_HALF, + HLSL_TYPE_FLOAT, + HLSL_TYPE_DOUBLE, + }; + int t1_idx = -1, t2_idx = -1, i; + + for (i = 0; i < ARRAY_SIZE(types); ++i) + { + /* Always convert away from HLSL_TYPE_HALF */ + if (t1 == types[i]) + t1_idx = t1 == HLSL_TYPE_HALF ? i + 1 : i; + if (t2 == types[i]) + t2_idx = t2 == HLSL_TYPE_HALF ? i + 1 : i; + + if (t1_idx != -1 && t2_idx != -1) + break; + } + if (t1_idx == -1 || t2_idx == -1) + { + FIXME("Unexpected base type.\n"); + return HLSL_TYPE_FLOAT; + } + return t1_idx >= t2_idx ? t1 : t2; +} + +static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type *t2, + struct source_location *loc) +{ + enum hlsl_type_class type; + enum hlsl_base_type base; + unsigned int dimx, dimy; + + if (t1->type > HLSL_CLASS_LAST_NUMERIC || t2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "non scalar/vector/matrix data type in expression"); + return NULL; + } + + if (compare_hlsl_types(t1, t2)) + return t1; + + if (!expr_compatible_data_types(t1, t2)) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "expression data types are incompatible"); + return NULL; + } + + if (t1->base_type == t2->base_type) + base = t1->base_type; + else + base = expr_common_base_type(t1->base_type, t2->base_type); + + if (t1->dimx == 1 && t1->dimy == 1) + { + type = t2->type; + dimx = t2->dimx; + dimy = t2->dimy; + } + else if (t2->dimx == 1 && t2->dimy == 1) + { + type = t1->type; + dimx = t1->dimx; + dimy = t1->dimy; + } + else if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX) + { + type = HLSL_CLASS_MATRIX; + dimx = min(t1->dimx, t2->dimx); + dimy = min(t1->dimy, t2->dimy); + } + else + { + /* Two vectors or a vector and a matrix (matrix must be 1xn or nx1) */ + unsigned int max_dim_1, max_dim_2; + + max_dim_1 = max(t1->dimx, t1->dimy); + max_dim_2 = max(t2->dimx, t2->dimy); + if (t1->dimx * t1->dimy == t2->dimx * t2->dimy) + { + type = HLSL_CLASS_VECTOR; + dimx = max(t1->dimx, t2->dimx); + dimy = 1; + } + else if (max_dim_1 <= max_dim_2) + { + type = t1->type; + if (type == HLSL_CLASS_VECTOR) + { + dimx = max_dim_1; + dimy = 1; + } + else + { + dimx = t1->dimx; + dimy = t1->dimy; + } + } + else + { + type = t2->type; + if (type == HLSL_CLASS_VECTOR) + { + dimx = max_dim_2; + dimy = 1; + } + else + { + dimx = t2->dimx; + dimy = t2->dimy; + } + } + } + + if (type == HLSL_CLASS_SCALAR) + return hlsl_ctx.builtin_types.scalar[base]; + if (type == HLSL_CLASS_VECTOR) + return hlsl_ctx.builtin_types.vector[base][dimx - 1]; + return new_hlsl_type(NULL, type, base, dimx, dimy); +} + +struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, + struct hlsl_type *dst_type, struct source_location *loc) +{ + struct hlsl_type *src_type = node->data_type; + struct hlsl_ir_expr *cast; + + if (compare_hlsl_types(src_type, dst_type)) + return node; + + if (!implicit_compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return NULL; + } + + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + hlsl_report_message(*loc, HLSL_LEVEL_WARNING, "implicit truncation of vector type"); + + TRACE("Implicit conversion from %s to %s.\n", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + + if (!(cast = new_cast(node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; +} + +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], + struct source_location *loc) +{ + struct hlsl_ir_expr *expr; + struct hlsl_type *type; + unsigned int i; + + type = operands[0]->data_type; + for (i = 1; i <= 2; ++i) + { + if (!operands[i]) + break; + type = expr_common_type(type, operands[i]->data_type, loc); + if (!type) + return NULL; + } + for (i = 0; i <= 2; ++i) + { + struct hlsl_ir_expr *cast; + + if (!operands[i]) + break; + if (compare_hlsl_types(operands[i]->data_type, type)) + continue; + TRACE("Implicitly converting %s into %s in an expression.\n", debug_hlsl_type(operands[i]->data_type), debug_hlsl_type(type)); + if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 + && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) + { + hlsl_report_message(operands[i]->loc, HLSL_LEVEL_WARNING, "implicit truncation of vector/matrix type"); + } + + if (!(cast = new_cast(operands[i], type, &operands[i]->loc))) + return NULL; + list_add_after(&operands[i]->entry, &cast->node.entry); + operands[i] = &cast->node; + } + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, type, *loc); + expr->op = op; + for (i = 0; i <= 2; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); + list_add_tail(instrs, &expr->node.entry); + + return expr; +} + +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) +{ + struct hlsl_ir_node *cast; + + cast = new_unary_expr(HLSL_IR_UNOP_CAST, node, *loc); + if (cast) + cast->data_type = type; + return expr_from_node(cast); +} + +static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) +{ + static const enum hlsl_ir_expr_op ops[] = + { + 0, + HLSL_IR_BINOP_ADD, + HLSL_IR_BINOP_SUB, + HLSL_IR_BINOP_MUL, + HLSL_IR_BINOP_DIV, + HLSL_IR_BINOP_MOD, + HLSL_IR_BINOP_LSHIFT, + HLSL_IR_BINOP_RSHIFT, + HLSL_IR_BINOP_BIT_AND, + HLSL_IR_BINOP_BIT_OR, + HLSL_IR_BINOP_BIT_XOR, + }; + + return ops[op]; +} + +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) +{ + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; + + /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ + for (i = 0; i < 4; ++i) + { + if (*writemask & (1 << i)) + { + unsigned int s = (*swizzle >> (i * 2)) & 3; + new_swizzle |= s << (bit++ * 2); + if (new_writemask & (1 << s)) + return FALSE; + new_writemask |= 1 << s; + } + } + width = bit; + + /* Invert the swizzle. */ + bit = 0; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < width; ++j) + { + unsigned int s = (new_swizzle >> (j * 2)) & 3; + if (s == i) + inverted |= j << (bit++ * 2); + } + } + + *swizzle = inverted; + *writemask = new_writemask; + *ret_width = width; + return TRUE; +} + +struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, + enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) +{ + struct hlsl_ir_assignment *assign; + struct hlsl_type *lhs_type; + DWORD writemask = 0; + + lhs_type = lhs->data_type; + if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + writemask = (1 << lhs_type->dimx) - 1; + + if (!(rhs = add_implicit_conversion(instrs, rhs, lhs_type, &rhs->loc))) + return NULL; + } + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + while (lhs->type != HLSL_IR_LOAD) + { + struct hlsl_ir_node *lhs_inner; + + if (lhs->type == HLSL_IR_EXPR && expr_from_node(lhs)->op == HLSL_IR_UNOP_CAST) + { + FIXME("Cast on the lhs.\n"); + vkd3d_free(assign); + return NULL; + } + else if (lhs->type == HLSL_IR_SWIZZLE) + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; + + if (lhs->data_type->type == HLSL_CLASS_MATRIX) + FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + + lhs_inner = swizzle->val.node; + hlsl_src_remove(&swizzle->val); + list_remove(&lhs->entry); + + list_add_after(&rhs->entry, &lhs->entry); + hlsl_src_from_node(&swizzle->val, rhs); + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); + vkd3d_free(assign); + return NULL; + } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + swizzle->node.data_type = hlsl_ctx.builtin_types.vector[swizzle_type->base_type][width - 1]; + rhs = &swizzle->node; + } + else + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); + vkd3d_free(assign); + return NULL; + } + + lhs = lhs_inner; + } + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); + assign->writemask = writemask; + assign->lhs.var = load_from_node(lhs)->src.var; + hlsl_src_from_node(&assign->lhs.offset, load_from_node(lhs)->src.offset.node); + if (assign_op != ASSIGN_OP_ASSIGN) + { + enum hlsl_ir_expr_op op = op_from_assignment(assign_op); + struct hlsl_ir_node *expr; + + TRACE("Adding an expression for the compound assignment.\n"); + expr = new_binary_expr(op, lhs, rhs); + list_add_after(&rhs->entry, &expr->entry); + rhs = expr; + } + hlsl_src_from_node(&assign->rhs, rhs); + list_add_tail(instrs, &assign->node.entry); + + return &assign->node; +} + +static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) +{ + const struct hlsl_type *type = RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); + const char *name = key; + + if (name == type->name) + return 0; + + if (!name || !type->name) + { + ERR("hlsl_type without a name in a scope?\n"); + return -1; + } + return strcmp(name, type->name); +} + +void push_scope(struct hlsl_parse_ctx *ctx) +{ + struct hlsl_scope *new_scope; + + if (!(new_scope = vkd3d_malloc(sizeof(*new_scope)))) + return; + TRACE("Pushing a new scope.\n"); + list_init(&new_scope->vars); + rb_init(&new_scope->types, compare_hlsl_types_rb); + new_scope->upper = ctx->cur_scope; + ctx->cur_scope = new_scope; + list_add_tail(&ctx->scopes, &new_scope->entry); +} + +BOOL pop_scope(struct hlsl_parse_ctx *ctx) +{ + struct hlsl_scope *prev_scope = ctx->cur_scope->upper; + + if (!prev_scope) + return FALSE; + TRACE("Popping current scope.\n"); + ctx->cur_scope = prev_scope; + return TRUE; +} + +static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) +{ + if (t1->type != t2->type) + { + if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR) + || (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_SCALAR))) + return t1->type - t2->type; + } + if (t1->base_type != t2->base_type) + return t1->base_type - t2->base_type; + if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + return t1->sampler_dim - t2->sampler_dim; + if (t1->dimx != t2->dimx) + return t1->dimx - t2->dimx; + if (t1->dimy != t2->dimy) + return t1->dimx - t2->dimx; + if (t1->type == HLSL_CLASS_STRUCT) + { + struct list *t1cur, *t2cur; + struct hlsl_struct_field *t1field, *t2field; + int r; + + t1cur = list_head(t1->e.elements); + t2cur = list_head(t2->e.elements); + while (t1cur && t2cur) + { + t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); + t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); + if ((r = compare_param_hlsl_types(t1field->type, t2field->type))) + return r; + if ((r = strcmp(t1field->name, t2field->name))) + return r; + t1cur = list_next(t1->e.elements, t1cur); + t2cur = list_next(t2->e.elements, t2cur); + } + if (t1cur != t2cur) + return t1cur ? 1 : -1; + return 0; + } + if (t1->type == HLSL_CLASS_ARRAY) + { + if (t1->e.array.elements_count != t2->e.array.elements_count) + return t1->e.array.elements_count - t2->e.array.elements_count; + return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type); + } + + return 0; +} + +static int compare_function_decl_rb(const void *key, const struct rb_entry *entry) +{ + const struct list *params = key; + const struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); + int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; + int params_count = params ? list_count(params) : 0; + struct list *p1cur, *p2cur; + int r; + + if (params_count != decl_params_count) + return params_count - decl_params_count; + + p1cur = params ? list_head(params) : NULL; + p2cur = decl->parameters ? list_head(decl->parameters) : NULL; + while (p1cur && p2cur) + { + struct hlsl_ir_var *p1, *p2; + p1 = LIST_ENTRY(p1cur, struct hlsl_ir_var, param_entry); + p2 = LIST_ENTRY(p2cur, struct hlsl_ir_var, param_entry); + if ((r = compare_param_hlsl_types(p1->data_type, p2->data_type))) + return r; + p1cur = list_next(params, p1cur); + p2cur = list_next(decl->parameters, p2cur); + } + return 0; +} + +static int compare_function_rb(const void *key, const struct rb_entry *entry) +{ + const char *name = key; + const struct hlsl_ir_function *func = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); + + return strcmp(name, func->name); +} + +void init_functions_tree(struct rb_tree *funcs) +{ + rb_init(&hlsl_ctx.functions, compare_function_rb); +} + +const char *debug_base_type(const struct hlsl_type *type) +{ + const char *name = "(unknown)"; + + switch (type->base_type) + { + case HLSL_TYPE_FLOAT: name = "float"; break; + case HLSL_TYPE_HALF: name = "half"; break; + case HLSL_TYPE_DOUBLE: name = "double"; break; + case HLSL_TYPE_INT: name = "int"; break; + case HLSL_TYPE_UINT: name = "uint"; break; + case HLSL_TYPE_BOOL: name = "bool"; break; + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; + case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; + case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; + case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; + case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; + } + break; + default: + FIXME("Unhandled case %u.\n", type->base_type); + } + return name; +} + +const char *debug_hlsl_type(const struct hlsl_type *type) +{ + const char *name; + + if (type->name) + return debugstr_a(type->name); + + if (type->type == HLSL_CLASS_STRUCT) + return "<anonymous struct>"; + + if (type->type == HLSL_CLASS_ARRAY) + { + name = debug_base_type(type->e.array.type); + return vkd3d_dbg_sprintf("%s[%u]", name, type->e.array.elements_count); + } + + name = debug_base_type(type); + + if (type->type == HLSL_CLASS_SCALAR) + return vkd3d_dbg_sprintf("%s", name); + if (type->type == HLSL_CLASS_VECTOR) + return vkd3d_dbg_sprintf("%s%u", name, type->dimx); + if (type->type == HLSL_CLASS_MATRIX) + return vkd3d_dbg_sprintf("%s%ux%u", name, type->dimx, type->dimy); + return "unexpected_type"; +} + +const char *debug_modifiers(DWORD modifiers) +{ + char string[110]; + + string[0] = 0; + if (modifiers & HLSL_STORAGE_EXTERN) + strcat(string, " extern"); /* 7 */ + if (modifiers & HLSL_STORAGE_NOINTERPOLATION) + strcat(string, " nointerpolation"); /* 16 */ + if (modifiers & HLSL_MODIFIER_PRECISE) + strcat(string, " precise"); /* 8 */ + if (modifiers & HLSL_STORAGE_SHARED) + strcat(string, " shared"); /* 7 */ + if (modifiers & HLSL_STORAGE_GROUPSHARED) + strcat(string, " groupshared"); /* 12 */ + if (modifiers & HLSL_STORAGE_STATIC) + strcat(string, " static"); /* 7 */ + if (modifiers & HLSL_STORAGE_UNIFORM) + strcat(string, " uniform"); /* 8 */ + if (modifiers & HLSL_STORAGE_VOLATILE) + strcat(string, " volatile"); /* 9 */ + if (modifiers & HLSL_MODIFIER_CONST) + strcat(string, " const"); /* 6 */ + if (modifiers & HLSL_MODIFIER_ROW_MAJOR) + strcat(string, " row_major"); /* 10 */ + if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + strcat(string, " column_major"); /* 13 */ + if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) + strcat(string, " inout"); /* 6 */ + else if (modifiers & HLSL_STORAGE_IN) + strcat(string, " in"); /* 3 */ + else if (modifiers & HLSL_STORAGE_OUT) + strcat(string, " out"); /* 4 */ + + return vkd3d_dbg_sprintf("%s", string[0] ? string + 1 : ""); +} + +const char *debug_node_type(enum hlsl_ir_node_type type) +{ + static const char * const names[] = + { + "HLSL_IR_ASSIGNMENT", + "HLSL_IR_CONSTANT", + "HLSL_IR_EXPR", + "HLSL_IR_IF", + "HLSL_IR_LOAD", + "HLSL_IR_LOOP", + "HLSL_IR_JUMP", + "HLSL_IR_SWIZZLE", + }; + + if (type >= ARRAY_SIZE(names)) + return "Unexpected node type"; + return names[type]; +} + +static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); + +static void debug_dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) + { + debug_dump_instr(buffer, instr); + vkd3d_string_buffer_printf(buffer, "\n"); + } +} + +static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) +{ + if (src->node->index) + vkd3d_string_buffer_printf(buffer, "@%u", src->node->index); + else + vkd3d_string_buffer_printf(buffer, "%p", src->node); +} + +static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) +{ + if (var->modifiers) + vkd3d_string_buffer_printf(buffer, "%s ", debug_modifiers(var->modifiers)); + vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(var->data_type), var->name); + if (var->semantic) + vkd3d_string_buffer_printf(buffer, " : %s", var->semantic); +} + +static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) +{ + if (deref->offset.node) + /* Print the variable's type for convenience. */ + vkd3d_string_buffer_printf(buffer, "(%s %s)", debug_hlsl_type(deref->var->data_type), deref->var->name); + else + vkd3d_string_buffer_printf(buffer, "%s", deref->var->name); + if (deref->offset.node) + { + vkd3d_string_buffer_printf(buffer, "["); + debug_dump_src(buffer, &deref->offset); + vkd3d_string_buffer_printf(buffer, "]"); + } +} + +static const char *debug_writemask(DWORD writemask) +{ + static const char components[] = {'x', 'y', 'z', 'w'}; + char string[5]; + unsigned int i = 0, pos = 0; + + assert(!(writemask & ~VKD3DSP_WRITEMASK_ALL)); + + while (writemask) + { + if (writemask & 1) + string[pos++] = components[i]; + writemask >>= 1; + i++; + } + string[pos] = '\0'; + return vkd3d_dbg_sprintf(".%s", string); +} + +static void debug_dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) +{ + vkd3d_string_buffer_printf(buffer, "= ("); + debug_dump_deref(buffer, &assign->lhs); + if (assign->writemask != VKD3DSP_WRITEMASK_ALL) + vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(assign->writemask)); + vkd3d_string_buffer_printf(buffer, " "); + debug_dump_src(buffer, &assign->rhs); + vkd3d_string_buffer_printf(buffer, ")"); +} + +static void debug_dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) +{ + struct hlsl_type *type = constant->node.data_type; + unsigned int x; + + if (type->dimx != 1) + vkd3d_string_buffer_printf(buffer, "{"); + for (x = 0; x < type->dimx; ++x) + { + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + vkd3d_string_buffer_printf(buffer, "%s ", constant->value.b[x] ? "true" : "false"); + break; + + case HLSL_TYPE_DOUBLE: + vkd3d_string_buffer_printf(buffer, "%.16e ", constant->value.d[x]); + break; + + case HLSL_TYPE_FLOAT: + vkd3d_string_buffer_printf(buffer, "%.8e ", constant->value.f[x]); + break; + + case HLSL_TYPE_INT: + vkd3d_string_buffer_printf(buffer, "%d ", constant->value.i[x]); + break; + + case HLSL_TYPE_UINT: + vkd3d_string_buffer_printf(buffer, "%u ", constant->value.u[x]); + break; + + default: + vkd3d_string_buffer_printf(buffer, "Constants of type %s not supported\n", debug_base_type(type)); + } + } + if (type->dimx != 1) + vkd3d_string_buffer_printf(buffer, "}"); +} + +static const char *debug_expr_op(const struct hlsl_ir_expr *expr) +{ + static const char * const op_names[] = + { + "~", + "!", + "-", + "abs", + "sign", + "rcp", + "rsq", + "sqrt", + "nrm", + "exp2", + "log2", + + "cast", + + "fract", + + "sin", + "cos", + "sin_reduced", + "cos_reduced", + + "dsx", + "dsy", + + "sat", + + "pre++", + "pre--", + "post++", + "post--", + + "+", + "-", + "*", + "/", + + "%", + + "<", + ">", + "<=", + ">=", + "==", + "!=", + + "&&", + "||", + + "<<", + ">>", + "&", + "|", + "^", + + "dot", + "crs", + "min", + "max", + + "pow", + + "lerp", + + ",", + }; + + if (expr->op == HLSL_IR_UNOP_CAST) + return debug_hlsl_type(expr->node.data_type); + + return op_names[expr->op]; +} + +/* Dumps the expression in a prefix "operator (operands)" form */ +static void debug_dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) +{ + unsigned int i; + + vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); + for (i = 0; i < 3 && expr->operands[i].node; ++i) + { + debug_dump_src(buffer, &expr->operands[i]); + vkd3d_string_buffer_printf(buffer, " "); + } + vkd3d_string_buffer_printf(buffer, ")"); +} + +static void debug_dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) +{ + vkd3d_string_buffer_printf(buffer, "if ("); + debug_dump_src(buffer, &if_node->condition); + vkd3d_string_buffer_printf(buffer, ")\n{\n"); + debug_dump_instr_list(buffer, &if_node->then_instrs); + vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); + debug_dump_instr_list(buffer, &if_node->else_instrs); + vkd3d_string_buffer_printf(buffer, "}\n"); +} + +static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) +{ + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + vkd3d_string_buffer_printf(buffer, "break"); + break; + + case HLSL_IR_JUMP_CONTINUE: + vkd3d_string_buffer_printf(buffer, "continue"); + break; + + case HLSL_IR_JUMP_DISCARD: + vkd3d_string_buffer_printf(buffer, "discard"); + break; + + case HLSL_IR_JUMP_RETURN: + vkd3d_string_buffer_printf(buffer, "return"); + break; + } +} + +static void debug_dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) +{ + vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); + debug_dump_instr_list(buffer, &loop->body); + vkd3d_string_buffer_printf(buffer, "}\n"); +} + +static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +{ + unsigned int i; + + debug_dump_src(buffer, &swizzle->val); + vkd3d_string_buffer_printf(buffer, "."); + if (swizzle->val.node->data_type->dimy > 1) + { + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + vkd3d_string_buffer_printf(buffer, "_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); + } + else + { + static const char c[] = {'x', 'y', 'z', 'w'}; + + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + vkd3d_string_buffer_printf(buffer, "%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + } +} + +static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) +{ + if (instr->index) + vkd3d_string_buffer_printf(buffer, "%4u: ", instr->index); + else + vkd3d_string_buffer_printf(buffer, "%p: ", instr); + + vkd3d_string_buffer_printf(buffer, "%10s | ", instr->data_type ? debug_hlsl_type(instr->data_type) : ""); + + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + debug_dump_ir_assignment(buffer, assignment_from_node(instr)); + break; + + case HLSL_IR_CONSTANT: + debug_dump_ir_constant(buffer, constant_from_node(instr)); + break; + + case HLSL_IR_EXPR: + debug_dump_ir_expr(buffer, expr_from_node(instr)); + break; + + case HLSL_IR_IF: + debug_dump_ir_if(buffer, if_from_node(instr)); + break; + + case HLSL_IR_JUMP: + debug_dump_ir_jump(buffer, jump_from_node(instr)); + break; + + case HLSL_IR_LOAD: + debug_dump_deref(buffer, &load_from_node(instr)->src); + break; + + case HLSL_IR_LOOP: + debug_dump_ir_loop(buffer, loop_from_node(instr)); + break; + + case HLSL_IR_SWIZZLE: + debug_dump_ir_swizzle(buffer, swizzle_from_node(instr)); + break; + + default: + vkd3d_string_buffer_printf(buffer, "<No dump function for %s>", debug_node_type(instr->type)); + } +} + +void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) +{ + struct vkd3d_string_buffer buffer; + struct hlsl_ir_var *param; + + vkd3d_string_buffer_init(&buffer); + vkd3d_string_buffer_printf(&buffer, "Dumping function %s.\n", func->func->name); + vkd3d_string_buffer_printf(&buffer, "Function parameters:\n"); + LIST_FOR_EACH_ENTRY(param, func->parameters, struct hlsl_ir_var, param_entry) + { + debug_dump_ir_var(&buffer, param); + vkd3d_string_buffer_printf(&buffer, "\n"); + } + if (func->semantic) + vkd3d_string_buffer_printf(&buffer, "Function semantic: %s\n", func->semantic); + if (func->body) + debug_dump_instr_list(&buffer, func->body); + + vkd3d_string_buffer_trace(&buffer); + vkd3d_string_buffer_cleanup(&buffer); +} + +void free_hlsl_type(struct hlsl_type *type) +{ + struct hlsl_struct_field *field, *next_field; + + vkd3d_free((void *)type->name); + if (type->type == HLSL_CLASS_STRUCT) + { + LIST_FOR_EACH_ENTRY_SAFE(field, next_field, type->e.elements, struct hlsl_struct_field, entry) + { + vkd3d_free((void *)field->name); + vkd3d_free((void *)field->semantic); + vkd3d_free(field); + } + } + vkd3d_free(type); +} + +void free_instr_list(struct list *list) +{ + struct hlsl_ir_node *node, *next_node; + + if (!list) + return; + /* Iterate in reverse, to avoid use-after-free when unlinking sources from + * the "uses" list. */ + LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) + free_instr(node); + vkd3d_free(list); +} + +static void free_ir_assignment(struct hlsl_ir_assignment *assignment) +{ + hlsl_src_remove(&assignment->rhs); + hlsl_src_remove(&assignment->lhs.offset); + vkd3d_free(assignment); +} + +static void free_ir_constant(struct hlsl_ir_constant *constant) +{ + vkd3d_free(constant); +} + +static void free_ir_expr(struct hlsl_ir_expr *expr) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + hlsl_src_remove(&expr->operands[i]); + vkd3d_free(expr); +} + +static void free_ir_if(struct hlsl_ir_if *if_node) +{ + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) + free_instr(node); + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) + free_instr(node); + hlsl_src_remove(&if_node->condition); + vkd3d_free(if_node); +} + +static void free_ir_jump(struct hlsl_ir_jump *jump) +{ + vkd3d_free(jump); +} + +static void free_ir_load(struct hlsl_ir_load *load) +{ + hlsl_src_remove(&load->src.offset); + vkd3d_free(load); +} + +static void free_ir_loop(struct hlsl_ir_loop *loop) +{ + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) + free_instr(node); + vkd3d_free(loop); +} + +static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) +{ + hlsl_src_remove(&swizzle->val); + vkd3d_free(swizzle); +} + +void free_instr(struct hlsl_ir_node *node) +{ + switch (node->type) + { + case HLSL_IR_ASSIGNMENT: + free_ir_assignment(assignment_from_node(node)); + break; + + case HLSL_IR_CONSTANT: + free_ir_constant(constant_from_node(node)); + break; + + case HLSL_IR_EXPR: + free_ir_expr(expr_from_node(node)); + break; + + case HLSL_IR_IF: + free_ir_if(if_from_node(node)); + break; + + case HLSL_IR_JUMP: + free_ir_jump(jump_from_node(node)); + break; + + case HLSL_IR_LOAD: + free_ir_load(load_from_node(node)); + break; + + case HLSL_IR_LOOP: + free_ir_loop(loop_from_node(node)); + break; + + case HLSL_IR_SWIZZLE: + free_ir_swizzle(swizzle_from_node(node)); + break; + + default: + FIXME("Unsupported node type %s.\n", debug_node_type(node->type)); + } +} + +static void free_function_decl(struct hlsl_ir_function_decl *decl) +{ + vkd3d_free((void *)decl->semantic); + vkd3d_free(decl->parameters); + free_instr_list(decl->body); + vkd3d_free(decl); +} + +static void free_function_decl_rb(struct rb_entry *entry, void *context) +{ + free_function_decl(RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry)); +} + +static void free_function(struct hlsl_ir_function *func) +{ + rb_destroy(&func->overloads, free_function_decl_rb, NULL); + vkd3d_free((void *)func->name); + vkd3d_free(func); +} + +void free_function_rb(struct rb_entry *entry, void *context) +{ + free_function(RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry)); +} + +void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, BOOL intrinsic) +{ + struct hlsl_ir_function *func; + struct rb_entry *func_entry, *old_entry; + + func_entry = rb_get(funcs, name); + if (func_entry) + { + func = RB_ENTRY_VALUE(func_entry, struct hlsl_ir_function, entry); + if (intrinsic != func->intrinsic) + { + if (intrinsic) + { + ERR("Redeclaring a user defined function as an intrinsic.\n"); + return; + } + TRACE("Function %s redeclared as a user defined function.\n", debugstr_a(name)); + func->intrinsic = intrinsic; + rb_destroy(&func->overloads, free_function_decl_rb, NULL); + rb_init(&func->overloads, compare_function_decl_rb); + } + decl->func = func; + if ((old_entry = rb_get(&func->overloads, decl->parameters))) + { + struct hlsl_ir_function_decl *old_decl = + RB_ENTRY_VALUE(old_entry, struct hlsl_ir_function_decl, entry); + + if (!decl->body) + { + free_function_decl(decl); + vkd3d_free(name); + return; + } + rb_remove(&func->overloads, old_entry); + free_function_decl(old_decl); + } + rb_put(&func->overloads, decl->parameters, &decl->entry); + vkd3d_free(name); + return; + } + func = vkd3d_malloc(sizeof(*func)); + func->name = name; + rb_init(&func->overloads, compare_function_decl_rb); + decl->func = func; + rb_put(&func->overloads, decl->parameters, &decl->entry); + func->intrinsic = intrinsic; + rb_put(funcs, func->name, &func->entry); +} + +struct hlsl_profile_info +{ + const char *name; + enum vkd3d_shader_type type; + DWORD sm_major; + DWORD sm_minor; + DWORD level_major; + DWORD level_minor; + BOOL sw; +}; + +static const struct hlsl_profile_info *get_target_info(const char *target) +{ + unsigned int i; + + static const struct hlsl_profile_info profiles[] = + { + {"cs_4_0", VKD3D_SHADER_TYPE_COMPUTE, 4, 0, 0, 0, FALSE}, + {"cs_4_1", VKD3D_SHADER_TYPE_COMPUTE, 4, 1, 0, 0, FALSE}, + {"cs_5_0", VKD3D_SHADER_TYPE_COMPUTE, 5, 0, 0, 0, FALSE}, + {"ds_5_0", VKD3D_SHADER_TYPE_DOMAIN, 5, 0, 0, 0, FALSE}, + {"fx_2_0", VKD3D_SHADER_TYPE_EFFECT, 2, 0, 0, 0, FALSE}, + {"fx_4_0", VKD3D_SHADER_TYPE_EFFECT, 4, 0, 0, 0, FALSE}, + {"fx_4_1", VKD3D_SHADER_TYPE_EFFECT, 4, 1, 0, 0, FALSE}, + {"fx_5_0", VKD3D_SHADER_TYPE_EFFECT, 5, 0, 0, 0, FALSE}, + {"gs_4_0", VKD3D_SHADER_TYPE_GEOMETRY, 4, 0, 0, 0, FALSE}, + {"gs_4_1", VKD3D_SHADER_TYPE_GEOMETRY, 4, 1, 0, 0, FALSE}, + {"gs_5_0", VKD3D_SHADER_TYPE_GEOMETRY, 5, 0, 0, 0, FALSE}, + {"hs_5_0", VKD3D_SHADER_TYPE_HULL, 5, 0, 0, 0, FALSE}, + {"ps.1.0", VKD3D_SHADER_TYPE_PIXEL, 1, 0, 0, 0, FALSE}, + {"ps.1.1", VKD3D_SHADER_TYPE_PIXEL, 1, 1, 0, 0, FALSE}, + {"ps.1.2", VKD3D_SHADER_TYPE_PIXEL, 1, 2, 0, 0, FALSE}, + {"ps.1.3", VKD3D_SHADER_TYPE_PIXEL, 1, 3, 0, 0, FALSE}, + {"ps.1.4", VKD3D_SHADER_TYPE_PIXEL, 1, 4, 0, 0, FALSE}, + {"ps.2.0", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, FALSE}, + {"ps.2.a", VKD3D_SHADER_TYPE_PIXEL, 2, 1, 0, 0, FALSE}, + {"ps.2.b", VKD3D_SHADER_TYPE_PIXEL, 2, 2, 0, 0, FALSE}, + {"ps.2.sw", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, TRUE}, + {"ps.3.0", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, FALSE}, + {"ps_1_0", VKD3D_SHADER_TYPE_PIXEL, 1, 0, 0, 0, FALSE}, + {"ps_1_1", VKD3D_SHADER_TYPE_PIXEL, 1, 1, 0, 0, FALSE}, + {"ps_1_2", VKD3D_SHADER_TYPE_PIXEL, 1, 2, 0, 0, FALSE}, + {"ps_1_3", VKD3D_SHADER_TYPE_PIXEL, 1, 3, 0, 0, FALSE}, + {"ps_1_4", VKD3D_SHADER_TYPE_PIXEL, 1, 4, 0, 0, FALSE}, + {"ps_2_0", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, FALSE}, + {"ps_2_a", VKD3D_SHADER_TYPE_PIXEL, 2, 1, 0, 0, FALSE}, + {"ps_2_b", VKD3D_SHADER_TYPE_PIXEL, 2, 2, 0, 0, FALSE}, + {"ps_2_sw", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, TRUE}, + {"ps_3_0", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, FALSE}, + {"ps_3_sw", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, TRUE}, + {"ps_4_0", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 0, 0, FALSE}, + {"ps_4_0_level_9_0", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 0, FALSE}, + {"ps_4_0_level_9_1", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 1, FALSE}, + {"ps_4_0_level_9_3", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 3, FALSE}, + {"ps_4_1", VKD3D_SHADER_TYPE_PIXEL, 4, 1, 0, 0, FALSE}, + {"ps_5_0", VKD3D_SHADER_TYPE_PIXEL, 5, 0, 0, 0, FALSE}, + {"tx_1_0", VKD3D_SHADER_TYPE_TEXTURE, 1, 0, 0, 0, FALSE}, + {"vs.1.0", VKD3D_SHADER_TYPE_VERTEX, 1, 0, 0, 0, FALSE}, + {"vs.1.1", VKD3D_SHADER_TYPE_VERTEX, 1, 1, 0, 0, FALSE}, + {"vs.2.0", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, FALSE}, + {"vs.2.a", VKD3D_SHADER_TYPE_VERTEX, 2, 1, 0, 0, FALSE}, + {"vs.2.sw", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, TRUE}, + {"vs.3.0", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, FALSE}, + {"vs.3.sw", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, TRUE}, + {"vs_1_0", VKD3D_SHADER_TYPE_VERTEX, 1, 0, 0, 0, FALSE}, + {"vs_1_1", VKD3D_SHADER_TYPE_VERTEX, 1, 1, 0, 0, FALSE}, + {"vs_2_0", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, FALSE}, + {"vs_2_a", VKD3D_SHADER_TYPE_VERTEX, 2, 1, 0, 0, FALSE}, + {"vs_2_sw", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, TRUE}, + {"vs_3_0", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, FALSE}, + {"vs_3_sw", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, TRUE}, + {"vs_4_0", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 0, 0, FALSE}, + {"vs_4_0_level_9_0", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 0, FALSE}, + {"vs_4_0_level_9_1", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 1, FALSE}, + {"vs_4_0_level_9_3", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 3, FALSE}, + {"vs_4_1", VKD3D_SHADER_TYPE_VERTEX, 4, 1, 0, 0, FALSE}, + {"vs_5_0", VKD3D_SHADER_TYPE_VERTEX, 5, 0, 0, 0, FALSE}, + }; + + for (i = 0; i < ARRAY_SIZE(profiles); ++i) + { + if (!strcmp(target, profiles[i].name)) + return &profiles[i]; + } + + return NULL; +} + +int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + const struct hlsl_profile_info *profile; + + if (!(hlsl_source_info = vkd3d_find_struct(compile_info->next, HLSL_SOURCE_INFO))) + { + ERR("No HLSL source info given.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (!(profile = get_target_info(hlsl_source_info->profile))) + { + FIXME("Unknown compilation target %s.\n", debugstr_a(hlsl_source_info->profile)); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + vkd3d_shader_dump_shader(profile->type, &compile_info->source); + + return hlsl_lexer_compile(text, profile->type, profile->sm_major, profile->sm_minor, + hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main", dxbc, message_context); +} diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h new file mode 100644 index 00000000..128de1d6 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.h @@ -0,0 +1,644 @@ +/* + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_SHADER_HLSL_H +#define __VKD3D_SHADER_HLSL_H + +#include "vkd3d_shader_private.h" +#include "rbtree.h" + +enum parse_status +{ + PARSE_SUCCESS = 0, + PARSE_WARN = 1, + PARSE_ERR = 2 +}; + +/* The general IR structure is inspired by Mesa GLSL hir, even though the code + * ends up being quite different in practice. Anyway, here comes the relevant + * licensing information. + * + * Copyright © 2010 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#define HLSL_SWIZZLE_X (0u) +#define HLSL_SWIZZLE_Y (1u) +#define HLSL_SWIZZLE_Z (2u) +#define HLSL_SWIZZLE_W (3u) + +#define HLSL_SWIZZLE(x, y, z, w) \ + (((HLSL_SWIZZLE_ ## x) << 0) \ + | ((HLSL_SWIZZLE_ ## y) << 2) \ + | ((HLSL_SWIZZLE_ ## z) << 4) \ + | ((HLSL_SWIZZLE_ ## w) << 6)) + +enum hlsl_type_class +{ + HLSL_CLASS_SCALAR, + HLSL_CLASS_VECTOR, + HLSL_CLASS_MATRIX, + HLSL_CLASS_LAST_NUMERIC = HLSL_CLASS_MATRIX, + HLSL_CLASS_STRUCT, + HLSL_CLASS_ARRAY, + HLSL_CLASS_OBJECT, +}; + +enum hlsl_base_type +{ + HLSL_TYPE_FLOAT, + HLSL_TYPE_HALF, + HLSL_TYPE_DOUBLE, + HLSL_TYPE_INT, + HLSL_TYPE_UINT, + HLSL_TYPE_BOOL, + HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, + HLSL_TYPE_SAMPLER, + HLSL_TYPE_TEXTURE, + HLSL_TYPE_PIXELSHADER, + HLSL_TYPE_VERTEXSHADER, + HLSL_TYPE_STRING, + HLSL_TYPE_VOID, +}; + +enum hlsl_sampler_dim +{ + HLSL_SAMPLER_DIM_GENERIC, + HLSL_SAMPLER_DIM_1D, + HLSL_SAMPLER_DIM_2D, + HLSL_SAMPLER_DIM_3D, + HLSL_SAMPLER_DIM_CUBE, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE +}; + +enum hlsl_matrix_majority +{ + HLSL_COLUMN_MAJOR, + HLSL_ROW_MAJOR +}; + +struct hlsl_type +{ + struct list entry; + struct rb_entry scope_entry; + enum hlsl_type_class type; + enum hlsl_base_type base_type; + enum hlsl_sampler_dim sampler_dim; + const char *name; + unsigned int modifiers; + unsigned int dimx; + unsigned int dimy; + unsigned int reg_size; + union + { + struct list *elements; + struct + { + struct hlsl_type *type; + unsigned int elements_count; + } array; + } e; +}; + +struct hlsl_struct_field +{ + struct list entry; + struct hlsl_type *type; + const char *name; + const char *semantic; + DWORD modifiers; + unsigned int reg_offset; +}; + +struct source_location +{ + const char *file; + unsigned int line; + unsigned int col; +}; + +enum hlsl_ir_node_type +{ + HLSL_IR_ASSIGNMENT = 0, + HLSL_IR_CONSTANT, + HLSL_IR_EXPR, + HLSL_IR_IF, + HLSL_IR_LOAD, + HLSL_IR_LOOP, + HLSL_IR_JUMP, + HLSL_IR_SWIZZLE, +}; + +struct hlsl_ir_node +{ + struct list entry; + enum hlsl_ir_node_type type; + struct hlsl_type *data_type; + + struct list uses; + + struct source_location loc; + + /* Liveness ranges. "index" is the index of this instruction. Since this is + * essentially an SSA value, the earliest live point is the index. This is + * true even for loops, since currently we can't have a reference to a + * value generated in an earlier iteration of the loop. */ + unsigned int index, last_read; +}; + +struct hlsl_src +{ + struct hlsl_ir_node *node; + struct list entry; +}; + +#define HLSL_STORAGE_EXTERN 0x00000001 +#define HLSL_STORAGE_NOINTERPOLATION 0x00000002 +#define HLSL_MODIFIER_PRECISE 0x00000004 +#define HLSL_STORAGE_SHARED 0x00000008 +#define HLSL_STORAGE_GROUPSHARED 0x00000010 +#define HLSL_STORAGE_STATIC 0x00000020 +#define HLSL_STORAGE_UNIFORM 0x00000040 +#define HLSL_STORAGE_VOLATILE 0x00000080 +#define HLSL_MODIFIER_CONST 0x00000100 +#define HLSL_MODIFIER_ROW_MAJOR 0x00000200 +#define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 +#define HLSL_STORAGE_IN 0x00000800 +#define HLSL_STORAGE_OUT 0x00001000 + +#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ + HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ + HLSL_MODIFIER_COLUMN_MAJOR) + +#define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + +struct reg_reservation +{ + enum vkd3d_shader_register_type type; + DWORD regnum; +}; + +struct hlsl_ir_var +{ + struct hlsl_type *data_type; + struct source_location loc; + const char *name; + const char *semantic; + unsigned int modifiers; + const struct reg_reservation *reg_reservation; + struct list scope_entry, param_entry; + + unsigned int first_write, last_read; +}; + +struct hlsl_ir_function +{ + struct rb_entry entry; + const char *name; + struct rb_tree overloads; + BOOL intrinsic; +}; + +struct hlsl_ir_function_decl +{ + struct hlsl_type *return_type; + struct hlsl_ir_var *return_var; + struct source_location loc; + struct rb_entry entry; + struct hlsl_ir_function *func; + const char *semantic; + struct list *parameters; + struct list *body; +}; + +struct hlsl_ir_if +{ + struct hlsl_ir_node node; + struct hlsl_src condition; + struct list then_instrs; + struct list else_instrs; +}; + +struct hlsl_ir_loop +{ + struct hlsl_ir_node node; + /* loop condition is stored in the body (as "if (!condition) break;") */ + struct list body; + unsigned int next_index; /* liveness index of the end of the loop */ +}; + +enum hlsl_ir_expr_op +{ + HLSL_IR_UNOP_BIT_NOT = 0, + HLSL_IR_UNOP_LOGIC_NOT, + HLSL_IR_UNOP_NEG, + HLSL_IR_UNOP_ABS, + HLSL_IR_UNOP_SIGN, + HLSL_IR_UNOP_RCP, + HLSL_IR_UNOP_RSQ, + HLSL_IR_UNOP_SQRT, + HLSL_IR_UNOP_NRM, + HLSL_IR_UNOP_EXP2, + HLSL_IR_UNOP_LOG2, + + HLSL_IR_UNOP_CAST, + + HLSL_IR_UNOP_FRACT, + + HLSL_IR_UNOP_SIN, + HLSL_IR_UNOP_COS, + HLSL_IR_UNOP_SIN_REDUCED, /* Reduced range [-pi, pi] */ + HLSL_IR_UNOP_COS_REDUCED, /* Reduced range [-pi, pi] */ + + HLSL_IR_UNOP_DSX, + HLSL_IR_UNOP_DSY, + + HLSL_IR_UNOP_SAT, + + HLSL_IR_UNOP_PREINC, + HLSL_IR_UNOP_PREDEC, + HLSL_IR_UNOP_POSTINC, + HLSL_IR_UNOP_POSTDEC, + + HLSL_IR_BINOP_ADD, + HLSL_IR_BINOP_SUB, + HLSL_IR_BINOP_MUL, + HLSL_IR_BINOP_DIV, + + HLSL_IR_BINOP_MOD, + + HLSL_IR_BINOP_LESS, + HLSL_IR_BINOP_GREATER, + HLSL_IR_BINOP_LEQUAL, + HLSL_IR_BINOP_GEQUAL, + HLSL_IR_BINOP_EQUAL, + HLSL_IR_BINOP_NEQUAL, + + HLSL_IR_BINOP_LOGIC_AND, + HLSL_IR_BINOP_LOGIC_OR, + + HLSL_IR_BINOP_LSHIFT, + HLSL_IR_BINOP_RSHIFT, + HLSL_IR_BINOP_BIT_AND, + HLSL_IR_BINOP_BIT_OR, + HLSL_IR_BINOP_BIT_XOR, + + HLSL_IR_BINOP_DOT, + HLSL_IR_BINOP_CRS, + HLSL_IR_BINOP_MIN, + HLSL_IR_BINOP_MAX, + + HLSL_IR_BINOP_POW, + + HLSL_IR_TEROP_LERP, + + HLSL_IR_SEQUENCE, +}; + +struct hlsl_ir_expr +{ + struct hlsl_ir_node node; + enum hlsl_ir_expr_op op; + struct hlsl_src operands[3]; +}; + +enum hlsl_ir_jump_type +{ + HLSL_IR_JUMP_BREAK, + HLSL_IR_JUMP_CONTINUE, + HLSL_IR_JUMP_DISCARD, + HLSL_IR_JUMP_RETURN, +}; + +struct hlsl_ir_jump +{ + struct hlsl_ir_node node; + enum hlsl_ir_jump_type type; +}; + +struct hlsl_ir_swizzle +{ + struct hlsl_ir_node node; + struct hlsl_src val; + DWORD swizzle; +}; + +struct hlsl_deref +{ + struct hlsl_ir_var *var; + struct hlsl_src offset; +}; + +struct hlsl_ir_load +{ + struct hlsl_ir_node node; + struct hlsl_deref src; +}; + +struct hlsl_ir_assignment +{ + struct hlsl_ir_node node; + struct hlsl_deref lhs; + struct hlsl_src rhs; + unsigned char writemask; +}; + +struct hlsl_ir_constant +{ + struct hlsl_ir_node node; + union + { + unsigned u[4]; + int i[4]; + float f[4]; + double d[4]; + BOOL b[4]; + } value; +}; + +struct hlsl_scope +{ + struct list entry; + struct list vars; + struct rb_tree types; + struct hlsl_scope *upper; +}; + +/* Structures used only during parsing */ +struct parse_parameter +{ + struct hlsl_type *type; + const char *name; + const char *semantic; + const struct reg_reservation *reg_reservation; + unsigned int modifiers; +}; + +struct parse_colon_attribute +{ + const char *semantic; + struct reg_reservation *reg_reservation; +}; + +struct parse_initializer +{ + struct hlsl_ir_node **args; + unsigned int args_count; + struct list *instrs; +}; + +struct parse_variable_def +{ + struct list entry; + struct source_location loc; + + char *name; + unsigned int array_size; + const char *semantic; + struct reg_reservation *reg_reservation; + struct parse_initializer initializer; +}; + +struct parse_function +{ + char *name; + struct hlsl_ir_function_decl *decl; +}; + +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + +enum parse_unary_op +{ + UNARY_OP_PLUS, + UNARY_OP_MINUS, + UNARY_OP_LOGICNOT, + UNARY_OP_BITNOT, +}; + +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + +struct hlsl_parse_ctx +{ + const char **source_files; + unsigned int source_files_count; + const char *source_file; + unsigned int line_no; + unsigned int column; + enum parse_status status; + struct vkd3d_shader_message_context *message_context; + + struct hlsl_scope *cur_scope; + struct hlsl_scope *globals; + struct list scopes; + + struct list types; + struct rb_tree functions; + const struct hlsl_ir_function_decl *cur_function; + + enum hlsl_matrix_majority matrix_majority; + + struct + { + struct hlsl_type *scalar[HLSL_TYPE_LAST_SCALAR + 1]; + struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; + struct hlsl_type *Void; + } builtin_types; + + struct list static_initializers; +}; + +extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; + +enum hlsl_error_level +{ + HLSL_LEVEL_ERROR = 0, + HLSL_LEVEL_WARNING, + HLSL_LEVEL_NOTE, +}; + +void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(3,4) DECLSPEC_HIDDEN; + +static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_ASSIGNMENT); + return CONTAINING_RECORD(node, struct hlsl_ir_assignment, node); +} + +static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_CONSTANT); + return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); +} + +static inline struct hlsl_ir_expr *expr_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_EXPR); + return CONTAINING_RECORD(node, struct hlsl_ir_expr, node); +} + +static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_IF); + return CONTAINING_RECORD(node, struct hlsl_ir_if, node); +} + +static inline struct hlsl_ir_jump *jump_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_JUMP); + return CONTAINING_RECORD(node, struct hlsl_ir_jump, node); +} + +static inline struct hlsl_ir_load *load_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOAD); + return CONTAINING_RECORD(node, struct hlsl_ir_load, node); +} + +static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOOP); + return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); +} + +static inline struct hlsl_ir_swizzle *swizzle_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_SWIZZLE); + return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); +} + +static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, + struct hlsl_type *data_type, struct source_location loc) +{ + memset(node, 0, sizeof(*node)); + node->type = type; + node->data_type = data_type; + node->loc = loc; + list_init(&node->uses); +} + +static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) +{ + src->node = node; + if (node) + list_add_tail(&node->uses, &src->entry); +} + +static inline void hlsl_src_remove(struct hlsl_src *src) +{ + if (src->node) + list_remove(&src->entry); + src->node = NULL; +} + +static inline void set_parse_status(enum parse_status *current, enum parse_status update) +{ + if (update == PARSE_ERR) + *current = PARSE_ERR; + else if (update == PARSE_WARN && *current == PARSE_SUCCESS) + *current = PARSE_WARN; +} + +struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, + enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; + +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, + struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, + struct source_location loc) DECLSPEC_HIDDEN; + +BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; +void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; +struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; +BOOL is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL find_function(const char *name) DECLSPEC_HIDDEN; +unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; +BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; +void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; +BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; +void init_functions_tree(struct rb_tree *funcs) DECLSPEC_HIDDEN; +void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, + BOOL intrinsic) DECLSPEC_HIDDEN; + +int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; +int hlsl_parser_compile(enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + +const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; +const char *debug_node_type(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; +void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; + +void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +void free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; +void free_instr_list(struct list *list) DECLSPEC_HIDDEN; +void free_function_rb(struct rb_entry *entry, void *context) DECLSPEC_HIDDEN; + +#endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l new file mode 100644 index 00000000..0bb1ee88 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.l @@ -0,0 +1,288 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni 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 + */ + +%{ +#define YY_NO_UNISTD_H +#include "hlsl.h" +#include "hlsl.tab.h" + +#define YY_USER_ACTION \ + do { \ + hlsl_lloc.first_column = hlsl_ctx.column; \ + hlsl_lloc.first_line = hlsl_ctx.line_no; \ + hlsl_ctx.column += yyleng; \ + } while(0); + +%} + +%option prefix="hlsl_" +%option never-interactive +%option noinput +%option nounput +%option noyywrap + +%x pp pp_line pp_pragma pp_ignore + +RESERVED1 auto|case|catch|char|class|const_cast|default|delete|dynamic_cast|enum +RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public +RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try +RESERVED4 typename|union|unsigned|using|virtual + +WS [ \t] +NEWLINE (\n)|(\r\n) +DOUBLESLASHCOMMENT "//"[^\n]* +STRING \"[^\"]*\" +IDENTIFIER [A-Za-z_][A-Za-z0-9_]* + +ANY (.) + +%% +{RESERVED1} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED2} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED3} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED4} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + +BlendState {return KW_BLENDSTATE; } +break {return KW_BREAK; } +Buffer {return KW_BUFFER; } +cbuffer {return KW_CBUFFER; } +compile {return KW_COMPILE; } +const {return KW_CONST; } +continue {return KW_CONTINUE; } +DepthStencilState {return KW_DEPTHSTENCILSTATE; } +DepthStencilView {return KW_DEPTHSTENCILVIEW; } +discard {return KW_DISCARD; } +do {return KW_DO; } +double {return KW_DOUBLE; } +else {return KW_ELSE; } +extern {return KW_EXTERN; } +false {return KW_FALSE; } +for {return KW_FOR; } +GeometryShader {return KW_GEOMETRYSHADER; } +groupshared {return KW_GROUPSHARED; } +if {return KW_IF; } +in {return KW_IN; } +inline {return KW_INLINE; } +inout {return KW_INOUT; } +matrix {return KW_MATRIX; } +namespace {return KW_NAMESPACE; } +nointerpolation {return KW_NOINTERPOLATION; } +out {return KW_OUT; } +pass {return KW_PASS; } +PixelShader {return KW_PIXELSHADER; } +precise {return KW_PRECISE; } +RasterizerState {return KW_RASTERIZERSTATE; } +RenderTargetView {return KW_RENDERTARGETVIEW; } +return {return KW_RETURN; } +register {return KW_REGISTER; } +sampler {return KW_SAMPLER; } +sampler1D {return KW_SAMPLER1D; } +sampler2D {return KW_SAMPLER2D; } +sampler3D {return KW_SAMPLER3D; } +samplerCUBE {return KW_SAMPLERCUBE; } +sampler_state {return KW_SAMPLER_STATE; } +SamplerComparisonState {return KW_SAMPLERCOMPARISONSTATE;} +shared {return KW_SHARED; } +stateblock {return KW_STATEBLOCK; } +stateblock_state {return KW_STATEBLOCK_STATE; } +static {return KW_STATIC; } +string {return KW_STRING; } +struct {return KW_STRUCT; } +switch {return KW_SWITCH; } +tbuffer {return KW_TBUFFER; } +technique {return KW_TECHNIQUE; } +technique10 {return KW_TECHNIQUE10; } +texture {return KW_TEXTURE; } +texture1D {return KW_TEXTURE1D; } +Texture1DArray {return KW_TEXTURE1DARRAY; } +texture2D {return KW_TEXTURE2D; } +Texture2DArray {return KW_TEXTURE2DARRAY; } +Texture2DMS {return KW_TEXTURE2DMS; } +Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } +texture3D {return KW_TEXTURE3D; } +Texture3DArray {return KW_TEXTURE3DARRAY; } +textureCUBE {return KW_TEXTURECUBE; } +true {return KW_TRUE; } +typedef {return KW_TYPEDEF; } +uniform {return KW_UNIFORM; } +vector {return KW_VECTOR; } +VertexShader {return KW_VERTEXSHADER; } +void {return KW_VOID; } +volatile {return KW_VOLATILE; } +while {return KW_WHILE; } + +\+\+ {return OP_INC; } +\-\- {return OP_DEC; } +&& {return OP_AND; } +\|\| {return OP_OR; } +== {return OP_EQ; } +\<\< {return OP_LEFTSHIFT; } +\<\<= {return OP_LEFTSHIFTASSIGN; } +\>\> {return OP_RIGHTSHIFT; } +\>\>= {return OP_RIGHTSHIFTASSIGN; } +\.\.\. {return OP_ELLIPSIS; } +\<= {return OP_LE; } +\>= {return OP_GE; } +!= {return OP_NE; } +\+= {return OP_ADDASSIGN; } +\-= {return OP_SUBASSIGN; } +\*= {return OP_MULASSIGN; } +\/= {return OP_DIVASSIGN; } +%= {return OP_MODASSIGN; } +&= {return OP_ANDASSIGN; } +\|= {return OP_ORASSIGN; } +^= {return OP_XORASSIGN; } +## {return OP_UNKNOWN1; } +#@ {return OP_UNKNOWN2; } +:: {return OP_UNKNOWN3; } +\-\> {return OP_UNKNOWN4; } + +column_major {return KW_COLUMN_MAJOR; } +row_major {return KW_ROW_MAJOR; } + +{IDENTIFIER} { + hlsl_lval.name = vkd3d_strdup(yytext); + if (get_variable(hlsl_ctx.cur_scope, yytext) + || find_function(yytext)) + return VAR_IDENTIFIER; + else if (get_type(hlsl_ctx.cur_scope, yytext, TRUE)) + return TYPE_IDENTIFIER; + else + return NEW_IDENTIFIER; + } + +[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +0x[0-9a-fA-F]+ { + sscanf(yytext, "0x%x", &hlsl_lval.intval); + return C_INTEGER; + } +0[0-7]+ { + sscanf(yytext, "0%o", &hlsl_lval.intval); + return C_INTEGER; + } +[0-9]+ { + hlsl_lval.intval = (atoi(yytext)); + return C_INTEGER; + } + +{DOUBLESLASHCOMMENT} {} + +{WS}+ {} +{NEWLINE} { + hlsl_ctx.line_no++; + hlsl_ctx.column = 1; + } + +^# { + BEGIN(pp); + } + +<pp>pragma{WS}+ { + TRACE("Got a #pragma.\n"); + BEGIN(pp_pragma); + } +<pp_pragma>pack_matrix{WS}*${WS}*row_major{WS}*$ { + TRACE("#pragma setting row_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; + BEGIN(pp_ignore); + } +<pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { + TRACE("#pragma setting column_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + BEGIN(pp_ignore); + } +<pp_pragma>{NEWLINE} { + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); + BEGIN(INITIAL); + } +<pp_pragma>{ANY} {} +<pp>[0-9]+ { + TRACE("Preprocessor line info.\n"); + BEGIN(pp_line); + hlsl_lval.intval = (atoi(yytext)); + return PRE_LINE; + } +<pp_line>{STRING} { + char *string = vkd3d_strdup(yytext + 1); + + BEGIN(pp_ignore); + string[strlen(string) - 1] = 0; + hlsl_lval.name = string; + return STRING; + } +<pp_line>{WS}+ {} +<pp_line>{NEWLINE} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN(INITIAL); + } +<pp_ignore>{NEWLINE} { + BEGIN(INITIAL); + } +<pp_ignore>{ANY} {} +<pp>{NEWLINE} { + FIXME("Unexpected preprocessor directive.\n"); + BEGIN(INITIAL); + } +<pp>{ANY} {} + +{ANY} { + return yytext[0]; + } + +%% + +int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + YY_BUFFER_STATE buffer; + int ret; + + buffer = hlsl__scan_string(text); + hlsl__switch_to_buffer(buffer); + + ret = hlsl_parser_compile(type, major, minor, entrypoint, dxbc, message_context); + + hlsl__delete_buffer(buffer); + return ret; +} diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y new file mode 100644 index 00000000..4e2218c5 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.y @@ -0,0 +1,2961 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +%{ +#include "hlsl.h" +#include <stdio.h> + +int hlsl_lex(void); + +struct hlsl_parse_ctx hlsl_ctx; + +struct YYLTYPE; +static struct source_location get_location(const struct YYLTYPE *l); + +void hlsl_message(const char *fmt, ...) +{ + /* FIXME */ +} + +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) +{ + /* FIXME */ + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + +static void hlsl_error(const char *s) +{ + const struct source_location loc = + { + .file = hlsl_ctx.source_file, + .line = hlsl_ctx.line_no, + .col = hlsl_ctx.column, + }; + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "%s", s); +} + +static struct hlsl_ir_node *node_from_list(struct list *list) +{ + return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); +} + +static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no) +{ + TRACE("Line %u: ", line_no); + if (modifiers) + TRACE("%s ", debug_modifiers(modifiers)); + TRACE("%s %s;\n", debug_hlsl_type(type), declname); +} + +static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_location loc) +{ + if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + hlsl_report_message(loc, HLSL_LEVEL_ERROR, + "'row_major' or 'column_major' modifiers are only allowed for matrices."); +} + +static BOOL type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + +static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) +{ + BOOL ret; + + TRACE("Declaring variable %s.\n", decl->name); + if (decl->data_type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(decl->modifiers, decl->loc); + + if (local) + { + DWORD invalid = decl->modifiers & (HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED + | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); + + if (invalid) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, + "modifier '%s' invalid for local variables", debug_modifiers(invalid)); + } + if (decl->semantic) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, + "semantics are not allowed on local variables"); + return FALSE; + } + } + else + { + if (find_function(decl->name)) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, "redefinition of '%s'", decl->name); + return FALSE; + } + } + ret = add_declaration(hlsl_ctx.cur_scope, decl, local); + if (!ret) + { + struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); + + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, "\"%s\" already declared", decl->name); + hlsl_report_message(old->loc, HLSL_LEVEL_NOTE, "\"%s\" was previously declared here", old->name); + return FALSE; + } + return TRUE; +} + +static DWORD add_modifiers(DWORD modifiers, DWORD mod, const struct source_location loc) +{ + if (modifiers & mod) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} + +static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +{ + if (get_type(scope, def->name, FALSE)) + return FALSE; + + rb_put(&scope->types, def->name, &def->scope_entry); + return TRUE; +} + +static void declare_predefined_types(struct hlsl_scope *scope) +{ + struct hlsl_type *type; + unsigned int x, y, bt; + static const char * const names[] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + char name[10]; + + static const char *const sampler_names[] = + { + "sampler", + "sampler1D", + "sampler2D", + "sampler3D", + "samplerCUBE" + }; + + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", names[bt], y, x); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); + add_type_to_scope(scope, type); + + if (y == 1) + { + sprintf(name, "%s%u", names[bt], x); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); + add_type_to_scope(scope, type); + hlsl_ctx.builtin_types.vector[bt][x - 1] = type; + + if (x == 1) + { + sprintf(name, "%s", names[bt]); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); + add_type_to_scope(scope, type); + hlsl_ctx.builtin_types.scalar[bt] = type; + } + } + } + } + } + + for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) + { + type = new_hlsl_type(vkd3d_strdup(sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + type->sampler_dim = bt; + hlsl_ctx.builtin_types.sampler[bt] = type; + } + + hlsl_ctx.builtin_types.Void = new_hlsl_type(vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + + /* DX8 effects predefined types */ + type = new_hlsl_type(vkd3d_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); + add_type_to_scope(scope, type); +} + +static BOOL type_is_void(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; +} + +static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = vkd3d_malloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + +static BOOL append_conditional_break(struct list *cond_list) +{ + struct hlsl_ir_node *condition, *not; + struct hlsl_ir_jump *jump; + struct hlsl_ir_if *iff; + + /* E.g. "for (i = 0; ; ++i)". */ + if (!list_count(cond_list)) + return TRUE; + + condition = node_from_list(cond_list); + if (!(not = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, condition, condition->loc))) + return FALSE; + list_add_tail(cond_list, &not->entry); + + if (!(iff = new_if(not, condition->loc))) + return FALSE; + list_add_tail(cond_list, &iff->node.entry); + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return FALSE; + init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); + jump->type = HLSL_IR_JUMP_BREAK; + list_add_head(&iff->then_instrs, &jump->node.entry); + return TRUE; +} + +enum loop_type +{ + LOOP_FOR, + LOOP_WHILE, + LOOP_DO_WHILE +}; + +static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, + struct list *iter, struct list *body, struct source_location loc) +{ + struct list *list = NULL; + struct hlsl_ir_loop *loop = NULL; + struct hlsl_ir_if *cond_jump = NULL; + + if (!(list = vkd3d_malloc(sizeof(*list)))) + goto oom; + list_init(list); + + if (init) + list_move_head(list, init); + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + goto oom; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_add_tail(list, &loop->node.entry); + list_init(&loop->body); + + if (!append_conditional_break(cond)) + goto oom; + + if (type != LOOP_DO_WHILE) + list_move_tail(&loop->body, cond); + + list_move_tail(&loop->body, body); + + if (iter) + list_move_tail(&loop->body, iter); + + if (type == LOOP_DO_WHILE) + list_move_tail(&loop->body, cond); + + vkd3d_free(init); + vkd3d_free(cond); + vkd3d_free(body); + return list; + +oom: + vkd3d_free(loop); + vkd3d_free(cond_jump); + vkd3d_free(list); + free_instr_list(init); + free_instr_list(cond); + free_instr_list(iter); + free_instr_list(body); + return NULL; +} + +static unsigned int initializer_size(const struct parse_initializer *initializer) +{ + unsigned int count = 0, i; + + for (i = 0; i < initializer->args_count; ++i) + { + count += components_count_type(initializer->args[i]->data_type); + } + TRACE("Initializer size = %u.\n", count); + return count; +} + +static void free_parse_initializer(struct parse_initializer *initializer) +{ + free_instr_list(initializer->instrs); + vkd3d_free(initializer->args); +} + +static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle; + + if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) + return NULL; + init_node(&swizzle->node, HLSL_IR_SWIZZLE, + new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + hlsl_src_from_node(&swizzle->val, val); + swizzle->swizzle = s; + return swizzle; +} + +static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, + struct source_location *loc) +{ + unsigned int len = strlen(swizzle), component = 0; + unsigned int i, set, swiz = 0; + BOOL valid; + + if (value->data_type->type == HLSL_CLASS_MATRIX) + { + /* Matrix swizzle */ + BOOL m_swizzle; + unsigned int inc, x, y; + + if (len < 3 || swizzle[0] != '_') + return NULL; + m_swizzle = swizzle[1] == 'm'; + inc = m_swizzle ? 4 : 3; + + if (len % inc || len > inc * 4) + return NULL; + + for (i = 0; i < len; i += inc) + { + if (swizzle[i] != '_') + return NULL; + if (m_swizzle) + { + if (swizzle[i + 1] != 'm') + return NULL; + y = swizzle[i + 2] - '0'; + x = swizzle[i + 3] - '0'; + } + else + { + y = swizzle[i + 1] - '1'; + x = swizzle[i + 2] - '1'; + } + + if (x >= value->data_type->dimx || y >= value->data_type->dimy) + return NULL; + swiz |= (y << 4 | x) << component * 8; + component++; + } + return new_swizzle(swiz, component, value, loc); + } + + /* Vector swizzle */ + if (len > 4) + return NULL; + + for (set = 0; set < 2; ++set) + { + valid = TRUE; + component = 0; + for (i = 0; i < len; ++i) + { + char c[2][4] = {{'x', 'y', 'z', 'w'}, {'r', 'g', 'b', 'a'}}; + unsigned int s = 0; + + for (s = 0; s < 4; ++s) + { + if (swizzle[i] == c[set][s]) + break; + } + if (s == 4) + { + valid = FALSE; + break; + } + + if (s >= value->data_type->dimx) + return NULL; + swiz |= s << component * 2; + component++; + } + if (valid) + return new_swizzle(swiz, component, value, loc); + } + + return NULL; +} + +static struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) +{ + struct hlsl_ir_var *var; + + if (!(var = vkd3d_calloc(1, sizeof(*var)))) + { + hlsl_ctx.status = PARSE_ERR; + return NULL; + } + + var->name = name; + var->data_type = type; + var->loc = loc; + var->semantic = semantic; + var->modifiers = modifiers; + var->reg_reservation = reg_reservation; + return var; +} + +static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) +{ + struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); + + if (var) + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + return var; +} + +static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) +{ + struct hlsl_ir_assignment *assign; + + if (!writemask && type_is_single_reg(rhs->data_type)) + writemask = (1 << rhs->data_type->dimx) - 1; + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); + assign->lhs.var = var; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); + assign->writemask = writemask; + return assign; +} + +static struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + return new_assignment(lhs, NULL, rhs, 0, rhs->loc); +} + +static struct hlsl_ir_jump *add_return(struct list *instrs, + struct hlsl_ir_node *return_value, struct source_location loc) +{ + struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type; + struct hlsl_ir_jump *jump; + + if (return_value) + { + struct hlsl_ir_assignment *assignment; + + if (!(return_value = add_implicit_conversion(instrs, return_value, return_type, &loc))) + return NULL; + + if (!(assignment = new_simple_assignment(hlsl_ctx.cur_function->return_var, return_value))) + return NULL; + list_add_after(&return_value->entry, &assignment->node.entry); + } + else if (!type_is_void(return_type)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "non-void function must return a value"); + return NULL; + } + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return NULL; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = HLSL_IR_JUMP_RETURN; + list_add_tail(instrs, &jump->node.entry); + + return jump; +} + +static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); + c->value.u[0] = n; + return c; +} + +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) +{ + struct hlsl_ir_expr *expr; + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg); + return &expr->node; +} + +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) +{ + struct hlsl_ir_expr *expr; + + assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); + return &expr->node; +} + +static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) +{ + struct hlsl_ir_load *load; + + if (!(load = vkd3d_calloc(1, sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); + load->src.var = var; + return load; +} + +static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, + struct hlsl_type *data_type, const struct source_location loc) +{ + struct hlsl_ir_node *add = NULL; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (var_node->type == HLSL_IR_LOAD) + { + const struct hlsl_deref *src = &load_from_node(var_node)->src; + + var = src->var; + if (src->offset.node) + { + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset.node, offset))) + return NULL; + list_add_tail(instrs, &add->entry); + offset = add; + } + } + else + { + struct hlsl_ir_assignment *assign; + char name[27]; + + sprintf(name, "<deref-%p>", var_node); + if (!(var = new_synthetic_var(name, var_node->data_type, var_node->loc))) + return NULL; + + TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(var_node->type)); + + if (!(assign = new_simple_assignment(var, var_node))) + return NULL; + + list_add_tail(instrs, &assign->node.entry); + } + + if (!(load = vkd3d_malloc(sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, data_type, loc); + load->src.var = var; + hlsl_src_from_node(&load->src.offset, offset); + list_add_tail(instrs, &load->node.entry); + return load; +} + +static struct hlsl_ir_load *add_record_load(struct list *instrs, struct hlsl_ir_node *record, + const struct hlsl_struct_field *field, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = new_uint_constant(field->reg_offset * 4, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + return add_load(instrs, record, &c->node, field->type, loc); +} + +static struct hlsl_ir_load *add_array_load(struct list *instrs, struct hlsl_ir_node *array, + struct hlsl_ir_node *index, const struct source_location loc) +{ + const struct hlsl_type *expr_type = array->data_type; + struct hlsl_type *data_type; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *mul; + + TRACE("Array load from type %s.\n", debug_hlsl_type(expr_type)); + + if (expr_type->type == HLSL_CLASS_ARRAY) + { + data_type = expr_type->e.array.type; + } + else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) + { + /* This needs to be lowered now, while we still have type information. */ + FIXME("Index of matrix or vector type.\n"); + return NULL; + } + else + { + if (expr_type->type == HLSL_CLASS_SCALAR) + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "array-indexed expression is scalar"); + else + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "expression is not array-indexable"); + return NULL; + } + + if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node))) + return NULL; + list_add_tail(instrs, &mul->entry); + index = mul; + + return add_load(instrs, array, index, data_type, loc); +} + +static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *field) +{ + struct hlsl_struct_field *f; + + LIST_FOR_EACH_ENTRY(f, fields, struct hlsl_struct_field, entry) + { + if (!strcmp(f->name, field->name)) + return FALSE; + } + list_add_tail(fields, &field->entry); + return TRUE; +} + +BOOL is_row_major(const struct hlsl_type *type) +{ + /* Default to column-major if the majority isn't explicitly set, which can + * happen for anonymous nodes. */ + return !!(type->modifiers & HLSL_MODIFIER_ROW_MAJOR); +} + +static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, + unsigned int *modifiers, struct source_location loc) +{ + unsigned int default_majority = 0; + struct hlsl_type *new_type; + + /* This function is only used for declarations (i.e. variables and struct + * fields), which should inherit the matrix majority. We only explicitly set + * the default majority for declarations—typedefs depend on this—but we + * want to always set it, so that an hlsl_type object is never used to + * represent two different majorities (and thus can be used to store its + * register size, etc.) */ + if (!(*modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && type->type == HLSL_CLASS_MATRIX) + { + if (hlsl_ctx.matrix_majority == HLSL_COLUMN_MAJOR) + default_majority = HLSL_MODIFIER_COLUMN_MAJOR; + else + default_majority = HLSL_MODIFIER_ROW_MAJOR; + } + + if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) + return type; + + if (!(new_type = clone_hlsl_type(type, default_majority))) + return NULL; + + new_type->modifiers = add_modifiers(new_type->modifiers, *modifiers, loc); + *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + + if (new_type->type == HLSL_CLASS_MATRIX) + new_type->reg_size = is_row_major(new_type) ? new_type->dimy : new_type->dimx; + return new_type; +} + +static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, struct list *fields) +{ + struct parse_variable_def *v, *v_next; + struct hlsl_struct_field *field; + struct list *list; + + if (type->type == HLSL_CLASS_MATRIX) + assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(list = vkd3d_malloc(sizeof(*list)))) + return NULL; + list_init(list); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) + { + debug_dump_decl(type, 0, v->name, v->loc.line); + if (!(field = vkd3d_calloc(1, sizeof(*field)))) + { + vkd3d_free(v); + return list; + } + if (v->array_size) + field->type = new_array_type(type, v->array_size); + else + field->type = type; + field->name = v->name; + field->modifiers = modifiers; + field->semantic = v->semantic; + if (v->initializer.args_count) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "struct field with an initializer.\n"); + free_parse_initializer(&v->initializer); + } + list_add_tail(list, &field->entry); + vkd3d_free(v); + } + vkd3d_free(fields); + return list; +} + +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + +static struct hlsl_type *new_struct_type(const char *name, struct list *fields) +{ + struct hlsl_struct_field *field; + unsigned int reg_size = 0; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; + type->name = name; + type->dimx = 0; + type->dimy = 1; + type->e.elements = fields; + + LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) + { + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); + } + type->reg_size = reg_size; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) +{ + struct parse_variable_def *v, *v_next; + struct hlsl_type *type; + BOOL ret; + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(orig_type, v->array_size); + else + type = clone_hlsl_type(orig_type, 0); + if (!type) + return FALSE; + vkd3d_free((void *)type->name); + type->name = v->name; + type->modifiers |= modifiers; + + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(type->modifiers, v->loc); + else + type->reg_size = is_row_major(type) ? type->dimy : type->dimx; + + if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); + if (!ret) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "redefinition of custom type '%s'", v->name); + vkd3d_free(v); + } + vkd3d_free(list); + return TRUE; +} + +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location loc) +{ + struct hlsl_ir_var *var; + + if (param->type->type == HLSL_CLASS_MATRIX) + assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(var = new_var(param->name, param->type, loc, param->semantic, param->modifiers, param->reg_reservation))) + return FALSE; + + if (!add_declaration(hlsl_ctx.cur_scope, var, FALSE)) + { + free_declaration(var); + return FALSE; + } + list_add_tail(list, &var->param_entry); + return TRUE; +} + +static struct reg_reservation *parse_reg_reservation(const char *reg_string) +{ + enum vkd3d_shader_register_type type; + struct reg_reservation *reg_res; + DWORD regnum = 0; + + switch (reg_string[0]) + { + case 'c': + type = VKD3DSPR_CONST; + break; + case 'i': + type = VKD3DSPR_CONSTINT; + break; + case 'b': + type = VKD3DSPR_CONSTBOOL; + break; + case 's': + type = VKD3DSPR_SAMPLER; + break; + default: + FIXME("Unsupported register type.\n"); + return NULL; + } + + if (!sscanf(reg_string + 1, "%u", &regnum)) + { + FIXME("Unsupported register reservation syntax.\n"); + return NULL; + } + + if (!(reg_res = vkd3d_malloc(sizeof(*reg_res)))) + return NULL; + reg_res->type = type; + reg_res->regnum = regnum; + return reg_res; +} + +static const struct hlsl_ir_function_decl *get_overloaded_func(struct rb_tree *funcs, char *name, + struct list *params, BOOL exact_signature) +{ + struct hlsl_ir_function *func; + struct rb_entry *entry; + + entry = rb_get(funcs, name); + if (entry) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + + entry = rb_get(&func->overloads, params); + if (!entry) + { + if (!exact_signature) + FIXME("No exact match, search for a compatible overloaded function (if any).\n"); + return NULL; + } + return RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + } + return NULL; +} + +static struct hlsl_ir_function_decl *get_func_entry(const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&hlsl_ctx.functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + +static struct list *make_list(struct hlsl_ir_node *node) +{ + struct list *list; + + if (!(list = vkd3d_malloc(sizeof(*list)))) + { + free_instr(node); + return NULL; + } + list_init(list); + list_add_tail(list, &node->entry); + return list; +} + +static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) +{ + if (node->data_type->type != HLSL_CLASS_SCALAR) + return 0; + + switch (node->type) + { + case HLSL_IR_CONSTANT: + { + struct hlsl_ir_constant *constant = constant_from_node(node); + + switch (constant->node.data_type->base_type) + { + case HLSL_TYPE_UINT: + return constant->value.u[0]; + case HLSL_TYPE_INT: + return constant->value.i[0]; + case HLSL_TYPE_FLOAT: + return constant->value.f[0]; + case HLSL_TYPE_DOUBLE: + return constant->value.d[0]; + case HLSL_TYPE_BOOL: + return constant->value.b[0]; + default: + WARN("Invalid type %s.\n", debug_base_type(constant->node.data_type)); + return 0; + } + } + + case HLSL_IR_EXPR: + case HLSL_IR_LOAD: + case HLSL_IR_SWIZZLE: + FIXME("Unhandled type %s.\n", debug_node_type(node->type)); + return 0; + + case HLSL_IR_ASSIGNMENT: + default: + WARN("Invalid node type %s.\n", debug_node_type(node->type)); + return 0; + } +} + +static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) +{ + list_add_tail(list, &node->entry); + return list; +} + +static struct list *add_binary_expr(struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct source_location loc) +{ + struct hlsl_ir_node *args[3] = {node_from_list(list1), node_from_list(list2)}; + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_expr(list1, op, args, &loc); + return list1; +} + +static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, + struct parse_initializer *initializer) +{ + struct hlsl_type *type = var->data_type; + struct hlsl_struct_field *field; + unsigned int i = 0; + + if (initializer_size(initializer) != components_count_type(type)) + { + hlsl_report_message(var->loc, HLSL_LEVEL_ERROR, "structure initializer mismatch"); + free_parse_initializer(initializer); + return; + } + + list_move_tail(list, initializer->instrs); + vkd3d_free(initializer->instrs); + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + struct hlsl_ir_node *node = initializer->args[i]; + struct hlsl_ir_assignment *assign; + struct hlsl_ir_constant *c; + + if (i++ >= initializer->args_count) + break; + + if (components_count_type(field->type) == components_count_type(node->data_type)) + { + if (!(c = new_uint_constant(field->reg_offset * 4, node->loc))) + break; + list_add_tail(list, &c->node.entry); + + if (!(assign = new_assignment(var, &c->node, node, 0, node->loc))) + break; + list_add_tail(list, &assign->node.entry); + } + else + FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + } + + vkd3d_free(initializer->args); +} + +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic); + vkd3d_free(v->reg_reservation); + vkd3d_free(v); +} + +static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) +{ + struct parse_variable_def *v, *v_next; + struct list *statements_list; + struct hlsl_ir_var *var; + struct hlsl_type *type; + BOOL ret, local = TRUE; + + if (basic_type->type == HLSL_CLASS_MATRIX) + assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(statements_list = vkd3d_malloc(sizeof(*statements_list)))) + { + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) + free_parse_variable_def(v); + vkd3d_free(var_list); + return NULL; + } + list_init(statements_list); + + if (!var_list) + return statements_list; + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(basic_type, v->array_size); + else + type = basic_type; + + if (!(var = new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) + { + free_parse_variable_def(v); + continue; + } + debug_dump_decl(type, modifiers, v->name, v->loc.line); + + if (hlsl_ctx.cur_scope == hlsl_ctx.globals) + { + var->modifiers |= HLSL_STORAGE_UNIFORM; + local = FALSE; + } + + if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "const variable without initializer"); + free_declaration(var); + vkd3d_free(v); + continue; + } + + ret = declare_variable(var, local); + if (!ret) + { + free_declaration(var); + vkd3d_free(v); + continue; + } + TRACE("Declared variable %s.\n", var->name); + + if (v->initializer.args_count) + { + unsigned int size = initializer_size(&v->initializer); + struct hlsl_ir_load *load; + + TRACE("Variable with initializer.\n"); + if (type->type <= HLSL_CLASS_LAST_NUMERIC + && type->dimx * type->dimy != size && size != 1) + { + if (size < type->dimx * type->dimy) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && components_count_type(type) != size) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + if (type->type > HLSL_CLASS_LAST_NUMERIC) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + if (v->array_size > 0) + { + FIXME("Initializing arrays is not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + if (v->initializer.args_count > 1) + { + FIXME("Complex initializers are not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + load = new_var_load(var, var->loc); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + vkd3d_free(v->initializer.args); + + if (modifiers & HLSL_STORAGE_STATIC) + list_move_tail(&hlsl_ctx.static_initializers, v->initializer.instrs); + else + list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.instrs); + } + vkd3d_free(v); + } + vkd3d_free(var_list); + return statements_list; +} + +static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) +{ + struct hlsl_ir_function_decl *decl; + + if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) + return NULL; + decl->return_type = return_type; + decl->parameters = parameters; + decl->semantic = semantic; + decl->loc = loc; + + if (!type_is_void(return_type)) + { + struct hlsl_ir_var *return_var; + char name[28]; + + sprintf(name, "<retval-%p>", decl); + if (!(return_var = new_synthetic_var(name, return_type, loc))) + { + vkd3d_free(decl); + return NULL; + } + decl->return_var = return_var; + } + + return decl; +} + +%} + +%locations +%define parse.error verbose +%define api.prefix {hlsl_} +%expect 1 + +%union +{ + struct hlsl_type *type; + INT intval; + FLOAT floatval; + BOOL boolval; + char *name; + DWORD modifiers; + struct hlsl_ir_node *instr; + struct list *list; + struct parse_function function; + struct parse_parameter parameter; + struct parse_initializer initializer; + struct parse_variable_def *variable_def; + struct parse_if_body if_body; + enum parse_unary_op unary_op; + enum parse_assign_op assign_op; + struct reg_reservation *reg_reservation; + struct parse_colon_attribute colon_attribute; +} + +%token KW_BLENDSTATE +%token KW_BREAK +%token KW_BUFFER +%token KW_CBUFFER +%token KW_COLUMN_MAJOR +%token KW_COMPILE +%token KW_CONST +%token KW_CONTINUE +%token KW_DEPTHSTENCILSTATE +%token KW_DEPTHSTENCILVIEW +%token KW_DISCARD +%token KW_DO +%token KW_DOUBLE +%token KW_ELSE +%token KW_EXTERN +%token KW_FALSE +%token KW_FOR +%token KW_GEOMETRYSHADER +%token KW_GROUPSHARED +%token KW_IF +%token KW_IN +%token KW_INLINE +%token KW_INOUT +%token KW_MATRIX +%token KW_NAMESPACE +%token KW_NOINTERPOLATION +%token KW_OUT +%token KW_PASS +%token KW_PIXELSHADER +%token KW_PRECISE +%token KW_RASTERIZERSTATE +%token KW_RENDERTARGETVIEW +%token KW_RETURN +%token KW_REGISTER +%token KW_ROW_MAJOR +%token KW_SAMPLER +%token KW_SAMPLER1D +%token KW_SAMPLER2D +%token KW_SAMPLER3D +%token KW_SAMPLERCUBE +%token KW_SAMPLER_STATE +%token KW_SAMPLERCOMPARISONSTATE +%token KW_SHARED +%token KW_STATEBLOCK +%token KW_STATEBLOCK_STATE +%token KW_STATIC +%token KW_STRING +%token KW_STRUCT +%token KW_SWITCH +%token KW_TBUFFER +%token KW_TECHNIQUE +%token KW_TECHNIQUE10 +%token KW_TEXTURE +%token KW_TEXTURE1D +%token KW_TEXTURE1DARRAY +%token KW_TEXTURE2D +%token KW_TEXTURE2DARRAY +%token KW_TEXTURE2DMS +%token KW_TEXTURE2DMSARRAY +%token KW_TEXTURE3D +%token KW_TEXTURE3DARRAY +%token KW_TEXTURECUBE +%token KW_TRUE +%token KW_TYPEDEF +%token KW_UNIFORM +%token KW_VECTOR +%token KW_VERTEXSHADER +%token KW_VOID +%token KW_VOLATILE +%token KW_WHILE + +%token OP_INC +%token OP_DEC +%token OP_AND +%token OP_OR +%token OP_EQ +%token OP_LEFTSHIFT +%token OP_LEFTSHIFTASSIGN +%token OP_RIGHTSHIFT +%token OP_RIGHTSHIFTASSIGN +%token OP_ELLIPSIS +%token OP_LE +%token OP_GE +%token OP_NE +%token OP_ADDASSIGN +%token OP_SUBASSIGN +%token OP_MULASSIGN +%token OP_DIVASSIGN +%token OP_MODASSIGN +%token OP_ANDASSIGN +%token OP_ORASSIGN +%token OP_XORASSIGN +%token OP_UNKNOWN1 +%token OP_UNKNOWN2 +%token OP_UNKNOWN3 +%token OP_UNKNOWN4 + +%token <floatval> C_FLOAT + +%token <intval> C_INTEGER +%token <intval> PRE_LINE + +%type <list> add_expr +%type <list> assignment_expr +%type <list> bitand_expr +%type <list> bitor_expr +%type <list> bitxor_expr +%type <list> compound_statement +%type <list> conditional_expr +%type <list> declaration +%type <list> declaration_statement +%type <list> equality_expr +%type <list> expr +%type <list> expr_statement +%type <list> field +%type <list> fields_list +%type <list> initializer_expr +%type <list> jump_statement +%type <list> logicand_expr +%type <list> logicor_expr +%type <list> loop_statement +%type <list> mul_expr +%type <list> param_list +%type <list> parameters +%type <list> postfix_expr +%type <list> primary_expr +%type <list> relational_expr +%type <list> selection_statement +%type <list> shift_expr +%type <list> statement +%type <list> statement_list +%type <list> struct_declaration +%type <list> type_specs +%type <list> unary_expr +%type <list> variables_def +%type <list> variables_def_optional + +%token <name> VAR_IDENTIFIER +%token <name> NEW_IDENTIFIER +%token <name> STRING +%token <name> TYPE_IDENTIFIER + +%type <assign_op> assign_op + +%type <boolval> boolean + +%type <colon_attribute> colon_attribute + +%type <function> func_declaration +%type <function> func_prototype + +%type <initializer> complex_initializer +%type <initializer> initializer_expr_list + +%type <if_body> if_body + +%type <intval> array + +%type <modifiers> input_mod +%type <modifiers> input_mods +%type <modifiers> var_modifiers + +%type <name> any_identifier +%type <name> semantic +%type <name> var_identifier + +%type <parameter> parameter + +%type <reg_reservation> register_opt + +%type <type> base_type +%type <type> field_type +%type <type> named_struct_spec +%type <type> unnamed_struct_spec +%type <type> struct_spec +%type <type> type +%type <type> typedef_type + +%type <unary_op> unary_op + +%type <variable_def> type_spec +%type <variable_def> variable_def + +%% + +hlsl_prog: + /* empty */ + | hlsl_prog func_declaration + { + const struct hlsl_ir_function_decl *decl; + + decl = get_overloaded_func(&hlsl_ctx.functions, $2.name, $2.decl->parameters, TRUE); + if (decl && !decl->func->intrinsic) + { + if (decl->body && $2.decl->body) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "redefinition of function %s", debugstr_a($2.name)); + YYABORT; + } + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "redefining function %s with a different return type", + debugstr_a($2.name)); + hlsl_report_message(decl->loc, HLSL_LEVEL_NOTE, + "%s previously declared here", + debugstr_a($2.name)); + YYABORT; + } + } + + if (type_is_void($2.decl->return_type) && $2.decl->semantic) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "void function with a semantic"); + } + + TRACE("Adding function '%s' to the function list.\n", $2.name); + add_function_decl(&hlsl_ctx.functions, $2.name, $2.decl, FALSE); + } + | hlsl_prog declaration_statement + { + TRACE("Declaration statement parsed.\n"); + + if (!list_empty($2)) + FIXME("Uniform initializer.\n"); + free_instr_list($2); + } + | hlsl_prog preproc_directive + | hlsl_prog ';' + { + TRACE("Skipping stray semicolon.\n"); + } + +preproc_directive: + PRE_LINE STRING + { + const char **new_array = NULL; + + TRACE("Updating line information to file %s, line %u.\n", debugstr_a($2), $1); + hlsl_ctx.line_no = $1; + if (strcmp($2, hlsl_ctx.source_file)) + new_array = vkd3d_realloc(hlsl_ctx.source_files, + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); + + if (new_array) + { + hlsl_ctx.source_files = new_array; + hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; + hlsl_ctx.source_file = $2; + } + else + { + vkd3d_free($2); + } + } + +struct_declaration: + var_modifiers struct_spec variables_def_optional ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!$3) + { + if (!$2->name) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "anonymous struct declaration with no variables"); + } + if (modifiers) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "modifier not allowed on struct type declaration"); + } + } + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); + } + +struct_spec: + named_struct_spec + | unnamed_struct_spec + +named_struct_spec: + KW_STRUCT any_identifier '{' fields_list '}' + { + BOOL ret; + + TRACE("Structure %s declaration.\n", debugstr_a($2)); + $$ = new_struct_type($2, $4); + + if (get_variable(hlsl_ctx.cur_scope, $2)) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "redefinition of '%s'", $2); + YYABORT; + } + + ret = add_type_to_scope(hlsl_ctx.cur_scope, $$); + if (!ret) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "redefinition of struct '%s'", $2); + YYABORT; + } + } + +unnamed_struct_spec: + KW_STRUCT '{' fields_list '}' + { + TRACE("Anonymous structure declaration.\n"); + $$ = new_struct_type(NULL, $3); + } + +any_identifier: + VAR_IDENTIFIER + | TYPE_IDENTIFIER + | NEW_IDENTIFIER + +fields_list: + /* empty */ + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | fields_list field + { + BOOL ret; + struct hlsl_struct_field *field, *next; + + $$ = $1; + LIST_FOR_EACH_ENTRY_SAFE(field, next, $2, struct hlsl_struct_field, entry) + { + ret = add_struct_field($$, field); + if (ret == FALSE) + { + hlsl_report_message(get_location(&@2), + HLSL_LEVEL_ERROR, "redefinition of '%s'", field->name); + vkd3d_free(field); + } + } + vkd3d_free($2); + } + +field_type: + type + | unnamed_struct_spec + +field: + var_modifiers field_type variables_def ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = gen_struct_fields(type, modifiers, $3); + } + +func_declaration: + func_prototype compound_statement + { + TRACE("Function %s parsed.\n", $1.name); + $$ = $1; + $$.decl->body = $2; + pop_scope(&hlsl_ctx); + } + | func_prototype ';' + { + TRACE("Function prototype for %s.\n", $1.name); + $$ = $1; + pop_scope(&hlsl_ctx); + } + +func_prototype: + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + var_modifiers type var_identifier '(' parameters ')' colon_attribute + { + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifiers on a function"); + YYABORT; + } + if (get_variable(hlsl_ctx.globals, $3)) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); + YYABORT; + } + if (type_is_void($2) && $7.semantic) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, "void function with a semantic"); + } + + if ($7.reg_reservation) + { + FIXME("Unexpected register reservation for a function.\n"); + vkd3d_free($7.reg_reservation); + } + if (!($$.decl = new_func_decl($2, $5, $7.semantic, get_location(&@3)))) + YYABORT; + $$.name = $3; + hlsl_ctx.cur_function = $$.decl; + } + +compound_statement: + '{' '}' + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | '{' scope_start statement_list '}' + { + pop_scope(&hlsl_ctx); + $$ = $3; + } + +scope_start: + /* empty */ + { + push_scope(&hlsl_ctx); + } + +var_identifier: + VAR_IDENTIFIER + | NEW_IDENTIFIER + +colon_attribute: + /* empty */ + { + $$.semantic = NULL; + $$.reg_reservation = NULL; + } + | semantic + { + $$.semantic = $1; + $$.reg_reservation = NULL; + } + | register_opt + { + $$.semantic = NULL; + $$.reg_reservation = $1; + } + +semantic: + ':' any_identifier + { + $$ = $2; + } + +/* FIXME: Writemasks */ +register_opt: + ':' KW_REGISTER '(' any_identifier ')' + { + $$ = parse_reg_reservation($4); + vkd3d_free($4); + } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' + { + FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4)); + vkd3d_free($4); + + $$ = parse_reg_reservation($6); + vkd3d_free($6); + } + +parameters: + scope_start + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | scope_start param_list + { + $$ = $2; + } + +param_list: + parameter + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + if (!add_func_parameter($$, &$1, get_location(&@1))) + { + ERR("Error adding function parameter %s.\n", $1.name); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + YYABORT; + } + } + | param_list ',' parameter + { + $$ = $1; + if (!add_func_parameter($$, &$3, get_location(&@3))) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "duplicate parameter %s", $3.name); + YYABORT; + } + } + +parameter: + input_mods var_modifiers type any_identifier colon_attribute + { + struct hlsl_type *type; + DWORD modifiers = $2; + + if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) + YYABORT; + + $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; + $$.modifiers |= modifiers; + $$.type = type; + $$.name = $4; + $$.semantic = $5.semantic; + $$.reg_reservation = $5.reg_reservation; + } + +input_mods: + /* empty */ + { + $$ = 0; + } + | input_mods input_mod + { + if ($1 & $2) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "duplicate input-output modifiers"); + YYABORT; + } + $$ = $1 | $2; + } + +input_mod: + KW_IN + { + $$ = HLSL_STORAGE_IN; + } + | KW_OUT + { + $$ = HLSL_STORAGE_OUT; + } + | KW_INOUT + { + $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; + } + +type: + base_type + { + $$ = $1; + } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "vectors of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "vector size must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "matrices of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "matrix row count must be between 1 and 4\n"); + YYABORT; + } + if ($7 < 1 || $7 > 4) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, + "matrix column count must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + } + +base_type: + KW_VOID + { + $$ = hlsl_ctx.builtin_types.Void; + } + | KW_SAMPLER + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC]; + } + | KW_SAMPLER1D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_1D]; + } + | KW_SAMPLER2D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_2D]; + } + | KW_SAMPLER3D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; + } + | KW_SAMPLERCUBE + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; + } + | TYPE_IDENTIFIER + { + $$ = get_type(hlsl_ctx.cur_scope, $1, TRUE); + vkd3d_free($1); + } + | KW_STRUCT TYPE_IDENTIFIER + { + $$ = get_type(hlsl_ctx.cur_scope, $2, TRUE); + if ($$->type != HLSL_CLASS_STRUCT) + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "'%s' redefined as a structure\n", $2); + vkd3d_free($2); + } + +declaration_statement: + declaration + | struct_declaration + | typedef + { + if (!($$ = vkd3d_malloc(sizeof(*$$)))) + YYABORT; + list_init($$); + } + +typedef_type: + type + | struct_spec + +typedef: + KW_TYPEDEF var_modifiers typedef_type type_specs ';' + { + if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) + { + struct parse_variable_def *v, *v_next; + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) + vkd3d_free(v); + vkd3d_free($4); + YYABORT; + } + if (!add_typedef($2, $3, $4)) + YYABORT; + } + +type_specs: + type_spec + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | type_specs ',' type_spec + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +type_spec: + any_identifier array + { + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + } + +declaration: + var_modifiers type variables_def ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); + } + +variables_def_optional: + /* empty */ + { + $$ = NULL; + } + | variables_def + +variables_def: + variable_def + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | variables_def ',' variable_def + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +variable_def: + any_identifier array colon_attribute + { + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + $$->semantic = $3.semantic; + $$->reg_reservation = $3.reg_reservation; + } + | any_identifier array colon_attribute '=' complex_initializer + { + TRACE("Declaration with initializer.\n"); + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + $$->semantic = $3.semantic; + $$->reg_reservation = $3.reg_reservation; + $$->initializer = $5; + } + +array: + /* empty */ + { + $$ = 0; + } + | '[' expr ']' + { + unsigned int size = evaluate_array_dimension(node_from_list($2)); + + free_instr_list($2); + + if (!size) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size is not a positive integer constant\n"); + YYABORT; + } + TRACE("Array size %u.\n", size); + + if (size > 65536) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size must be between 1 and 65536"); + YYABORT; + } + $$ = size; + } + +var_modifiers: + /* empty */ + { + $$ = 0; + } + | KW_EXTERN var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_EXTERN, get_location(&@1)); + } + | KW_NOINTERPOLATION var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_NOINTERPOLATION, get_location(&@1)); + } + | KW_PRECISE var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_PRECISE, get_location(&@1)); + } + | KW_SHARED var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_SHARED, get_location(&@1)); + } + | KW_GROUPSHARED var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_GROUPSHARED, get_location(&@1)); + } + | KW_STATIC var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_STATIC, get_location(&@1)); + } + | KW_UNIFORM var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_UNIFORM, get_location(&@1)); + } + | KW_VOLATILE var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_VOLATILE, get_location(&@1)); + } + | KW_CONST var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_CONST, get_location(&@1)); + } + | KW_ROW_MAJOR var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_ROW_MAJOR, get_location(&@1)); + } + | KW_COLUMN_MAJOR var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_COLUMN_MAJOR, get_location(&@1)); + } + +complex_initializer: + initializer_expr + { + $$.args_count = 1; + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = node_from_list($1); + $$.instrs = $1; + } + | '{' initializer_expr_list '}' + { + $$ = $2; + } + | '{' initializer_expr_list ',' '}' + { + $$ = $2; + } + +initializer_expr: + assignment_expr + +initializer_expr_list: + initializer_expr + { + $$.args_count = 1; + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = node_from_list($1); + $$.instrs = $1; + } + | initializer_expr_list ',' initializer_expr + { + $$ = $1; + if (!($$.args = vkd3d_realloc($$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + YYABORT; + $$.args[$$.args_count++] = node_from_list($3); + list_move_tail($$.instrs, $3); + vkd3d_free($3); + } + +boolean: + KW_TRUE + { + $$ = TRUE; + } + | KW_FALSE + { + $$ = FALSE; + } + +statement_list: + statement + | statement_list statement + { + $$ = $1; + list_move_tail($$, $2); + vkd3d_free($2); + } + +statement: + declaration_statement + | expr_statement + | compound_statement + | jump_statement + | selection_statement + | loop_statement + +jump_statement: + KW_RETURN expr ';' + { + if (!add_return($2, node_from_list($2), get_location(&@1))) + YYABORT; + $$ = $2; + } + | KW_RETURN ';' + { + if (!($$ = vkd3d_malloc(sizeof(*$$)))) + YYABORT; + list_init($$); + if (!add_return($$, NULL, get_location(&@1))) + YYABORT; + } + +selection_statement: + KW_IF '(' expr ')' if_body + { + struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_if *instr; + + if (!(instr = new_if(condition, get_location(&@1)))) + YYABORT; + list_move_tail(&instr->then_instrs, $5.then_instrs); + list_move_tail(&instr->else_instrs, $5.else_instrs); + vkd3d_free($5.then_instrs); + vkd3d_free($5.else_instrs); + if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) + hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, + "if condition requires a scalar"); + $$ = $3; + list_add_tail($$, &instr->node.entry); + } + +if_body: + statement + { + $$.then_instrs = $1; + $$.else_instrs = NULL; + } + | statement KW_ELSE statement + { + $$.then_instrs = $1; + $$.else_instrs = $3; + } + +loop_statement: + KW_WHILE '(' expr ')' statement + { + $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, get_location(&@1)); + } + | KW_DO statement KW_WHILE '(' expr ')' ';' + { + $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, get_location(&@1)); + } + | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement + { + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); + pop_scope(&hlsl_ctx); + } + | KW_FOR '(' scope_start declaration expr_statement expr ')' statement + { + if (!$4) + hlsl_report_message(get_location(&@4), HLSL_LEVEL_WARNING, + "no expressions in for loop initializer"); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); + pop_scope(&hlsl_ctx); + } + +expr_statement: + ';' + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | expr ';' + { + $$ = $1; + } + +primary_expr: + C_FLOAT + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_FLOAT], get_location(&@1)); + c->value.f[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | C_INTEGER + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_INT], get_location(&@1)); + c->value.i[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | boolean + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_BOOL], get_location(&@1)); + c->value.b[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | VAR_IDENTIFIER + { + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "variable '%s' is not declared\n", $1); + YYABORT; + } + if ((load = new_var_load(var, get_location(&@1)))) + { + if (!($$ = make_list(&load->node))) + YYABORT; + } + else + $$ = NULL; + } + | '(' expr ')' + { + $$ = $2; + } + +postfix_expr: + primary_expr + | postfix_expr OP_INC + { + struct source_location loc; + struct hlsl_ir_node *inc; + + loc = get_location(&@2); + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + inc = new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), loc); + /* Post increment/decrement expressions are considered const */ + inc->data_type = clone_hlsl_type(inc->data_type, 0); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); + } + | postfix_expr OP_DEC + { + struct source_location loc; + struct hlsl_ir_node *inc; + + loc = get_location(&@2); + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + inc = new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), loc); + /* Post increment/decrement expressions are considered const */ + inc->data_type = clone_hlsl_type(inc->data_type, 0); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); + } + | postfix_expr '.' any_identifier + { + struct hlsl_ir_node *node = node_from_list($1); + struct source_location loc; + + loc = get_location(&@2); + if (node->data_type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_type *type = node->data_type; + struct hlsl_struct_field *field; + + $$ = NULL; + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!strcmp($3, field->name)) + { + if (!add_record_load($1, node, field, loc)) + YYABORT; + $$ = $1; + break; + } + } + if (!$$) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid subscript %s", debugstr_a($3)); + YYABORT; + } + } + else if (node->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct hlsl_ir_swizzle *swizzle; + + swizzle = get_swizzle(node, $3, &loc); + if (!swizzle) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid swizzle %s", debugstr_a($3)); + YYABORT; + } + $$ = append_unop($1, &swizzle->node); + } + else + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid subscript %s", debugstr_a($3)); + YYABORT; + } + } + | postfix_expr '[' expr ']' + { + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + + list_move_tail($1, $3); + vkd3d_free($3); + + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); + free_instr_list($1); + YYABORT; + } + + if (!add_array_load($1, array, index, get_location(&@2))) + { + free_instr_list($1); + YYABORT; + } + $$ = $1; + } + + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_assignment *assignment; + unsigned int i, writemask_offset = 0; + static unsigned int counter; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + char name[23]; + + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifier on a constructor\n"); + YYABORT; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "constructors may only be used with numeric data types\n"); + YYABORT; + } + if ($2->dimx * $2->dimy != initializer_size(&$4)) + { + hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, + "expected %u components in constructor, but got %u\n", + $2->dimx * $2->dimy, initializer_size(&$4)); + YYABORT; + } + + if ($2->type == HLSL_CLASS_MATRIX) + FIXME("Matrix constructors are not supported yet.\n"); + + sprintf(name, "<constructor-%x>", counter++); + if (!(var = new_synthetic_var(name, $2, get_location(&@2)))) + YYABORT; + for (i = 0; i < $4.args_count; ++i) + { + struct hlsl_ir_node *arg = $4.args[i]; + unsigned int width; + + if (arg->data_type->type == HLSL_CLASS_OBJECT) + { + hlsl_report_message(arg->loc, HLSL_LEVEL_ERROR, "invalid constructor argument"); + continue; + } + width = components_count_type(arg->data_type); + + if (width > 4) + { + FIXME("Constructor argument with %u components.\n", width); + continue; + } + + if (!(arg = add_implicit_conversion($4.instrs, arg, + hlsl_ctx.builtin_types.vector[$2->base_type][width - 1], &arg->loc))) + continue; + + if (!(assignment = new_assignment(var, NULL, arg, + ((1 << width) - 1) << writemask_offset, arg->loc))) + YYABORT; + writemask_offset += width; + list_add_tail($4.instrs, &assignment->node.entry); + } + vkd3d_free($4.args); + if (!(load = new_var_load(var, get_location(&@2)))) + YYABORT; + $$ = append_unop($4.instrs, &load->node); + } + +unary_expr: + postfix_expr + | OP_INC unary_expr + { + struct source_location loc; + + loc = get_location(&@1); + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), loc)); + } + | OP_DEC unary_expr + { + struct source_location loc; + + loc = get_location(&@1); + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), loc)); + } + | unary_op unary_expr + { + enum hlsl_ir_expr_op ops[] = {0, HLSL_IR_UNOP_NEG, + HLSL_IR_UNOP_LOGIC_NOT, HLSL_IR_UNOP_BIT_NOT}; + + if ($1 == UNARY_OP_PLUS) + $$ = $2; + else + $$ = append_unop($2, new_unary_expr(ops[$1], node_from_list($2), get_location(&@1))); + } + + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + | '(' var_modifiers type array ')' unary_expr + { + struct hlsl_type *src_type = node_from_list($6)->data_type; + struct hlsl_type *dst_type; + struct source_location loc; + + loc = get_location(&@3); + if ($2) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "unexpected modifier in a cast"); + YYABORT; + } + + if ($4) + dst_type = new_array_type($3, $4); + else + dst_type = $3; + + if (!compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "can't cast from %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + YYABORT; + } + + $$ = append_unop($6, &new_cast(node_from_list($6), dst_type, &loc)->node); + } + +unary_op: + '+' + { + $$ = UNARY_OP_PLUS; + } + | '-' + { + $$ = UNARY_OP_MINUS; + } + | '!' + { + $$ = UNARY_OP_LOGICNOT; + } + | '~' + { + $$ = UNARY_OP_BITNOT; + } + +mul_expr: + unary_expr + | mul_expr '*' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MUL, get_location(&@2)); + } + | mul_expr '/' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_DIV, get_location(&@2)); + } + | mul_expr '%' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MOD, get_location(&@2)); + } + +add_expr: + mul_expr + | add_expr '+' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_ADD, get_location(&@2)); + } + | add_expr '-' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_SUB, get_location(&@2)); + } + +shift_expr: + add_expr + | shift_expr OP_LEFTSHIFT add_expr + { + FIXME("Left shift.\n"); + } + | shift_expr OP_RIGHTSHIFT add_expr + { + FIXME("Right shift.\n"); + } + +relational_expr: + shift_expr + | relational_expr '<' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LESS, get_location(&@2)); + } + | relational_expr '>' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GREATER, get_location(&@2)); + } + | relational_expr OP_LE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LEQUAL, get_location(&@2)); + } + | relational_expr OP_GE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GEQUAL, get_location(&@2)); + } + +equality_expr: + relational_expr + | equality_expr OP_EQ relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_EQUAL, get_location(&@2)); + } + | equality_expr OP_NE relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_NEQUAL, get_location(&@2)); + } + +bitand_expr: + equality_expr + | bitand_expr '&' equality_expr + { + FIXME("Bitwise AND.\n"); + } + +bitxor_expr: + bitand_expr + | bitxor_expr '^' bitand_expr + { + FIXME("Bitwise XOR.\n"); + } + +bitor_expr: + bitxor_expr + | bitor_expr '|' bitxor_expr + { + FIXME("Bitwise OR.\n"); + } + +logicand_expr: + bitor_expr + | logicand_expr OP_AND bitor_expr + { + FIXME("Logical AND.\n"); + } + +logicor_expr: + logicand_expr + | logicor_expr OP_OR logicand_expr + { + FIXME("Logical OR.\n"); + } + +conditional_expr: + logicor_expr + | logicor_expr '?' expr ':' assignment_expr + { + FIXME("Ternary operator.\n"); + } + +assignment_expr: + + conditional_expr + | unary_expr assign_op assignment_expr + { + struct hlsl_ir_node *lhs = node_from_list($1), *rhs = node_from_list($3); + + if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "l-value is const"); + YYABORT; + } + list_move_tail($3, $1); + vkd3d_free($1); + if (!add_assignment($3, lhs, $2, rhs)) + YYABORT; + $$ = $3; + } + +assign_op: + '=' + { + $$ = ASSIGN_OP_ASSIGN; + } + | OP_ADDASSIGN + { + $$ = ASSIGN_OP_ADD; + } + | OP_SUBASSIGN + { + $$ = ASSIGN_OP_SUB; + } + | OP_MULASSIGN + { + $$ = ASSIGN_OP_MUL; + } + | OP_DIVASSIGN + { + $$ = ASSIGN_OP_DIV; + } + | OP_MODASSIGN + { + $$ = ASSIGN_OP_MOD; + } + | OP_LEFTSHIFTASSIGN + { + $$ = ASSIGN_OP_LSHIFT; + } + | OP_RIGHTSHIFTASSIGN + { + $$ = ASSIGN_OP_RSHIFT; + } + | OP_ANDASSIGN + { + $$ = ASSIGN_OP_AND; + } + | OP_ORASSIGN + { + $$ = ASSIGN_OP_OR; + } + | OP_XORASSIGN + { + $$ = ASSIGN_OP_XOR; + } + +expr: + assignment_expr + | expr ',' assignment_expr + { + $$ = $1; + list_move_tail($$, $3); + vkd3d_free($3); + } + +%% + +static struct source_location get_location(const struct YYLTYPE *l) +{ + const struct source_location loc = + { + .file = hlsl_ctx.source_file, + .line = l->first_line, + .col = l->first_column, + }; + return loc; +} + +static void dump_function_decl(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function_decl *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + + if (func->body) + debug_dump_ir_function_decl(func); +} + +static void dump_function(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + rb_for_each_entry(&func->overloads, dump_function_decl, NULL); +} + +/* Allocate a unique, ordered index to each instruction, which will be used for + * computing liveness ranges. */ +static unsigned int index_instructions(struct list *instrs, unsigned int index) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + instr->index = index++; + + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = if_from_node(instr); + index = index_instructions(&iff->then_instrs, index); + index = index_instructions(&iff->else_instrs, index); + } + else if (instr->type == HLSL_IR_LOOP) + { + index = index_instructions(&loop_from_node(instr)->body, index); + loop_from_node(instr)->next_index = index; + } + } + + return index; +} + +/* Compute the earliest and latest liveness for each variable. In the case that + * a variable is accessed inside of a loop, we promote its liveness to extend + * to at least the range of the entire loop. Note that we don't need to do this + * for anonymous nodes, since there's currently no way to use a node which was + * calculated in an earlier iteration of the loop. */ +static void compute_liveness_recurse(struct list *instrs, unsigned int loop_first, unsigned int loop_last) +{ + struct hlsl_ir_node *instr; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + { + struct hlsl_ir_assignment *assignment = assignment_from_node(instr); + + var = assignment->lhs.var; + if (!var->first_write) + var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; + assignment->rhs.node->last_read = instr->index; + if (assignment->lhs.offset.node) + assignment->lhs.offset.node->last_read = instr->index; + break; + } + case HLSL_IR_EXPR: + { + struct hlsl_ir_expr *expr = expr_from_node(instr); + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) + expr->operands[i].node->last_read = instr->index; + break; + } + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = if_from_node(instr); + + compute_liveness_recurse(&iff->then_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->else_instrs, loop_first, loop_last); + iff->condition.node->last_read = instr->index; + break; + } + case HLSL_IR_LOAD: + { + struct hlsl_ir_load *load = load_from_node(instr); + + var = load->src.var; + var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; + if (load->src.offset.node) + load->src.offset.node->last_read = instr->index; + break; + } + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = loop_from_node(instr); + + compute_liveness_recurse(&loop->body, loop_first ? loop_first : instr->index, + loop_last ? loop_last : loop->next_index); + break; + } + case HLSL_IR_SWIZZLE: + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(instr); + + swizzle->val.node->last_read = instr->index; + break; + } + case HLSL_IR_CONSTANT: + case HLSL_IR_JUMP: + break; + } + } +} + +static void compute_liveness(struct hlsl_ir_function_decl *entry_func) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &hlsl_ctx.globals->vars, struct hlsl_ir_var, scope_entry) + { + var->first_write = 1; + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->modifiers & HLSL_STORAGE_IN) + var->first_write = 1; + if (var->modifiers & HLSL_STORAGE_OUT) + var->last_read = UINT_MAX; + } + + if (entry_func->return_var) + entry_func->return_var->last_read = UINT_MAX; + + compute_liveness_recurse(entry_func->body, 0, 0); +} + +int hlsl_parser_compile(enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + struct hlsl_ir_function_decl *entry_func; + struct hlsl_scope *scope, *next_scope; + struct hlsl_type *hlsl_type, *next_type; + struct hlsl_ir_var *var, *next_var; + int ret = VKD3D_ERROR; + unsigned int i; + + hlsl_ctx.status = PARSE_SUCCESS; + hlsl_ctx.message_context = message_context; + hlsl_ctx.line_no = hlsl_ctx.column = 1; + hlsl_ctx.source_file = vkd3d_strdup(""); + hlsl_ctx.source_files = vkd3d_malloc(sizeof(*hlsl_ctx.source_files)); + if (hlsl_ctx.source_files) + hlsl_ctx.source_files[0] = hlsl_ctx.source_file; + hlsl_ctx.source_files_count = 1; + hlsl_ctx.cur_scope = NULL; + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + list_init(&hlsl_ctx.scopes); + list_init(&hlsl_ctx.types); + init_functions_tree(&hlsl_ctx.functions); + list_init(&hlsl_ctx.static_initializers); + + push_scope(&hlsl_ctx); + hlsl_ctx.globals = hlsl_ctx.cur_scope; + declare_predefined_types(hlsl_ctx.globals); + + hlsl_parse(); + + if (hlsl_ctx.status == PARSE_ERR) + goto out; + + if (!(entry_func = get_func_entry(entrypoint))) + { + hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint)); + goto out; + } + + if (!type_is_void(entry_func->return_type) + && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) + { + hlsl_report_message(entry_func->loc, HLSL_LEVEL_ERROR, + "entry point \"%s\" is missing a return value semantic", entry_func->func->name); + } + + list_move_head(entry_func->body, &hlsl_ctx.static_initializers); + + /* Index 0 means unused; index 1 means function entry, so start at 2. */ + index_instructions(entry_func->body, 2); + + if (TRACE_ON()) + { + TRACE("IR dump.\n"); + rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL); + } + + compute_liveness(entry_func); + + if (hlsl_ctx.status != PARSE_ERR) + ret = VKD3D_ERROR_NOT_IMPLEMENTED; + +out: + for (i = 0; i < hlsl_ctx.source_files_count; ++i) + vkd3d_free((void *)hlsl_ctx.source_files[i]); + vkd3d_free(hlsl_ctx.source_files); + + TRACE("Freeing functions IR.\n"); + rb_destroy(&hlsl_ctx.functions, free_function_rb, NULL); + + TRACE("Freeing variables.\n"); + LIST_FOR_EACH_ENTRY_SAFE(scope, next_scope, &hlsl_ctx.scopes, struct hlsl_scope, entry) + { + LIST_FOR_EACH_ENTRY_SAFE(var, next_var, &scope->vars, struct hlsl_ir_var, scope_entry) + free_declaration(var); + rb_destroy(&scope->types, NULL, NULL); + vkd3d_free(scope); + } + + TRACE("Freeing types.\n"); + LIST_FOR_EACH_ENTRY_SAFE(hlsl_type, next_type, &hlsl_ctx.types, struct hlsl_type, entry) + free_hlsl_type(hlsl_type); + + return ret; +} diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e9c462e5..cab5b80d 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1220,6 +1220,15 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type) case VKD3D_SHADER_TYPE_COMPUTE: return "cs"; + case VKD3D_SHADER_TYPE_EFFECT: + return "fx"; + + case VKD3D_SHADER_TYPE_TEXTURE: + return "tx"; + + case VKD3D_SHADER_TYPE_LIBRARY: + return "lib"; + default: FIXME("Unhandled shader type %#x.\n", type); return "unknown"; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index df3b1a57..ff917dbf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -225,7 +225,7 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v } } -static void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) { static bool enabled = true; const char *path; @@ -961,7 +961,16 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { - return VKD3D_ERROR_NOT_IMPLEMENTED; + struct vkd3d_shader_code preprocessed; + int ret; + + if ((ret = preproc_lexer_parse(compile_info, &preprocessed, message_context))) + return ret; + + ret = hlsl_compile_shader(preprocessed.code, compile_info, out, message_context); + + vkd3d_shader_free_shader_code(&preprocessed); + return ret; } int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 12edfae1..52196caf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -548,6 +548,10 @@ enum vkd3d_shader_type VKD3D_SHADER_TYPE_GRAPHICS_COUNT, VKD3D_SHADER_TYPE_COMPUTE = VKD3D_SHADER_TYPE_GRAPHICS_COUNT, + + VKD3D_SHADER_TYPE_EFFECT, + VKD3D_SHADER_TYPE_TEXTURE, + VKD3D_SHADER_TYPE_LIBRARY, VKD3D_SHADER_TYPE_COUNT, }; @@ -884,6 +888,8 @@ void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const str void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) DECLSPEC_HIDDEN; + int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; @@ -909,6 +915,9 @@ void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksu int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; +int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) { -- 2.30.0

3 2

[PATCH v2 1/3] dxgi/tests: Test removing WS_EX_TOPMOST on a swapchain's fullscreen state output window.
by Gabriel Ivăncescu 29 Jan '21

29 Jan '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: - Check for WS_EX_TOPMOST before removing it. - Get rid of broken() on recent Windows 10 builds by using ResizeBuffers. - Test Present with the DXGI_PRESENT_TEST flag. - Test on hidden window as well. (it seems reliable enough, perhaps I messed up by clicking on stuff by mistake while it was running) dlls/dxgi/tests/dxgi.c | 86 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2d8826f..6c9f293 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2826,10 +2826,94 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_VISIBLE, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + ok(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST, "Did not get WS_EX_TOPMOST.\n"); + + /* Removing topmost style makes the swapchain lose fullscreen state on next Present */ + SetWindowPos(swapchain_desc.OutputWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + flush_events(); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* But not if the window is hidden */ + ShowWindow(swapchain_desc.OutputWindow, SW_HIDE); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE) & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + ok(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST, "Did not get WS_EX_TOPMOST.\n"); + + SetWindowPos(swapchain_desc.OutputWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_HIDEWINDOW); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE) & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + flush_events(); + + hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + DestroyWindow(swapchain_desc.OutputWindow); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); -- 2.29.2

2 3

[PATCH] ieframe: Implement SetQueryNetSessionCount.
by Jacek Caban 29 Jan '21

29 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/ieframe.h | 9 +++++++ dlls/ieframe/ieframe.spec | 1 + dlls/ieframe/ieframe_main.c | 22 ++++++++++++++++ dlls/ieframe/oleobject.c | 1 + dlls/ieframe/tests/webbrowser.c | 45 +++++++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+)

2 1

[PATCH 1/3] dxgi/tests: Test removing WS_EX_TOPMOST on a swapchain's fullscreen state output window.
by Gabriel Ivăncescu 29 Jan '21

29 Jan '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/dxgi/tests/dxgi.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2d8826f..14cb555 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2826,10 +2826,47 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", WS_VISIBLE, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + + /* Removing topmost style makes the swapchain lose fullscreen state on next Present */ + SetWindowPos(swapchain_desc.OutputWindow, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE); + ok(!(GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE) & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + flush_events(); + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == DXGI_ERROR_INVALID_CALL) /* Win10 1809 */, "Got unexpected hr %#x.\n", hr); + if (hr != DXGI_ERROR_INVALID_CALL) + { + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + DestroyWindow(swapchain_desc.OutputWindow); + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); -- 2.29.2

3 6

[PATCH 1/7] mf/tests: Use interface check helper more.
by Nikolay Sivov 29 Jan '21

29 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8272064466f..34090d0a9d4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; - IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -1163,7 +1162,6 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; - IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1176,23 +1174,19 @@ static void test_media_session(void) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + check_interface(session, &IID_IMFAttributes, FALSE); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, - (void **)&local_reg); + hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); if (SUCCEEDED(hr)) - IMFLocalMFTRegistration_Release(local_reg); + IUnknown_Release(unk); hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); @@ -1220,6 +1214,8 @@ static void test_media_session(void) hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); @@ -1241,8 +1237,6 @@ todo_wine IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); - IMFGetService_Release(gs); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); -- 2.29.2

2 8

[PATCH] wldap32: log in with the authentication name instead of the authorization name
by Damjan Jovanovic 29 Jan '21

29 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50572 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wldap32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

3 5

[PATCH v2 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang 29 Jan '21

29 Jan '21

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/bitmap.c | 1 - dlls/user32/tests/monitor.c | 3 -- 6 files changed, 74 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b2..b8071dc2155 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2783,7 +2783,6 @@ static void test_CreateBitmap(void) "0: %p, 1: %p, 4: %p, 5: %p, curObj1 %p, old1 %p\n", bm, bm1, bm4, bm5, curObj1, old1); ok(bm != bm2 && bm != bm3, "0: %p, 2: %p, 3: %p\n", bm, bm2, bm3); -todo_wine ok(bm != curObj2, "0: %p, curObj2 %p\n", bm, curObj2); ok(old2 == 0, "old2 %p\n", old2); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0

[PATCH v2 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 29 Jan '21

29 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 198913~198914. Remove a todo_wine for a test that succeeds now. dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..926b288da11 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1995,7 +2000,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2023,6 +2031,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

1 0

[PATCH] user32/clipboard: Set bitmap and palette handles as system object.
by Jactry Zeng 29 Jan '21

29 Jan '21

This fixes an issue of WeChat's screenshot function that bitmap isn't available to be copied to the input box. Inspired by a PoC from Zhiyi. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/clipboard.c | 9 +++- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 3d17b658e45..3e39a2d9ded 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -41,6 +41,7 @@ #include "user_private.h" #include "win.h" +#include "wine/gdi_driver.h" #include "wine/list.h" #include "wine/server.h" #include "wine/debug.h" @@ -302,8 +303,9 @@ static void free_cached_data( struct cached_format *cache ) switch (cache->format) { case CF_BITMAP: - case CF_DSPBITMAP: case CF_PALETTE: + __wine_make_gdi_object_system( cache->handle, FALSE ); + case CF_DSPBITMAP: DeleteObject( cache->handle ); break; case CF_ENHMETAFILE: @@ -886,6 +888,11 @@ HANDLE WINAPI SetClipboardData( UINT format, HANDLE data ) if (!(cache = HeapAlloc( GetProcessHeap(), 0, sizeof(*cache) ))) goto done; cache->format = format; cache->handle = data; + + if (format == CF_BITMAP || format == CF_PALETTE) + { + __wine_make_gdi_object_system( cache->handle , TRUE ); + } } EnterCriticalSection( &clipboard_cs ); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..e24db5851ca 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1779,10 +1779,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -1895,6 +1899,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = OpenClipboard( hwnd ); + ok( r, "OpenClipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC(0), h, 0, 0, NULL, &bmi, 0 ); + ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC(0), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.29.2

2 1

[tools] winetest/dissect: Improve the documentation of the missing start line handling.
by Francois Gouget 29 Jan '21

29 Jan '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index e9729dbc8..27bcf1704 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -717,23 +717,28 @@ while ($line = <IN>) { if ($l_dll ne $dll or $l_unit ne $unit) { - # First close the current test unit taking into account - # it may have been polluted by the new one. + # Warn about the missing start line in the current test unit box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; + + # And close the current test unit taking into account + # it may have been polluted by the new one. $broken = 1; close_test_unit(0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); $units_re = $unit; + $broken = 1; $testbox = create_test_unit_box(); + # Finally, warn about the missing start line in the new test unit + # box. add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); $extra_failures++; - $broken = 1; } my $class = $l_rc ? "failed" : ""; -- 2.20.1

1 0

[tools] testbot/LogUtils: Fix handling of new test units with no start line.
by Francois Gouget 29 Jan '21

29 Jan '21

Create a real new test unit object so $Cur->{LineFailures} is not counted multiple times. This matches the winetest parser behavior. Improve the documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the failure count reported in this wtbsuite test: WTBS A test unit with no start line (browseui:progressdlg). testbot/lib/WineTestBot/LogUtils.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1b4ee7a28..15ec31a42 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,11 +675,14 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1; _CloseTestUnit($LogInfo, $Cur, 0); - # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. - ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too so set IsBroken. + $Cur = _NewCurrentUnit($Dll, $Unit); $Cur->{IsBroken} = 1; + + # Finally, warn about the missing start line. + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); } if ($Rc == 258) -- 2.20.1

1 0

[PATCH 2/2] gdi32: Create a bitmap of the size of the virtual screen for display DCs.
by Zhiyi Zhang 29 Jan '21

29 Jan '21

Fix a bug that WeChat screenshot is black when there is only one monitor. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 11 ++++++- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 5 +++ dlls/gdi32/gdiobj.c | 61 +++++++++++++++++++++++++++++++++++-- dlls/user32/tests/monitor.c | 3 -- 5 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 830fabf6e78..16aea2933aa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -649,7 +649,16 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; - dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + if (!lstrcmpiW( driver, L"DISPLAY" ) || is_display_device( driver ) || is_display_device( device )) + { + dc->display_dc = 1; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DISPLAY_BITMAP )); + } + else + { + dc->display_dc = 0; + dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); + } TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e146a3a4f85..d59061066a3 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -85,7 +85,7 @@ static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM) static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); -static INT (WINAPI *pGetSystemMetrics)(INT); +INT (WINAPI *pGetSystemMetrics)(INT) = NULL; static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..13865f37ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -47,6 +47,8 @@ typedef struct { /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) +/* extra stock object: the bitmap for display DCs */ +#define DISPLAY_BITMAP (STOCK_LAST+2) struct gdi_obj_funcs { @@ -72,6 +74,7 @@ typedef struct tagDC DCHOOKPROC hookProc; /* DC hook */ BOOL bounds_enabled:1; /* bounds tracking is enabled */ BOOL path_open:1; /* path is currently open (only for saved DCs) */ + BOOL display_dc:1; /* Whether this DC is a display DC */ POINT wnd_org; /* Window origin */ SIZE wnd_ext; /* Window extent */ @@ -761,4 +764,6 @@ extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; +extern INT (WINAPI *pGetSystemMetrics)( INT ) DECLSPEC_HIDDEN; + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 2309fdac582..bda1cf387be 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winnls.h" #include "winerror.h" @@ -101,12 +102,13 @@ static const LOGPEN NullPen = { PS_NULL, { 0, 0 }, 0 }; static const LOGBRUSH DCBrush = { BS_SOLID, RGB(255,255,255), 0 }; static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; -/* reserve one extra entry for the stock default bitmap */ +/* reserve extra entries for the stock default bitmap and a bitmap for display DCs */ /* this is what Windows does too */ -#define NB_STOCK_OBJECTS (STOCK_LAST+2) +#define NB_STOCK_OBJECTS (STOCK_LAST+3) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; +static SIZE display_bitmap_size = { 1, 1 }; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -642,6 +644,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) stock_objects[DEFAULT_PALETTE] = PALETTE_Init(); stock_objects[DEFAULT_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); + stock_objects[DISPLAY_BITMAP] = CreateBitmap( 1, 1, 1, 1, NULL ); /* language-independent stock fonts */ stock_objects[OEM_FIXED_FONT] = CreateFontIndirectW( &OEMFixedFont ); @@ -1007,6 +1010,9 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { + HBITMAP bitmap; + SIZE size; + if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; switch (obj) { @@ -1016,6 +1022,32 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) case DEFAULT_GUI_FONT: if (get_system_dpi() != 96) return scaled_stock_objects[obj]; break; + case DISPLAY_BITMAP: + { + EnterCriticalSection( &gdi_section ); + + if (pGetSystemMetrics) + { + size.cx = pGetSystemMetrics( SM_CXVIRTUALSCREEN ); + size.cy = pGetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (size.cx != display_bitmap_size.cx || size.cy != display_bitmap_size.cy) + { + if ((bitmap = CreateBitmap( size.cx, size.cy, 1, 32, NULL ))) + { + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], FALSE ); + if (!GDI_get_ref_count( stock_objects[DISPLAY_BITMAP] )) + DeleteObject( stock_objects[DISPLAY_BITMAP] ); + stock_objects[DISPLAY_BITMAP] = bitmap; + display_bitmap_size = size; + __wine_make_gdi_object_system( stock_objects[DISPLAY_BITMAP], TRUE ); + } + } + } + + bitmap = stock_objects[DISPLAY_BITMAP]; + LeaveCriticalSection( &gdi_section ); + return bitmap; + } } return stock_objects[obj]; } @@ -1125,6 +1157,7 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) { HGDIOBJ ret = 0; DC * dc = get_dc_ptr( hdc ); + HBITMAP display_bitmap; if (!dc) return 0; @@ -1134,7 +1167,29 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) case OBJ_BRUSH: ret = dc->hBrush; break; case OBJ_PAL: ret = dc->hPalette; break; case OBJ_FONT: ret = dc->hFont; break; - case OBJ_BITMAP: ret = dc->hBitmap; break; + case OBJ_BITMAP: + { + if (dc->display_dc) + { + EnterCriticalSection( &gdi_section ); + + display_bitmap = GetStockObject( DISPLAY_BITMAP ); + if (dc->hBitmap != display_bitmap) + { + GDI_dec_ref_count( dc->hBitmap ); + dc->hBitmap = GDI_inc_ref_count( display_bitmap ); + } + + ret = dc->hBitmap; + LeaveCriticalSection( &gdi_section ); + } + else + { + ret = dc->hBitmap; + } + + break; + } /* tests show that OBJ_REGION is explicitly ignored */ case OBJ_REGION: break; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 926b288da11..adea730f65f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2039,13 +2039,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ if (ret) { ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); - todo_wine ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); - todo_wine ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); - todo_wine ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), -- 2.27.0

1 0

[PATCH 1/2] user32/tests: Add display DC bitmap tests.
by Zhiyi Zhang 29 Jan '21

29 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 58b3f0d5e0c..926b288da11 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -68,6 +68,11 @@ static void flush_events(void) } } +static int get_bitmap_stride(int width, int bpp) +{ + return ((width * bpp + 15) >> 3) & ~1; +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -1995,7 +2000,10 @@ static void test_handles(void) #define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) { + BITMAP bitmap; + HBITMAP hbmp; INT value; + BOOL ret; value = GetDeviceCaps(hdc, HORZRES); todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) @@ -2023,6 +2031,29 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); + + hbmp = GetCurrentObject(hdc, OBJ_BITMAP); + ok_(__FILE__, line)(!!hbmp, "GetCurrentObject failed, error %#x.\n", GetLastError()); + ret = GetObjectA(hbmp, sizeof(bitmap), &bitmap); + ok_(__FILE__, line)(ret || broken(!ret), /* <= Win7 */ "GetObjectA failed, error %#x.\n", GetLastError()); + if (ret) + { + ok_(__FILE__, line)(bitmap.bmType == 0, "Expected bmType %d, got %d.\n", 0, bitmap.bmType); + todo_wine + ok_(__FILE__, line)(bitmap.bmWidth == GetSystemMetrics(SM_CXVIRTUALSCREEN), + "Expected bmWidth %d, got %d.\n", GetSystemMetrics(SM_CXVIRTUALSCREEN), bitmap.bmWidth); + todo_wine + ok_(__FILE__, line)(bitmap.bmHeight == GetSystemMetrics(SM_CYVIRTUALSCREEN), + "Expected bmHeight %d, got %d.\n", GetSystemMetrics(SM_CYVIRTUALSCREEN), bitmap.bmHeight); + todo_wine + ok_(__FILE__, line)(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), + "Expected bmBitsPixel %d, got %d.\n", GetDeviceCaps(hdc, BITSPIXEL), bitmap.bmBitsPixel); + ok_(__FILE__, line)(bitmap.bmWidthBytes == get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + "Expected bmWidthBytes %d, got %d.\n", get_bitmap_stride(bitmap.bmWidth, bitmap.bmBitsPixel), + bitmap.bmWidthBytes); + ok_(__FILE__, line)(bitmap.bmPlanes == 1, "Expected bmPlanes %d, got %d.\n", 1, bitmap.bmPlanes); + ok_(__FILE__, line)(bitmap.bmBits == NULL, "Expected bmBits %p, got %p.\n", NULL, bitmap.bmBits); + } } static void test_display_dc(void) -- 2.27.0

1 0

[PATCH 1/3] wineboot: Set the NXSupportPolicy member of the user shared data to NX_SUPPORT_POLICY_OPTIN.
by Zebediah Figura 29 Jan '21

29 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I have been unable to locate a program that requires these. (However, due to ease of implementation, and the fact that the ntdll side of ProcessExecuteFlags is already implemented, I am inclined to believe that they're worth implementing anyway.) programs/wineboot/wineboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 05a5ee6aa62..9427448b612 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -291,6 +291,7 @@ static void create_user_shared_data(void) data->NtMinorVersion = version.dwMinorVersion; data->SuiteMask = version.wSuiteMask; data->NumberOfPhysicalPages = sbi.MmNumberOfPhysicalPages; + data->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; wcscpy( data->NtSystemRoot, L"C:\\windows" ); features = data->ProcessorFeatures; -- 2.30.0

1 2

[tools] testbot/TestWTBS: Automatically check the 'Task:' build and wine lines.
by Francois Gouget 29 Jan '21

29 Jan '21

The automatic checks only cover the simple cases which is the majority, thus allowing to simplify the TestWTBS directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 6f78406ad..bc4e0d9ba 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -362,14 +362,43 @@ sub LoadTestInfo($) foreach my $TaskType (@$TaskTypes) { my $TaskInfo = $TestInfo->{$TaskType}; - if (!defined $TaskInfo->{$Field}) - { - $TaskInfo->{$Field} = $SrcVal; - } + next if (defined $TaskInfo->{$Field}); + # Copy arrays to avoid side-effects when adding built-in defaults + $TaskInfo->{$Field} = ref($SrcVal) eq "ARRAY" ? [ @$SrcVal ] : $SrcVal; } } } + # Automatically check the Task: lines in simple cases + # Make sure no test is run for build tasks + my $GrepV = ($TestInfo->{build}->{"report.GrepV"} ||= []); + push @$GrepV, '.'; + $GrepV = ($TestInfo->{build}->{"log.GrepV"} ||= []); + push @$GrepV, '^Task: tests$'; + if (($TestInfo->{build}->{Status} || "") =~ /^bad(?:build|patch)$/ or + $TestInfo->{build}->{HasTimeout}) + { + push @$GrepV, '^Task: ok$'; + } + else + { + my $Grep = ($TestInfo->{build}->{"log.Grep"} ||= []); + push @$Grep, '^Task: ok$'; + } + + # Note: Depending on where the timeout occurs, the wine task log may or + # may not have a 'Task: ok' line. + if (($TestInfo->{wine}->{Status} || "") eq "completed" and + !$TestInfo->{wine}->{HasTimeout}) + { + my $Grep = ($TestInfo->{wine}->{"log.Grep"} ||= []); + if (CheckValue($TestInfo->{wine}->{TestUnits})) + { + push @$Grep, '^Task: tests$'; + } + push @$Grep, '^Task: ok$'; + } + # Validate and fix the Grep* fields foreach my $GrepType ("Grep", "GrepV") { -- 2.20.1

1 0

MAXPNAMELEN
by Doug Kingston 29 Jan '21

29 Jan '21

dlls/include/mmsystem.h:#define MAXPNAMELEN 32 /* max product name length (including NULL) */ I wanted to know what the reason was for bounding this string to only 32 bytes (actually 31 + null). We have a situation with identical devices and need to add some differentiating text to that string when multiple identical devices exist so that applications can choose the correct device. Our device product string is "USB PnP Sound Device" (20 chars). mmdevdrv.c:static WCHAR *construct_device_id() then prefixs with either "In: " (4 chars) or "Out: " (5 chars) and concatenates " - USB" (6 chars). In: USB PnP Sound Device - USB Out: USB PnP Sound Device - USB Total string length is 30 or 31 characters. Any additional text added at the end will get truncated and a prefix will cause the existing string to be truncated. -Doug-

3 2

[PATCH 1/4] winegstreamer: Do not flush the upstream source pin in activate_push().
by Zebediah Figura 29 Jan '21

29 Jan '21

We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) { -- 2.30.0

1 3

[PATCH 1/2] loader: On Mac, move the top-down allocations area down to avoid Rosetta regions.
by Brendan Shanks 28 Jan '21

28 Jan '21

On Apple Silicon, Rosetta's shared cache starts at 0x7ffe00000000 and the runtime is mapped below that. Put the top-down allocation area below the runtime with plenty of room to spare. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- loader/preloader_mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e6..d86675538bb 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -79,7 +79,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ - { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ + { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ -- 2.26.2

1 1

[PATCH] secur32: implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute
by Damjan Jovanovic 28 Jan '21

28 Jan '21

.NET's System.Data.SqlClient needs this to connect to MSSQL Server. A MacOSX implementation doesn't appear to be possible. Try 3 uses free() instead of gnutls_free(), and prints a FIXME on MacOS. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/secur32/schannel.c | 7 +++++++ dlls/secur32/schannel_gnutls.c | 37 ++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 7 +++++++ dlls/secur32/secur32_priv.h | 2 ++ dlls/secur32/tests/schannel.c | 26 ++++++++++++++++++++++++ 5 files changed, 79 insertions(+)

2 1

[PATCH 1/4] include: Add IWMPRemoteMediaServices interface to wmp.idl.
by Rémi Bernon 28 Jan '21

28 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmp.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/wmp.idl b/include/wmp.idl index 442b7021383..8a146bdbea9 100644 --- a/include/wmp.idl +++ b/include/wmp.idl @@ -360,6 +360,22 @@ library WMPLib { HRESULT playItem([in] IWMPMedia *pIWMPMedia); } + [ + odl, + uuid(cbb92747-741f-44fe-ab5b-f1a48f3b2a59), + oleautomation + ] + interface IWMPRemoteMediaServices : IUnknown + { + HRESULT GetServiceType([out, retval] BSTR *type); + + HRESULT GetApplicationName([out, retval] BSTR *name); + + HRESULT GetScriptableObject([out, retval] BSTR *name, [out, retval] IDispatch **out); + + HRESULT GetCustomUIMode([out, retval] BSTR *file); + } + [ odl, uuid(9104d1ab-80c9-4fed-abf0-2e6417a6df14), -- 2.30.0

1 3

[PATCH] cmd: Match the Windows ver output.
by Francois Gouget 28 Jan '21

28 Jan '21

Some programs parse this string to get the Windows version! Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- cmd seems to use the same string for "cmd /c ver" and the first line of "cmd /?". On Windows 10 neither string is translated in the locales I checked (French, Japanese, Chinese, Hebrew). That does not prove it's never translated but it does look like it isn't. So maybe that justifies moving the string out of the resource file so it does not appear in the PO files. If so I can resubmit a modified version. programs/cmd/cmd.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc index fa604a6db56..04401dc4886 100644 --- a/programs/cmd/cmd.rc +++ b/programs/cmd/cmd.rc @@ -393,7 +393,7 @@ Enter HELP <command> for further information on any of the above commands.\n" WCMD_NOPATH, "PATH not found\n" WCMD_ANYKEY,"Press any key to continue... " WCMD_CONSTITLE,"Wine Command Prompt" - WCMD_VERSION,"Microsoft Windows %1!S!\n" + WCMD_VERSION,"Microsoft Windows [Version %1!S!]\n" WCMD_MOREPROMPT, "More? " WCMD_LINETOOLONG, "The input line is too long.\n" WCMD_VOLUMELABEL, "Volume in drive %1!c! is %2\n" -- 2.20.1

2 2

[PATCH vkd3d 1/6] vkd3d: Fix typo in WARN() message.
by Matteo Bruni 28 Jan '21

28 Jan '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e5c6791..8b84451 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -195,7 +195,7 @@ static uint64_t vkd3d_queue_reset_sequence_number_locked(struct vkd3d_queue *que { unsigned int i; - WARN("Ressetting sequence number for queue %p.\n", queue); + WARN("Resetting sequence number for queue %p.\n", queue); queue->completed_sequence_number = 0; queue->submitted_sequence_number = 1; -- 2.26.2

5 18

[PATCH v2] secur32: implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute
by Damjan Jovanovic 28 Jan '21

28 Jan '21

.NET's System.Data.SqlClient needs this to connect to MSSQL Server. A MacOSX implementation doesn't appear to be possible. Try 2 doesn't free the GNUTLS datum when its allocation failed. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/secur32/schannel.c | 7 ++++++ dlls/secur32/schannel_gnutls.c | 39 ++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 ++++++ dlls/secur32/secur32_priv.h | 2 ++ dlls/secur32/tests/schannel.c | 26 +++++++++++++++++++++++ 5 files changed, 80 insertions(+)

2 1

[PATCH 1/4] tzres: Regenerate TZ data.
by Giovanni Mascellani 28 Jan '21

28 Jan '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/tzres/tzres.rc | 52 ++ loader/wine.inf.in | 1616 +++++++++++++++++++++++++++++----- tools/parse_windows_zones.py | 509 +++++++++++ 3 files changed, 1951 insertions(+), 226 deletions(-) create mode 100755 tools/parse_windows_zones.py diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 8779c62b360..07c3c2b4c8f 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -32,6 +32,8 @@ STRINGTABLE 50193 "Alaskan Daylight Time" 55200 "Aleutian Standard Time" 55201 "Aleutian Daylight Time" + 4464 "Altai Standard Time" + 4465 "Altai Daylight Time" 41968 "Arab Standard Time" 41969 "Arab Daylight Time" 42704 "Arabian Standard Time" @@ -40,6 +42,8 @@ STRINGTABLE 8769 "Arabic Daylight Time" 19584 "Argentina Standard Time" 19585 "Argentina Daylight Time" + 25104 "Astrakhan Standard Time" + 25105 "Astrakhan Daylight Time" 34224 "Atlantic Standard Time" 34225 "Atlantic Daylight Time" 47024 "AUS Central Standard Time" @@ -96,6 +100,8 @@ STRINGTABLE 62721 "E. Africa Daylight Time" 65264 "E. Australia Standard Time" 65265 "E. Australia Daylight Time" + 32128 "E. Europe Standard Time" + 32129 "E. Europe Daylight Time" 64096 "E. South America Standard Time" 64097 "E. South America Daylight Time" 58592 "Easter Island Standard Time" @@ -174,12 +180,16 @@ STRINGTABLE 54897 "New Zealand Daylight Time" 9504 "Newfoundland Standard Time" 9505 "Newfoundland Daylight Time" + 47440 "Norfolk Standard Time" + 47441 "Norfolk Daylight Time" 19056 "North Asia East Standard Time" 19057 "North Asia East Daylight Time" 304 "North Asia Standard Time" 305 "North Asia Daylight Time" 35888 "North Korea Standard Time" 35889 "North Korea Daylight Time" + 55952 "Omsk Standard Time" + 55953 "Omsk Daylight Time" 65008 "Pacific SA Standard Time" 65009 "Pacific SA Daylight Time" 11232 "Pacific Standard Time" @@ -190,8 +200,16 @@ STRINGTABLE 28753 "Pakistan Daylight Time" 50224 "Paraguay Standard Time" 50225 "Paraguay Daylight Time" + 53760 "Qyzylorda Standard Time" + 53761 "Qyzylorda Daylight Time" 45104 "Romance Standard Time" 45105 "Romance Daylight Time" + 59264 "Russia Time Zone 10" + 59265 "Russia Time Zone 10" + 46000 "Russia Time Zone 11" + 46001 "Russia Time Zone 11" + 17920 "Russia Time Zone 3" + 17921 "Russia Time Zone 3" 44560 "Russian Standard Time" 44561 "Russian Daylight Time" 40656 "SA Eastern Standard Time" @@ -202,8 +220,14 @@ STRINGTABLE 57121 "SA Western Daylight Time" 5584 "Saint Pierre Standard Time" 5585 "Saint Pierre Daylight Time" + 35104 "Sakhalin Standard Time" + 35105 "Sakhalin Daylight Time" 14592 "Samoa Standard Time" 14593 "Samoa Daylight Time" + 5984 "Sao Tome Standard Time" + 5985 "Sao Tome Daylight Time" + 33808 "Saratov Standard Time" + 33809 "Saratov Daylight Time" 53728 "SE Asia Standard Time" 53729 "SE Asia Daylight Time" 61840 "Singapore Standard Time" @@ -212,6 +236,8 @@ STRINGTABLE 38897 "South Africa Daylight Time" 39408 "Sri Lanka Standard Time" 39409 "Sri Lanka Daylight Time" + 9792 "Sudan Standard Time" + 9793 "Sudan Daylight Time" 46576 "Syria Standard Time" 46577 "Syria Daylight Time" 26432 "Taipei Standard Time" @@ -222,10 +248,16 @@ STRINGTABLE 43073 "Tocantins Daylight Time" 16240 "Tokyo Standard Time" 16241 "Tokyo Daylight Time" + 29136 "Tomsk Standard Time" + 29137 "Tomsk Daylight Time" 7216 "Tonga Standard Time" 7217 "Tonga Daylight Time" + 31472 "Transbaikal Standard Time" + 31473 "Transbaikal Daylight Time" 24848 "Turkey Standard Time" 24849 "Turkey Daylight Time" + 20560 "Turks And Caicos Standard Time" + 20561 "Turks And Caicos Daylight Time" 47200 "Ulaanbaatar Standard Time" 47201 "Ulaanbaatar Daylight Time" 34928 "US Eastern Standard Time" @@ -234,20 +266,40 @@ STRINGTABLE 37473 "US Mountain Daylight Time" 22000 "Coordinated Universal Time" 22001 "Coordinated Universal Time" + 1200 "UTC+12" + 1201 "UTC+12" + 8784 "UTC+13" + 8785 "UTC+13" + 37328 "UTC-02" + 37329 "UTC-02" + 3344 "UTC-08" + 3345 "UTC-08" + 39152 "UTC-09" + 39153 "UTC-09" + 19408 "UTC-11" + 19409 "UTC-11" 51472 "Venezuela Standard Time" 51473 "Venezuela Daylight Time" 61376 "Vladivostok Standard Time" 61377 "Vladivostok Daylight Time" + 18048 "Volgograd Standard Time" + 18049 "Volgograd Daylight Time" 65376 "W. Australia Standard Time" 65377 "W. Australia Daylight Time" 64976 "W. Central Africa Standard Time" 64977 "W. Central Africa Daylight Time" 27696 "W. Europe Standard Time" 27697 "W. Europe Daylight Time" + 53952 "W. Mongolia Standard Time" + 53953 "W. Mongolia Daylight Time" 49664 "West Asia Standard Time" 49665 "West Asia Daylight Time" + 46160 "West Bank Standard Time" + 46161 "West Bank Daylight Time" 10224 "West Pacific Standard Time" 10225 "West Pacific Daylight Time" 40576 "Yakutsk Standard Time" 40577 "Yakutsk Daylight Time" + 26288 "Yukon Standard Time" + 26289 "Yukon Daylight Time" } diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d5dd2d5b66b..b118226369c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2761,11 +2761,9 @@ system.ini, drivers32,,"; vidc.IV32=ir32_32.dll" win.ini, mail,,"mapi=1" [Timezones] -; The timezone information (TZI field) comes from the Olson timezone database -; http://www.twinsun.com/tz/tz-link.htm -; The mapping of Windows timezone names to Olson Tzids is based on the -; Unicode.org CLDR data: -; https://www.unicode.org/cldr/charts/latest/supplemental/zone_tzid.html +; Data in this section is generated automatically with the script +; parse_windows_zones.py; see the script's header for help. When +; pasting data here, be careful to keep the last line in the section. HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Display",,"Asia/Kabul" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"Dlt",,"Afghanistan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Afghanistan Standard Time,"MUI_Dlt",,"@tzres.dll,-39617" @@ -2778,20 +2776,58 @@ 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\Dynamic DST,"2000",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2001",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2002",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2003",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2004",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2005",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2008",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Display",,"America/Adak" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Dlt",,"Aleutian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Dlt",,"@tzres.dll,-55201" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"MUI_Std",,"@tzres.dll,-55200" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"Std",,"Aleutian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time,"TZI",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2000",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2001",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2002",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2003",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2004",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2005",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2006",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2007",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2007",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"2008",1,58,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Aleutian Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Display",,"Asia/Barnaul" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Dlt",,"Altai Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Dlt",,"@tzres.dll,-4465" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"MUI_Std",,"@tzres.dll,-4464" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"Std",,"Altai Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Altai Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" @@ -2810,18 +2846,70 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,02,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,04,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,04,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Arabic Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Display",,"America/Buenos_Aires" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Dlt",,"Argentina Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Dlt",,"@tzres.dll,-19585" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"MUI_Std",,"@tzres.dll,-19584" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"Std",,"Argentina Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"FirstEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Argentina Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Display",,"Europe/Astrakhan" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Dlt",,"Astrakhan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Dlt",,"@tzres.dll,-25105" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"MUI_Std",,"@tzres.dll,-25104" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"Std",,"Astrakhan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"2017",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Astrakhan Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Display",,"America/Halifax" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Dlt",,"Atlantic Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Dlt",,"@tzres.dll,-34225" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"MUI_Std",,"@tzres.dll,-34224" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"Std",,"Atlantic Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Atlantic Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Display",,"Australia/Darwin" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"Dlt",,"AUS Central Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Central Standard Time,"MUI_Dlt",,"@tzres.dll,-47025" @@ -2834,13 +2922,12 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2005",1,f3,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2006",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2007",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2008",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2007",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2008",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2009",1,f3,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"2010",1,f3,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\Aus Central W. Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Display",,"Australia/Sydney" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Dlt",,"AUS Eastern Daylight Time" @@ -2848,21 +2935,42 @@ HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Dlt",,"@tzres. HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30368" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"Std",,"AUS Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" -HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\AUS Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2009" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Display",,"Asia/Baku" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Dlt",,"Azerbaijan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.dll,-11313" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Std",,"@tzres.dll,-11312" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Std",,"Azerbaijan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2014",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2016",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azores" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" @@ -2876,28 +2984,69 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Display",,"Asia/Dhaka" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Dlt",,"Bangladesh Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Dlt",,"@tzres.dll,-48721" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"MUI_Std",,"@tzres.dll,-48720" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Std",,"Bangladesh Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"FirstEntry",0x10001,"2009" +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Display",,"Europe/Minsk" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Dlt",,"Belarus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Dlt",,"@tzres.dll,-56577" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"MUI_Std",,"@tzres.dll,-56576" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Display",,"Pacific/Bougainville" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Dlt",,"Bougainville Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Dlt",,"@tzres.dll,-51969" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"MUI_Std",,"@tzres.dll,-51968" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"Std",,"Bougainville Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"FirstEntry",0x10001,"2013" +HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Bougainville Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Display",,"America/Regina" HKLM,%CurrentVersionNT%\Time Zones\Canada Central Standard Time,"Dlt",,"Canada Central Daylight Time" @@ -2917,9 +3066,20 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2011",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2011" +HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Caucasus Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Display",,"Australia/Adelaide" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Dlt",,"Cen. Australia Daylight Time" @@ -2927,37 +3087,71 @@ HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Dlt",,"@tzr HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"MUI_Std",,"@tzres.dll,-38928" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"Std",,"Cen. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time,"TZI",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2005",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2000",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2001",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2002",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2003",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2004",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2005",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2006",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2007",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2008",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" -HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2007",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2008",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"2009",1,c6,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Cen. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2009" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Display",,"America/Guatemala" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Dlt",,"Central America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Dlt",,"@tzres.dll,-36657" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"MUI_Std",,"@tzres.dll,-36656" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"Std",,"Central America Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time,"TZI",1,68,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central America Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Display",,"Asia/Almaty" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Dlt",,"Central Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-8177" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-8176" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"Std",,"Central Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Central Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2005" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Display",,"America/Cuiaba" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Dlt",,"Central Brazilian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Dlt",,"@tzres.dll,-56337" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"MUI_Std",,"@tzres.dll,-56336" HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"Std",,"Central Brazilian Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,df,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2023",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,e7,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2026",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,ea,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2034",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f2,07,02,00,00,00,1a,00,00,00,00,00,00,00,00,00,f2,07,0a,00,00,00,0f,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2037",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,02,00,00,00,16,00,00,00,00,00,00,00,00,00,f5,07,0a,00,00,00,12,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2015",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Central Brazilian Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Display",,"Europe/Budapest" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"Dlt",,"Central Europe Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Central Europe Standard Time,"MUI_Dlt",,"@tzres.dll,-4897" @@ -2982,26 +3176,44 @@ 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\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2008",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-32801" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-32800" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,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,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2003" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Display",,"Pacific/Chatham" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Dlt",,"Chatham Islands Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Dlt",,"@tzres.dll,-62305" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Std",,"@tzres.dll,-62304" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Std",,"Chatham Islands Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"TZI",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2000",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2001",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2002",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2003",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2004",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2005",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2006",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2007",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2008",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" @@ -3015,24 +3227,28 @@ 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\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Cuba Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Display",,"Etc/GMT+12" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Dlt",,"Dateline Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Dlt",,"@tzres.dll,-50385" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"MUI_Std",,"@tzres.dll,-50384" HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"Std",,"Dateline Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Dateline Standard Time,"TZI",1,d0,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Display",,"Africa/Nairobi" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"Dlt",,"E. Africa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. Africa Standard Time,"MUI_Dlt",,"@tzres.dll,-62721" @@ -3045,98 +3261,188 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Display",,"Europe/Chisinau" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Dlt",,"E. Europe Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Dlt",,"@tzres.dll,-32129" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"MUI_Std",,"@tzres.dll,-32128" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"Std",,"E. Europe Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\E. Europe Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Display",,"America/Sao_Paulo" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Dlt",,"E. South America Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Dlt",,"@tzres.dll,-64097" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"MUI_Std",,"@tzres.dll,-64096" HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"Std",,"E. South America Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0c,00,02,00,05,00,17,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter"" +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2016",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2017",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2019",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\E. South America Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Display",,"Pacific/Easter" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Dlt",,"Easter Island Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Dlt",,"@tzres.dll,-58593" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"MUI_Std",,"@tzres.dll,-58592" HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"Std",,"Easter Island Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,06,00,19,00,17,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2008",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2009",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2010",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,0a,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2011",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,03,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2012",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2013",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,04,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2016",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2017",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2018",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,06,00,02,00,16,00,00,00,00,00,00,00,00,00,08,00,06,00,02,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2019",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"2020",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,06,00,01,00,16,00,00,00,00,00,00,00,00,00,09,00,06,00,01,00,16,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Easter Island Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Display",,"America/New_York" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Dlt",,"Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-30801" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Display",,"America/Cancun" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Dlt",,"Eastern Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-59537" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-59536" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"Std",,"Eastern Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico),"TZI",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2000",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2001",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2002",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2003",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2004",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2005",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2008",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2009",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2010",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2011",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2012",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2013",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2014",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2015",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,02,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Std",,"@tzres.dll,-59424" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Std",,"Egypt Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Display",,"Asia/Yekaterinburg" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Dlt",,"Ekaterinburg Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Dlt",,"@tzres.dll,-45953" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"MUI_Std",,"@tzres.dll,-45952" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"Std",,"Ekaterinburg Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2003",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2004",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2005",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2006",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2007",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2008",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2009",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2010",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2011",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2012",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2013",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2014",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"2015",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Ekaterinburg Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Display",,"Pacific/Fiji" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Dlt",,"Fiji Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Dlt",,"@tzres.dll,-25681" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"MUI_Std",,"@tzres.dll,-25680" HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"Std",,"Fiji Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2016",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e0,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e1,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e1,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e5,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,e5,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,e6,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2023",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,e7,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,e7,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2027",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,eb,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,eb,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2028",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,ec,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,ec,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2033",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f1,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2034",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f2,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f2,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2038",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f6,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,f6,07,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2039",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,01,00,00,00,17,00,03,00,00,00,00,00,00,00,f7,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2040",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,f8,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,f8,07,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2044",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,01,00,00,00,18,00,03,00,00,00,00,00,00,00,fc,07,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2045",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,fd,07,01,00,00,00,16,00,03,00,00,00,00,00,00,00,fd,07,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2049",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,01,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,01,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2050",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,02,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2051",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,03,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,03,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2055",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,07,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,07,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2056",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,08,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,08,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2061",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,0d,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2062",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,0e,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,0e,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2066",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,12,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,12,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2067",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,13,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2068",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,14,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,14,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2072",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,18,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2073",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,19,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,19,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2077",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1d,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,1d,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2078",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,1e,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2079",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,1f,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,1f,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2083",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,23,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,23,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2084",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,24,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,24,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2089",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,29,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2090",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2a,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,2a,08,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2094",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2e,08,01,00,00,00,18,00,03,00,00,00,00,00,00,00,2e,08,0b,00,00,00,07,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2095",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,01,00,00,00,17,00,03,00,00,00,00,00,00,00,2f,08,0b,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2096",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,30,08,01,00,00,00,16,00,03,00,00,00,00,00,00,00,30,08,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"FirstEntry",0x10001,2016 -HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"LastEntry",0x10001,2096 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time,"TZI",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2009",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2010",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2011",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2014",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,02,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2015",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2016",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2017",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2018",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2019",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2020",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2021",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,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"2022",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Fiji Standard Time\Dynamic DST,"LastEntry",0x10001,"2022" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Display",,"Europe/Kiev" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"Dlt",,"FLE Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\FLE Standard Time,"MUI_Dlt",,"@tzres.dll,-63265" @@ -3149,6 +3455,15 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Georgian Standard Time\Dynamic DST,"LastEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Display",,"Europe/London" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"Dlt",,"GMT Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\GMT Standard Time,"MUI_Dlt",,"@tzres.dll,-7409" @@ -3161,33 +3476,6 @@ HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Dlt",,"@tzres.dl HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"MUI_Std",,"@tzres.dll,-58096" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"Std",,"Greenland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,17,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,df,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2018",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e2,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,e2,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2020",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,e4,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,e4,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2026",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ea,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,ea,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2029",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,ed,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,ed,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2035",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f3,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2037",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f5,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,f5,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2040",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,f8,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,f8,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2043",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fb,07,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,fb,07,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2046",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,fe,07,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,fe,07,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2048",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,00,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2054",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,06,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,06,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2057",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,09,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,09,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2063",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,0f,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,0f,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2065",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,11,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,11,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2068",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,14,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,14,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2071",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,17,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,17,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2074",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1a,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,1a,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2076",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,1c,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,1c,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2082",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,22,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,22,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2085",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,25,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,25,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2091",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2b,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,2b,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2093",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,2d,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,2d,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2096",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,30,08,0a,00,06,00,1b,00,17,00,00,00,00,00,00,00,30,08,03,00,06,00,18,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"2099",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,33,08,0a,00,06,00,18,00,17,00,00,00,00,00,00,00,33,08,03,00,06,00,1c,00,16,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Greenland Standard Time\Dynamic DST,"LastEntry",0x10001,2099 HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Display",,"Atlantic/Reykjavik" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"Dlt",,"Greenwich Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Greenwich Standard Time,"MUI_Dlt",,"@tzres.dll,-47169" @@ -3206,6 +3494,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Dlt",,"@tzres.dll,-2 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"MUI_Std",,"@tzres.dll,-2896" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"Std",,"Haiti Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 @@ -3214,14 +3506,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2008",1,2c,0 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2009",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2010",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2011",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2012",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2013",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2014",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2016",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2017",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" -HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2017",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"2018",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Haiti Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Display",,"Pacific/Honolulu" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"Dlt",,"Hawaiian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Hawaiian Standard Time,"MUI_Dlt",,"@tzres.dll,-53377" @@ -3239,16 +3528,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Dlt",,"Iran Daylight Time HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Dlt",,"@tzres.dll,-5569" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"MUI_Std",,"@tzres.dll,-5568" HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"Std",,"Iran Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1991",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1992",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1993",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1994",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1995",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,03,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1996",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1997",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1998",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,02,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"1999",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time,"TZI",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2000",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,02,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2001",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2002",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 @@ -3287,54 +3567,75 @@ HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2034",1,2e,ff HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2035",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,04,00,04,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2036",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2037",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,03,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,03,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"FirstEntry",0x10001,1991 -HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"LastEntry",0x10001,2037 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"2038",1,2e,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Iran Standard Time\Dynamic DST,"LastEntry",0x10001,"2038" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Display",,"Asia/Jerusalem" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Dlt",,"Israel Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Dlt",,"@tzres.dll,-47969" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"MUI_Std",,"@tzres.dll,-47968" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"Std",,"Israel Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e3,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e3,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2024",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,e8,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2030",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ee,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ee,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2041",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f9,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,f9,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2047",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,ff,07,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,ff,07,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2052",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,04,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,04,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2058",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0a,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,0a,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2069",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,15,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,15,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2075",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1b,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,1b,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2080",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,20,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,20,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2086",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,26,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,26,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2097",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,31,08,0a,00,00,00,1b,00,02,00,00,00,00,00,00,00,31,08,03,00,05,00,1d,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"FirstEntry",0x10001,2019 -HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"LastEntry",0x10001,2097 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,01,00,02,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,03,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,03,00,01,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,03,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Israel Standard Time\Dynamic DST,"LastEntry",0x10001,"2014" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Display",,"Asia/Amman" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Dlt",,"Jordan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Dlt",,"@tzres.dll,-17233" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"MUI_Std",,"@tzres.dll,-17232" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"Std",,"Jordan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e0,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2022",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,e6,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2033",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f1,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f1,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2039",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,f7,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,f7,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2044",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,fc,07,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,fc,07,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2050",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,02,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,02,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2061",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,0d,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,0d,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2067",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,13,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,13,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2072",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,18,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,18,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2078",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,1e,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,1e,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2089",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,29,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,29,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2095",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,2f,08,0a,00,05,00,1c,00,01,00,00,00,00,00,00,00,2f,08,04,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"FirstEntry",0x10001,2016 -HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,2095 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,04,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Jordan Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Display",,"Europe/Kaliningrad" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Dlt",,"Kaliningrad Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Dlt",,"@tzres.dll,-14721" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"MUI_Std",,"@tzres.dll,-14720" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"Std",,"Kaliningrad Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2013",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Kaliningrad Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-62049" @@ -3347,6 +3648,11 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2012",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,02,00,02,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2013",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"FirstEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time\Dynamic DST,"LastEntry",0x10001,"2014" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Display",,"Pacific/Kiritimati" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Dlt",,"Line Islands Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"MUI_Dlt",,"@tzres.dll,-16769" @@ -3359,24 +3665,55 @@ 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\Dynamic DST,"2005",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2000",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2001",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2002",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2003",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2004",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2005",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2006",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2007",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2008",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" -HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2007",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2008",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"2009",1,8a,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Lord Howe Standard Time\Dynamic DST,"LastEntry",0x10001,"2009" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Dlt",,"@tzres.dll,-8833" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"MUI_Std",,"@tzres.dll,-8832" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2003",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2004",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2005",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2006",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2007",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2008",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2009",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2016",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Display",,"America/Punta_Arenas" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Dlt",,"Magallanes Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Dlt",,"@tzres.dll,-13121" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"MUI_Std",,"@tzres.dll,-13120" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"Std",,"Magallanes Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -3385,12 +3722,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2009",1 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"2017",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Magallanes Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Display",,"Pacific/Marquesas" HKLM,%CurrentVersionNT%\Time Zones\Marquesas Standard Time,"Dlt",,"Marquesas Daylight Time" @@ -3404,6 +3740,11 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"2010",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"FirstEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Display",,"Asia/Beirut" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"Dlt",,"Middle East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Middle East Standard Time,"MUI_Dlt",,"@tzres.dll,-15969" @@ -3415,38 +3756,97 @@ HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Dlt",,"Montevideo D HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Dlt",,"@tzres.dll,-27969" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"MUI_Std",,"@tzres.dll,-27968" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Std",,"Montevideo Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2009",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2010",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"2016",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"FirstEntry",0x10001,"2004" +HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Display",,"Africa/Casablanca" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Dlt",,"Morocco Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Dlt",,"@tzres.dll,-2993" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"MUI_Std",,"@tzres.dll,-2992" HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,00,00,13,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,00,00,0a,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,00,00,08,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,00,00,17,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,00,00,0e,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,00,00,06,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,00,00,13,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"LastEntry",0x10001,2036 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2000",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2003",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2004",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2005",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2006",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2007",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2008",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2009",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,06,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2010",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2011",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,07,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2012",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2013",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2014",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2017",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2018",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,06,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2019",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,06,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2020",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2021",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,05,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2026",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2027",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2028",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2029",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2030",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,02,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2031",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,02,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2032",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,01,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2033",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,01,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2034",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2035",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0c,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2037",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,03,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2038",1,c4,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"LastEntry",0x10001,"2038" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Display",,"America/Denver" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Dlt",,"Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll,-34353" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2000",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2003",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2004",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2005",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2006",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2008",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Dlt",,"Mountain Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-7249" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-7248" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Std",,"Mountain Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2001",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"2002",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,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,"2003",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2003" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Display",,"Asia/Rangoon" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"Dlt",,"Myanmar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Myanmar Standard Time,"MUI_Dlt",,"@tzres.dll,-21105" @@ -3458,13 +3858,52 @@ HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Dlt",,"N. Cent HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-30705" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"MUI_Std",,"@tzres.dll,-30704" HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"Std",,"N. Central Asia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,07,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Display",,"Africa/Windhoek" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Dlt",,"Namibia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Dlt",,"@tzres.dll,-6209" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"MUI_Std",,"@tzres.dll,-6208" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Std",,"Namibia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2000",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2001",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2002",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2003",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2004",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2005",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2006",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2007",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2008",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2009",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2010",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2011",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2012",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2013",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2014",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2015",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2016",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2017",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Display",,"Asia/Katmandu" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Dlt",,"Nepal Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"MUI_Dlt",,"@tzres.dll,-1217" @@ -3477,44 +3916,163 @@ 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\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Display",,"America/St_Johns" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Dlt",,"Newfoundland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Dlt",,"@tzres.dll,-9505" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"MUI_Std",,"@tzres.dll,-9504" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Std",,"Newfoundland Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2000",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2001",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2002",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2003",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2004",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2005",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2006",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,00,00,01,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2007",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2008",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2009",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2010",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2011",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"2012",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Display",,"Pacific/Norfolk" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Dlt",,"Norfolk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Dlt",,"@tzres.dll,-47441" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"MUI_Std",,"@tzres.dll,-47440" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"Std",,"Norfolk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2000",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2003",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2004",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2005",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2006",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2007",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2008",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2009",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2010",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2011",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2012",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2013",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2014",1,4e,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2016",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2018",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2019",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"2020",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Norfolk Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Display",,"Asia/Irkutsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Dlt",,"North Asia East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Dlt",,"@tzres.dll,-19057" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"MUI_Std",,"@tzres.dll,-19056" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Std",,"North Asia East Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2000",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2003",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2004",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2009",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2010",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2011",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2012",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2013",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2014",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Display",,"Asia/Krasnoyarsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Dlt",,"North Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-305" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"MUI_Std",,"@tzres.dll,-304" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"Std",,"North Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2003",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2004",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2005",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2006",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2007",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2008",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2009",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2010",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2011",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2012",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2013",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2014",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"2015",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\North Asia Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Display",,"Asia/Pyongyang" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Dlt",,"North Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Dlt",,"@tzres.dll,-35889" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"MUI_Std",,"@tzres.dll,-35888" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"Std",,"North Korea Standard Time" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2014",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2015",1,e4,fd,ff,ff,00,00,00,00,1e,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,08,00,06,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2017",1,02,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2018",1,02,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,05,00,01,00,17,00,1e,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"2019",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"FirstEntry",0x10001,"2014" +HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\North Korea Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Display",,"Asia/Omsk" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Dlt",,"Omsk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Dlt",,"@tzres.dll,-55953" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"MUI_Std",,"@tzres.dll,-55952" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"Std",,"Omsk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2001",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2012",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2013",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Omsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Display",,"America/Santiago" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.dll,-65009" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Std",,"@tzres.dll,-65008" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 @@ -3523,15 +4081,15 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2009",1 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" @@ -3539,40 +4097,195 @@ 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\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2008",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-15585" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-15584" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2008",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2009",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2010",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"2011",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico)\Dynamic DST,"LastEntry",0x10001,"2011" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Display",,"Asia/Karachi" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Dlt",,"Pakistan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Dlt",,"@tzres.dll,-28753" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"MUI_Std",,"@tzres.dll,-28752" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Std",,"Pakistan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2008",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2009",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,03,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"2010",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2002" +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Display",,"America/Asuncion" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Dlt",,"Paraguay Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Dlt",,"@tzres.dll,-50225" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"MUI_Std",,"@tzres.dll,-50224" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Std",,"Paraguay Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2000",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2001",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2002",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2003",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2004",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Display",,"Asia/Qyzylorda" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Dlt",,"Qyzylorda Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Dlt",,"@tzres.dll,-53761" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"MUI_Std",,"@tzres.dll,-53760" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"Std",,"Qyzylorda Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2000",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2001",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2002",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2003",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2004",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2012",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2013",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2017",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2018",1,d4,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"2019",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Qyzylorda Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Display",,"Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Dlt",,"Romance Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Dlt",,"@tzres.dll,-45105" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"MUI_Std",,"@tzres.dll,-45104" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Display",,"Asia/Srednekolymsk" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Dlt",,"Russia Time Zone 10" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Dlt",,"@tzres.dll,-59265" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"MUI_Std",,"@tzres.dll,-59264" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"Std",,"Russia Time Zone 10" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2000",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2001",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2002",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2003",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2004",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2005",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2006",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2007",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2008",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2009",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2013",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2014",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"2015",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 10\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Display",,"Asia/Kamchatka" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Dlt",,"Russia Time Zone 11" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Dlt",,"@tzres.dll,-46001" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"MUI_Std",,"@tzres.dll,-46000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"Std",,"Russia Time Zone 11" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11,"TZI",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2000",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2001",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2002",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2003",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2004",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2005",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2006",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2007",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2008",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2009",1,30,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2010",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2011",1,6c,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"2012",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 11\Dynamic DST,"LastEntry",0x10001,"2012" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Display",,"Europe/Samara" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Dlt",,"Russia Time Zone 3" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Dlt",,"@tzres.dll,-17921" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"MUI_Std",,"@tzres.dll,-17920" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"Std",,"Russia Time Zone 3" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2000",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2001",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2002",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2003",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2004",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2005",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2006",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2007",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2008",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2009",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russia Time Zone 3\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Display",,"Europe/Moscow" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Dlt",,"Russian Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Dlt",,"@tzres.dll,-44561" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"MUI_Std",,"@tzres.dll,-44560" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"Std",,"Russian Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Russian Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Display",,"America/Cayenne" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" @@ -3597,16 +4310,98 @@ 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\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2004",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2005",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2006",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" -HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2007",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"2008",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Saint Pierre Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Display",,"Asia/Sakhalin" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Dlt",,"Sakhalin Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Dlt",,"@tzres.dll,-35105" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"MUI_Std",,"@tzres.dll,-35104" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"Std",,"Sakhalin Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time,"TZI",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2016",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"2017",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sakhalin Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Display",,"Pacific/Apia" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Dlt",,"Samoa Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Dlt",,"@tzres.dll,-14593" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"MUI_Std",,"@tzres.dll,-14592" HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"Std",,"Samoa Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2000",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2003",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2004",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2005",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2006",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2007",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2008",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2009",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2010",1,94,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2011",1,94,02,00,00,00,00,00,00,24,fa,ff,ff,00,00,04,00,06,00,01,00,04,00,00,00,00,00,00,00,00,00,0c,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2012",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"2013",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,04,00,00,00,00,00,00,00,00,00,09,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Samoa Standard Time\Dynamic DST,"LastEntry",0x10001,"2013" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Display",,"Africa/Sao_Tome" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Dlt",,"Sao Tome Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Dlt",,"@tzres.dll,-5985" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"MUI_Std",,"@tzres.dll,-5984" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"Std",,"Sao Tome Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2018",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2019",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,02,00,01,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"2020",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"FirstEntry",0x10001,"2018" +HKLM,%CurrentVersionNT%\Time Zones\Sao Tome Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Display",,"Europe/Saratov" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Dlt",,"Saratov Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Dlt",,"@tzres.dll,-33809" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"MUI_Std",,"@tzres.dll,-33808" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"Std",,"Saratov Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"2017",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Saratov Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Display",,"Asia/Bangkok" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"Dlt",,"SE Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SE Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-53729" @@ -3631,12 +4426,63 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2000",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2006",1,b6,fe,ff,ff,00,00,00,00,e2,ff,ff,ff,00,00,04,00,06,00,03,00,00,00,1e,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"2007",1,b6,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Display",,"Africa/Khartoum" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Dlt",,"Sudan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Dlt",,"@tzres.dll,-9793" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"MUI_Std",,"@tzres.dll,-9792" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"Std",,"Sudan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,06,00,03,00,0c,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2012",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2013",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2015",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2016",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2017",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Sudan Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Display",,"Asia/Damascus" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Dlt",,"Syria Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Dlt",,"@tzres.dll,-46577" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"MUI_Std",,"@tzres.dll,-46576" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Std",,"Syria Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,04,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time\Dynamic DST,"LastEntry",0x10001,"2012" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Display",,"Asia/Taipei" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Dlt",,"Taipei Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"MUI_Dlt",,"@tzres.dll,-26433" @@ -3649,17 +4495,30 @@ 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\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,08,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Display",,"America/Araguaina" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Dlt",,"Tocantins Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Dlt",,"@tzres.dll,-43073" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"MUI_Std",,"@tzres.dll,-43072" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"Std",,"Tocantins Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2011",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2000",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,04,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2001",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2002",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2003",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2012",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2013",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,02,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"2014",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"FirstEntry",0x10001,"2011" +HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" HKLM,%CurrentVersionNT%\Time Zones\Tocantins Standard Time\Dynamic DST,"LastEntry",0x10001,"2014" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Display",,"Asia/Tokyo" HKLM,%CurrentVersionNT%\Time Zones\Tokyo Standard Time,"Dlt",,"Tokyo Daylight Time" @@ -3667,33 +4526,150 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Display",,"Asia/Tomsk" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Dlt",,"Tomsk Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Dlt",,"@tzres.dll,-29137" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"MUI_Std",,"@tzres.dll,-29136" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"Std",,"Tomsk Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2000",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2002",1,98,fe,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2003",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2004",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2005",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2006",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2007",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2008",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2009",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2010",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2011",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2014",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2015",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2016",1,98,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tomsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Display",,"Pacific/Tongatapu" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Dlt",,"Tonga Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Dlt",,"@tzres.dll,-7217" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"MUI_Std",,"@tzres.dll,-7216" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Std",,"Tonga Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2000",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2001",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2002",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,02,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2016",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2017",1,f4,fc,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,03,00,03,00,00,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"2018",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time\Dynamic DST,"LastEntry",0x10001,"2018" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Display",,"Asia/Chita" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Dlt",,"Transbaikal Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Dlt",,"@tzres.dll,-31473" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"MUI_Std",,"@tzres.dll,-31472" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"Std",,"Transbaikal Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2003",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2004",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2005",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2006",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2007",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2008",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2009",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2010",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2011",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2014",1,20,fe,ff,ff,00,00,00,00,88,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2016",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"2017",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Transbaikal Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Display",,"Europe/Istanbul" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Dlt",,"Turkey Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Dlt",,"@tzres.dll,-24849" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"MUI_Std",,"@tzres.dll,-24848" HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"Std",,"Turkey Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,df,07,0b,00,00,00,08,00,04,00,00,00,00,00,00,00,df,07,03,00,00,00,1d,00,03,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,04,00,00,00,00,00,00,00,00,00,03,00,01,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,04,00,00,00,00,00,00,00,00,00,03,00,01,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,02,00,04,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"2017",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Turkey Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Display",,"America/Grand_Turk" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Dlt",,"Turks And Caicos Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Dlt",,"@tzres.dll,-20561" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"MUI_Std",,"@tzres.dll,-20560" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"Std",,"Turks And Caicos Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2001",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2002",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2015",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"2019",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Turks And Caicos Standard Time\Dynamic DST,"LastEntry",0x10001,"2019" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Dlt",,"@tzres.dll,-47201" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"MUI_Std",,"@tzres.dll,-47200" HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2001",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2002",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2003",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2004",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2015",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2016",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"2017",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Display",,"America/Indianapolis" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Dlt",,"US Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-34929" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"MUI_Std",,"@tzres.dll,-34928" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Std",,"US Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2000",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2003",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2004",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2005",1,2c,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"2008",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America/Phoenix" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"MUI_Dlt",,"@tzres.dll,-37473" @@ -3706,31 +4682,124 @@ HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Dlt",,"@tzres.dll,-22001" HKLM,%CurrentVersionNT%\Time Zones\UTC,"MUI_Std",,"@tzres.dll,-22000" HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Display",,"Etc/GMT-12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Dlt",,"UTC+12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Dlt",,"@tzres.dll,-1201" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"MUI_Std",,"@tzres.dll,-1200" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"Std",,"UTC+12" +HKLM,%CurrentVersionNT%\Time Zones\UTC+12,"TZI",1,30,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Display",,"Etc/GMT-13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Dlt",,"UTC+13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Dlt",,"@tzres.dll,-8785" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"MUI_Std",,"@tzres.dll,-8784" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"Std",,"UTC+13" +HKLM,%CurrentVersionNT%\Time Zones\UTC+13,"TZI",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Display",,"Etc/GMT+2" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Dlt",,"UTC-02" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Dlt",,"@tzres.dll,-37329" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"MUI_Std",,"@tzres.dll,-37328" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"Std",,"UTC-02" +HKLM,%CurrentVersionNT%\Time Zones\UTC-02,"TZI",1,78,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Display",,"Etc/GMT+8" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Dlt",,"UTC-08" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Dlt",,"@tzres.dll,-3345" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"MUI_Std",,"@tzres.dll,-3344" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"Std",,"UTC-08" +HKLM,%CurrentVersionNT%\Time Zones\UTC-08,"TZI",1,e0,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Display",,"Etc/GMT+9" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Dlt",,"UTC-09" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Dlt",,"@tzres.dll,-39153" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"MUI_Std",,"@tzres.dll,-39152" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"Std",,"UTC-09" +HKLM,%CurrentVersionNT%\Time Zones\UTC-09,"TZI",1,1c,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Display",,"Etc/GMT+11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Dlt",,"UTC-11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Dlt",,"@tzres.dll,-19409" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"MUI_Std",,"@tzres.dll,-19408" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"Std",,"UTC-11" +HKLM,%CurrentVersionNT%\Time Zones\UTC-11,"TZI",1,94,02,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Dlt",,"@tzres.dll,-51473" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"MUI_Std",,"@tzres.dll,-51472" HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"TZI",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2007",1,0e,01,00,00,00,00,00,00,e2,ff,ff,ff,00,00,0c,00,00,00,02,00,03,00,00,00,00,00,00,00,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2008",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2010",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2011",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2012",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2013",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2014",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2015",1,0e,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2016",1,0e,01,00,00,00,00,00,00,e2,ff,ff,ff,00,00,01,00,05,00,01,00,00,00,00,00,00,00,00,00,00,00,05,00,00,00,01,00,02,00,1e,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"FirstEntry",0x10001,"2007" +HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Display",,"Asia/Vladivostok" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Dlt",,"Vladivostok Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Dlt",,"@tzres.dll,-61377" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"MUI_Std",,"@tzres.dll,-61376" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"Std",,"Vladivostok Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2000",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2001",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2002",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2003",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2004",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2005",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2006",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2007",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2008",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2009",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2010",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2011",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2012",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2013",1,6c,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2014",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"2015",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Vladivostok Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Display",,"Europe/Volgograd" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Dlt",,"Volgograd Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Dlt",,"@tzres.dll,-18049" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"MUI_Std",,"@tzres.dll,-18048" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"Std",,"Volgograd Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time,"TZI",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2000",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2001",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2002",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2003",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2004",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2005",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2006",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2007",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2008",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2009",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2010",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2011",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2012",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2013",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2014",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2018",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2019",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2020",1,4c,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0c,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"2021",1,4c,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Volgograd Standard Time\Dynamic DST,"LastEntry",0x10001,"2021" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Display",,"Australia/Perth" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Dlt",,"W. Australia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Dlt",,"@tzres.dll,-65377" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"MUI_Std",,"@tzres.dll,-65376" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"Std",,"W. Australia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2005",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2006",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0c,00,00,00,01,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2007",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2008",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2009",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,01,00,04,00,01,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"2010",1,20,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" HKLM,%CurrentVersionNT%\Time Zones\W. Australia Standard Time\Dynamic DST,"LastEntry",0x10001,"2010" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Display",,"Africa/Lagos" HKLM,%CurrentVersionNT%\Time Zones\W. Central Africa Standard Time,"Dlt",,"W. Central Africa Daylight Time" @@ -3744,12 +4813,59 @@ 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. Mongolia Standard Time,"Display",,"Asia/Hovd" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Dlt",,"W. Mongolia Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Dlt",,"@tzres.dll,-53953" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"MUI_Std",,"@tzres.dll,-53952" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"Std",,"W. Mongolia Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time,"TZI",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2001",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2002",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2003",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2004",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2005",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2006",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,02,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2015",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2016",1,5c,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"2017",1,5c,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"FirstEntry",0x10001,"2001" +HKLM,%CurrentVersionNT%\Time Zones\W. Mongolia Standard Time\Dynamic DST,"LastEntry",0x10001,"2017" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Display",,"Asia/Tashkent" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Dlt",,"West Asia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Dlt",,"@tzres.dll,-49665" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"MUI_Std",,"@tzres.dll,-49664" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"Std",,"West Asia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\West Asia Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Display",,"Asia/Hebron" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Dlt",,"West Bank Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Dlt",,"@tzres.dll,-46161" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"MUI_Std",,"@tzres.dll,-46160" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"Std",,"West Bank Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2000",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2001",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2002",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2003",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2004",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2005",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,02,00,01,00,02,00,00,00,00,00,00,00,00,00,04,00,05,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2006",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,04,00,06,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2007",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,04,00,02,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2008",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,01,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2009",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,01,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2010",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,08,00,03,00,02,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2011",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,04,00,05,00,01,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2012",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,03,00,01,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2013",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2014",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2015",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2016",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,05,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2017",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2018",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,01,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2019",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2020",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"2021",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,06,00,04,00,01,00,00,00,00,00,00,00,00,00,03,00,06,00,04,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\West Bank Standard Time\Dynamic DST,"LastEntry",0x10001,"2021" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Display",,"Pacific/Port_Moresby" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"Dlt",,"West Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\West Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-10225" @@ -3762,6 +4878,54 @@ 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,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2000",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2001",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2002",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2003",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2004",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2005",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2006",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2007",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2008",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2009",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2010",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2011",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,01,00,06,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,04,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2012",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2013",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2014",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"2015",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time\Dynamic DST,"LastEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Display",,"America/Whitehorse" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Dlt",,"Yukon Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Dlt",,"@tzres.dll,-26289" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"MUI_Std",,"@tzres.dll,-26288" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"Std",,"Yukon Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2000",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2001",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2002",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2003",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,04,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2004",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2005",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2008",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2009",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2010",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2011",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2012",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2013",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2014",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2015",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2016",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2017",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2018",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2019",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2020",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,01,00,03,00,01,00,00,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"2021",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"FirstEntry",0x10001,"2000" +HKLM,%CurrentVersionNT%\Time Zones\Yukon Standard Time\Dynamic DST,"LastEntry",0x10001,"2021" HKLM,%CurrentVersion%\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\%CurrentVersionNT%\Time Zones" [BITSService] diff --git a/tools/parse_windows_zones.py b/tools/parse_windows_zones.py new file mode 100755 index 00000000000..5bbd2842115 --- /dev/null +++ b/tools/parse_windows_zones.py @@ -0,0 +1,509 @@ +#!/usr/bin/env python3 +# +# Copyright 2021 Giovanni Mascellani for CodeWeavers +# Script to regenerate timezones data for Wine +# +# 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 +# +# HOW TO USE THIS SCRIPT +# +# * Download the file windowsZones.xml from: +# https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplement… +# The same file might be packaged in your distribution (Debian has +# it in unicode-cldr-core), but that copy might be outdated +# +# * Clone the TZ database from: +# https://github.com/eggert/tz/ +# Make it and run: +# mkdir out ; ./zic -d out -L /dev/null tzdata.zi +# The directory "out" will have the binary TZ data files. The same +# files will most probably be available in your distribution (Debian +# has them in tzdata, where they correspond to the "posix" subdir, +# not the "right" one), but again they might be outdated. +# +# * Call this script with (adjusting paths): +# ./parse_windows_zones.py registry windowsZones.xml tz/out | grep -v ^# +# Paste the output to loader/wine.inf.in, deleting the corresponding old lines. +# +# * Call this script again with: +# ./parse_windows_zones.py resource windowsZones.xml tz/out | grep -v ^# +# Paste the output to dlls/tzres/tzres.rc, deleting the corresponding old lines. +# +# Remember you can pipe stuff to "xclip -in -selection clipboard" to +# copy it to the X11 clipboard. Remove the "grep -v ^#" command if you +# want to see the debug output. + +import re +import sys +import hashlib +import struct +import os +import datetime + +COMMENT_RE = re.compile('.*') +MAP_RE = re.compile('<mapZone other="(.*)" territory=".*" type="(.*)"/>') + +# Based on https://pubs.opengroup.org/onlinepubs/9699919799/ (variable TZ) +def read_std(footer): + if footer[0] == '<': + for i in range(len(footer)): + if footer[i] == '>': + return footer[1:i], footer[i+1:] + raise Exception("Cannot find >") + else: + for i in range(len(footer)): + if not('A' <= footer[i] <= 'Z' or 'a' <= footer[i] <= 'z'): + break + return footer[:i], footer[i:] + +def read_number(footer): + for i in range(len(footer)): + if not('0' <= footer[i] <= '9'): + break + else: + i = len(footer) + return int(footer[:i]), footer[i:] + +def read_time(footer): + minutes = 0 + seconds = 0 + hours, footer = read_number(footer) + if len(footer) > 0 and footer[0] == ':': + footer = footer[1:] + minutes, footer = read_number(footer) + if len(footer) > 0 and footer[0] == ':': + footer = footer[1:] + seconds, footer = read_number(footer) + return (seconds + minutes * 60 + hours * 3600), footer + +def read_offset(footer): + sign = '+' + if footer[0] in ['+', '-']: + sign = footer[0] + footer = footer[1:] + time, footer = read_time(footer) + return ((-1 if sign == '-' else 1) * time), footer + +def read_date(footer): + if footer[0] == 'J': + footer = footer[1:] + num, footer = read_number(footer) + return ('J', num), footer + elif footer[0] == 'M': + footer = footer[1:] + month, footer = read_number(footer) + assert footer[0] == '.' + footer = footer[1:] + week, footer = read_number(footer) + assert footer[0] == '.' + footer = footer[1:] + day, footer = read_number(footer) + return ('M', month, week, day), footer + else: + num, footer = read_number(footer) + return ('D', num), footer + +def fix_date_for_tzi(time, date): + date = list(date) + days = time // (24 * 60 * 60) + date[3] = (date[3] + days) % 7 + if days >= 4: + # Pass to the following week + date[2] += 1 + if date[2] >= 5: + # Pass to the following month + if date[1] < 12: + date[2] = 1 + date[1] += 1 + else: + # Cannot pass to the following year, just take last + # week in month + date[2] = 5 + if days <= -4: + # Pass to the previous week + date[2] -= 1 + if date[2] <= 0: + # Pass to the previous month + if date[1] > 1: + date[2] = 5 + date[1] -= 1 + else: + # Cannot pass to the previous year, just take first + # week in month + date[2] = 1 + return time % (24 * 60 * 60), tuple(date) + +def decode_footer(footer): + #print(footer) + std, footer = read_std(footer) + #print(std) + std_offset, footer = read_offset(footer) + #print(std_offset) + if footer != '': + dst, footer = read_std(footer) + #print(dst) + if footer[0] != ',': + dst_offset, footer = read_offset(footer) + else: + dst_offset = std_offset - 3600 + #print(dst_offset) + assert footer[0] == ',' + footer = footer[1:] + dst_date, footer = read_date(footer) + #print(dst_date) + if footer[0] == '/': + footer = footer[1:] + dst_time, footer = read_offset(footer) + else: + dst_time = 2 * 3600 + #print(dst_time) + assert footer[0] == ',' + footer = footer[1:] + std_date, footer = read_date(footer) + #print(std_date) + if len(footer) > 0 and footer[0] == '/': + footer = footer[1:] + std_time, footer = read_offset(footer) + else: + std_time = 2 * 3600 + #print(std_time) + assert footer == '' + else: + dst = None + + # Create the TZI structure according to https://docs.microsoft.com/en-us/windows/win32/api/timezoneapi/ns-timezonea… + if dst is not None: + assert std_offset % 60 == 0 + assert dst_offset % 60 == 0 + tzi = struct.pack("<lll", std_offset // 60, 0, (dst_offset - std_offset) // 60) + if std_date[0] == 'M': + std_time, std_date = fix_date_for_tzi(std_time, std_date) + tzi += struct.pack("<hhhhhhhh", 0, std_date[1], std_date[3], std_date[2], std_time // 3600, (std_time // 60) % 60, std_time % 60, 0) + else: + print('# Windows format cannot represent fixed dates') + tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + if dst_date[0] == 'M': + dst_time, dst_date = fix_date_for_tzi(dst_time, dst_date) + tzi += struct.pack("<hhhhhhhh", 0, dst_date[1], dst_date[3], dst_date[2], dst_time // 3600, (dst_time // 60) % 60, dst_time % 60, 0) + else: + print('# Windows format cannot represent fixed dates') + tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + else: + assert std_offset % 60 == 0 + tzi = struct.pack("<lll", std_offset // 60, 0, 0) + tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + #print(",".join(["{:02x}".format(x) for x in tzi])) + return tzi + +# It mimicks std::lower_bound from C++, though it checks v[x][0], not +# v[x] +def lower_bound(v, x): + low, high = 0, len(v) + while low != high: + i = (low + high) // 2 + if v[i][0] < x: + low = i + 1 + else: + high = i + if low != len(v): + assert not v[low][0] < x + if low != 0: + assert v[low-1][0] < x + return low + +def realize_tzi(tzi, year): + data = list(struct.unpack("<lllhhhhhhhhhhhhhhhh", tzi)) + for i in 0, 8: + if data[3+i] == 0 and data[4+i] != 0: + month = data[4+i] + weekday = data[5+i] + 6 + day = data[6+i] + hour = data[7+i] + minute = data[8+i] + second = data[9+i] + millisecond = data[10+i] + diff = (weekday - datetime.date(year=year, month=month, day=1).weekday()) % 7 + actual_day = 1 + diff + 7 * (day-1) + max_day = (datetime.date(year=year if month != 12 else year+1, month=month+1 if month != 12 else 1, day=1) - datetime.timedelta(days=1)).day + if actual_day > max_day: + actual_day -= 7 + actual_date = datetime.datetime(year=year, month=month, day=actual_day, hour=0, minute=0, second=0, microsecond=0) \ + + datetime.timedelta(hours=hour, minutes=minute, seconds=second, microseconds=millisecond * 1000) + data[3+i] = actual_date.year + data[4+i] = actual_date.month + data[5+i] = (actual_date.weekday()+1) % 7 + data[6+i] = actual_date.day + data[7+i] = actual_date.hour + data[8+i] = actual_date.minute + data[9+i] = actual_date.second + data[10+i] = actual_date.microsecond // 1000 + return struct.pack("<lllhhhhhhhhhhhhhhhh", *data) + +# Based on https://tools.ietf.org/html/rfc8536 +def read_tz(filename): + with open(filename, 'rb') as fin: + header1 = fin.read(44) + assert header1[:4] == b'TZif' + assert header1[4:5] == b'2' or header1[4:5] == b'3' + isutcnt, isstdcnt, leapcnt, timecnt, typecnt, charcnt = struct.unpack("!IIIIII", header1[20:]) + fin.read(timecnt * 4 + timecnt + typecnt * 6 + charcnt + leapcnt * 8 + isstdcnt + isutcnt) + header2 = fin.read(44) + assert header2[:4] == b'TZif' + assert header2[4:5] == header1[4:5] + isutcnt, isstdcnt, leapcnt, timecnt, typecnt, charcnt = struct.unpack("!IIIIII", header2[20:]) + + transition_times = [struct.unpack("!q", fin.read(8))[0] for _ in range(timecnt)] + transition_types = [struct.unpack("B", fin.read(1))[0] for _ in range(timecnt)] + local_times = [struct.unpack("!i?B", fin.read(6)) for _ in range(typecnt)] + designations = fin.read(charcnt).decode('ascii') + leap_seconds = [struct.unpack("!Qi", fin.read(12)) for _ in range(leapcnt)] + std_indicators = [struct.unpack("?", fin.read(1))[0] for _ in range(isstdcnt)] + ut_indicators = [struct.unpack("?", fin.read(1))[0] for _ in range(isutcnt)] + + if std_indicators == []: + std_indicators = [False] * typecnt + if ut_indicators == []: + ut_indicators = [False] * typecnt + assert len(std_indicators) == len(local_times) + assert len(ut_indicators) == len(local_times) + assert len(leap_seconds) == 0 + + print("# Local times:") + descriptions = [] + utoffs = [] + dsts = [] + desigs = [] + for i in range(len(local_times)): + utoff, dst, idx = local_times[i] + for idx_end in range(idx, len(designations)): + if designations[idx_end] == '\0': + break + designation = designations[idx:idx_end] + isstd = std_indicators[i] + isut = ut_indicators[i] + descr = "{}: {} (UT{:+}, {}) isstd={} isut={}".format(i+1, designation, utoff / 3600, 'daylight' if dst else 'standard', isstd, isut) + descriptions.append(descr) + utoffs.append(utoff) + dsts.append(dst) + desigs.append(designation) + print("# {}".format(descr)) + print("# Transitions:") + print("# Beginning {}".format(descriptions[0])) + prev_tz = datetime.timezone(datetime.timedelta(seconds=utoffs[0]), name=desigs[0]) + prev_naive = None + local_changes = [] + for i in range(len(transition_times)): + change_utc = datetime.datetime.fromtimestamp(transition_times[i], tz=datetime.timezone.utc) + change_prev = datetime.datetime.fromtimestamp(transition_times[i], tz=prev_tz) + change_prev_naive = change_prev.replace(tzinfo=None) + if prev_naive is not None: + assert change_prev_naive > prev_naive + local_changes.append((change_prev_naive, utoffs[transition_types[i]])) + prev_naive = change_prev_naive + print("# {} ({}, corresponding to {}) to {}".format(transition_times[i], change_utc, change_prev, descriptions[transition_types[i]])) + prev_tz = datetime.timezone(datetime.timedelta(seconds=utoffs[transition_types[i]]), name=desigs[transition_types[i]]) + + assert fin.read(1) == b'\n' + footer = fin.readline().decode('ascii').strip() + print("# Footer: {}".format(footer)) + tzi = decode_footer(footer) + + # For each year in a reasonable range, check if there is need + # for a dynamic rule + dynamic_tzis = [] + for year in range(2000, 2038): + start_of_year = datetime.datetime(year=year, month=1, day=1, hour=0, minute=0, second=0, microsecond=0) + start_idx = lower_bound(local_changes, start_of_year) + if start_idx == len(local_changes): + # Past the end of recorded data, so the footer is in + # force + pass + else: + if local_changes[start_idx][0] != start_of_year: + assert start_idx > 0 + start_idx -= 1 + for end_idx in range(start_idx+1, len(local_changes)): + if local_changes[end_idx][0].year != year: + break + else: + end_idx = len(local_changes) + relevant_changes = [] + for i in range(start_idx, end_idx): + if i == start_idx or local_changes[i][1] != local_changes[i-1][1]: + relevant_changes.append(local_changes[i]) + + if len(relevant_changes) > 3: + print("# WARNING! Too many changes in {}, will drop some of them".format(year)) + relevant_changes = [relevant_changes[0], relevant_changes[1], relevant_changes[-1]] + + if len(relevant_changes) == 1: + [change] = relevant_changes + assert change[1] % 60 == 0 + year_tzi = struct.pack("<lll", -change[1] // 60, 0, 0) + year_tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + year_tzi += struct.pack("<hhhhhhhh", 0, 0, 0, 0, 0, 0, 0, 0) + + elif len(relevant_changes) == 2: + [change1, change2] = relevant_changes + if change1[1] == change2[1]: + print("# WARNING! Not changing utoff in {}".format(year)) + if change1[1] > change2[1]: + dst_change = change1 + std_change = change2 + else: + std_change = change1 + dst_change = change2 + if std_change[0].year != year: + std_change = (start_of_year, std_change[1]) + if dst_change[0].year != year: + dst_change = (start_of_year, dst_change[1]) + assert std_change[1] % 60 == 0 + assert dst_change[1] % 60 == 0 + std_week = (std_change[0].day-1) // 7 + 1 + # if std_week == 4: + # std_week = 5 + dst_week = (dst_change[0].day-1) // 7 + 1 + # if dst_week == 4: + # dst_week = 5 + year_tzi = struct.pack("<lll", -std_change[1] // 60, 0, -(dst_change[1] - std_change[1]) // 60) + year_tzi += struct.pack("<hhhhhhhh", 0, std_change[0].month, (std_change[0].weekday()+1) % 7, std_week, + std_change[0].hour, std_change[0].minute, std_change[0].second, std_change[0].microsecond // 1000) + year_tzi += struct.pack("<hhhhhhhh", 0, dst_change[0].month, (dst_change[0].weekday()+1) % 7, dst_week, + dst_change[0].hour, dst_change[0].minute, dst_change[0].second, dst_change[0].microsecond // 1000) + + elif len(relevant_changes) == 3: + [change1, change2, change3] = relevant_changes + if change1[1] == change2[1]: + print("# WARNING! Not changing utoff in {}".format(year)) + if change2[1] == change3[1]: + print("# WARNING! Not changing utoff in {}".format(year)) + if change1[1] != change3[1]: + print("# WARNING! Utoff doesn't switch back and forth in {}".format(year)) + if change2[1] > change3[1]: + dst_change = change2 + std_change = change3 + else: + std_change = change2 + dst_change = change3 + assert std_change[1] % 60 == 0 + assert dst_change[1] % 60 == 0 + std_week = (std_change[0].day-1) // 7 + 1 + # if std_week == 4: + # std_week = 5 + dst_week = (dst_change[0].day-1) // 7 + 1 + # if dst_week == 4: + # dst_week = 5 + year_tzi = struct.pack("<lll", -std_change[1] // 60, 0, -(dst_change[1] - std_change[1]) // 60) + year_tzi += struct.pack("<hhhhhhhh", 0, std_change[0].month, (std_change[0].weekday()+1) % 7, std_week, + std_change[0].hour, std_change[0].minute, std_change[0].second, std_change[0].microsecond // 1000) + year_tzi += struct.pack("<hhhhhhhh", 0, dst_change[0].month, (dst_change[0].weekday()+1) % 7, dst_week, + dst_change[0].hour, dst_change[0].minute, dst_change[0].second, dst_change[0].microsecond // 1000) + + else: + assert(False) + + if realize_tzi(tzi, year) != realize_tzi(year_tzi, year): + dynamic_tzis.append((year, year_tzi)) + + # If there are dynamic TZI entries at all, add another one at + # the end with the plain tzi data, because Windows does the + # same + if dynamic_tzis != []: + dynamic_tzis.append((dynamic_tzis[-1][0]+1, tzi)) + + return tzi, dynamic_tzis + +def main(): + command = sys.argv[1] + windows_zones_filename = sys.argv[2] + tzdata_dir = sys.argv[3] + + display_names = {} + olson_names = {} + main_olson_name = {} + current_display_name = None + with open(windows_zones_filename) as fin: + for line in fin: + line = line.strip() + match = COMMENT_RE.match(line) + if match: + #print("Display name: {}".format(match.group(1))) + current_display_name = match.group(1) + assert current_display_name not in olson_names + assert current_display_name not in main_olson_name + olson_names[current_display_name] = set() + main_olson_name[current_display_name] = None + match = MAP_RE.match(line) + if match: + #print("Registry name: {}; Olson name: {}".format(match.group(1), match.group(2))) + reg_name = match.group(1) + olson_name = match.group(2) + if reg_name in display_names: + assert display_names[reg_name] == current_display_name + else: + display_names[reg_name] = current_display_name + for name in olson_name.split(' '): + olson_names[current_display_name].add(name) + if main_olson_name[current_display_name] is None: + assert olson_name.split(' ') == [olson_name] + main_olson_name[current_display_name] = olson_name + #print(reg_names) + #print(olson_names) + + olson_seen = set() + res_indices = set() + for reg_name in sorted(display_names.keys(), key=str.lower): + h = hashlib.sha1() + h.update(reg_name.encode('ascii')) + res_idx = int(h.hexdigest()[-3:], 16) << 4 + # Solve collisions by linear probing + while res_idx in res_indices: + res_idx += 16 + res_indices.add(res_idx) + display_name = display_names[reg_name] + dlt_name = reg_name.replace('Standard Time', 'Daylight Time') + if command == 'registry': + for olson_name in olson_names[display_name]: + if olson_name in olson_seen: + print("# Olson name {} is duplicated".format(olson_name)) + olson_seen.add(olson_name) + olson_name = main_olson_name[display_name] + print("# Reading {} ({}, {})".format(olson_name, reg_name, display_name)) + tzi, dynamic_tzis = read_tz(os.path.join(tzdata_dir, olson_name)) + + # See https://docs.microsoft.com/en-us/windows/win32/api/timezoneapi/ns-timezonea… + #print('HKLM,%CurrentVersionNT%\Time Zones\{},"Display",,"{}"'.format(reg_name, display_name)) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"Display",,"{}"'.format(reg_name, olson_name)) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"Dlt",,"{}"'.format(reg_name, dlt_name if dlt_name != 'UTC' else 'Coordinated Universal Time')) + #print('HKLM,%CurrentVersionNT%\Time Zones\{},"MUI_Display",,"@tzres.dll,-{}"'.format(reg_name, res_idx + 2)) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"MUI_Dlt",,"@tzres.dll,-{}"'.format(reg_name, res_idx + 1)) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"MUI_Std",,"@tzres.dll,-{}"'.format(reg_name, res_idx)) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"Std",,"{}"'.format(reg_name, reg_name if reg_name != 'UTC' else 'Coordinated Universal Time')) + print('HKLM,%CurrentVersionNT%\Time Zones\{},"TZI",1,{}'.format(reg_name, ",".join(["{:02x}".format(x) for x in tzi]))) + #print('HKLM,%CurrentVersionNT%\Time Zones\{},"Olson names",,"{}"'.format(reg_name, " ".join(sorted(olson_names[display_name])))) + for year, year_tzi in dynamic_tzis: + print('HKLM,%CurrentVersionNT%\Time Zones\{}\Dynamic DST,"{}",1,{}'.format(reg_name, year, ",".join(["{:02x}".format(x) for x in year_tzi]))) + if len(dynamic_tzis) != 0: + print('HKLM,%CurrentVersionNT%\Time Zones\{}\Dynamic DST,"FirstEntry",0x10001,"{}"'.format(reg_name, dynamic_tzis[0][0])) + print('HKLM,%CurrentVersionNT%\Time Zones\{}\Dynamic DST,"LastEntry",0x10001,"{}"'.format(reg_name, dynamic_tzis[-1][0])) + if command == 'resource': + print('{:7} "{}"'.format(res_idx, reg_name if reg_name != 'UTC' else 'Coordinated Universal Time')) + print('{:7} "{}"'.format(res_idx + 1, dlt_name if dlt_name != 'UTC' else 'Coordinated Universal Time')) + #print('{:7} "{}"'.format(res_idx + 2, display_name)) + +if __name__ == '__main__': + main() + #read_tz("/etc/localtime") -- 2.30.0

1 3

[PATCH 2/2] documentation: Dutch README translation
by Floris Renaud 28 Jan '21

28 Jan '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- documentation/README.nl | 182 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 documentation/README.nl diff --git a/documentation/README.nl b/documentation/README.nl new file mode 100644 index 00000000000..e57696f8e7e --- /dev/null +++ b/documentation/README.nl @@ -0,0 +1,182 @@ +1. INTRODUCTIE + +Wine is een programma wat het mogelijk maakt om Microsoft Windows +programma's (waaronder uitvoerbare DOS, Windows 3.x, Win32 en Win64 +bestanden) op Unix uit te voeren. Het bestaat uit een programma- +lader die het Microsoft Windows binaire bestand laadt en uitvoert. +Een bibliotheek (Winelib genaamd) die de Windows API aanroepen laat +uitvoeren door overeenkomstige Unix, X11 of Mac varianten. Deze +bibliotheek kan ook worden gebruikt om Windows code om te zetten in +echte Unix uitvoerbare bestanden. + +Wine is vrije software, uitgebracht onder de GNU LGPL. Zie het +LICENCE bestand voor meer informatie. + + +2. SNEL AAN DE SLAG + +Voer in de hoofdmap van de Wine broncode (waar het README bestand staat), +het volgende uit: + +./configure +make + +Installeer daarna Wine met: + +make install + +Of voer Wine uit in de map waarin die gebouwd is: + +./wine notepad + +Programma's kunnen uitgevoerd worden met "wine programma". Lees voor meer +informatie en het oplossingen van problemen de rest van dit bestand, de +man pagina's van Wine en vooral de overvloed aan informatie op +https://winehq.org . + + +3. BENODIGDHEDEN + +Om Wine te kunnen compileren en uit te voeren, is één van het volgende +besturingssystemen nodig: + + Linux versie 2.0.36 of nieuwer + FreeBSD 8.0 of nieuwer + Solaris x86 9 of nieuwer + NetBSD-current + Mac OS X 10.8 of nieuwer + +Omdat Wine threadondersteuning op kernelniveau vereist, worden alleen de +bovenstaande besturingssystemen ondersteund. Andere besturingssystemen +die threadondersteuning op kernelniveau hebben, kunnen mogelijk in de +toekomst ook ondersteund worden. + +FreeBSD informatie: + Over het algemeen werkt Wine niet goed op versies die ouder zijn dan + FreeBSD 8.0. Zie https://wiki.freebsd.org/Wine voor meer informatie. + +Solaris informatie: + Hoogst waarschijnlijk moet Wine gebouwd worden met de GNU toolchain + (gcc, gas, enz.). Waarschuwing: het installeren van gas houdt *niet* + in dat het gebruikt wordt door gcc. Hercompileren van gcc nadat gas + is geïnstalleerd of symbolische verwijzingen maken voor cc, as en + ld naar de gnu-tools is waarschijnlijk noodzakelijk. + +NetBSD informatie: + Zorg er voor dat de volgende opties aan staan in de kernel: USER_LDT, + SYSVSHM, SYSVSEM, en SYSVMSG. + +Mac OS X informatie: + Xcode/Xcode Command Line Tools of Apple cctools zijn nodig. De minimale + vereisten om Wine te kunnen compileren zijn clang 3.8 met MacOSX10.10.sdk + en mingw-w64 v8. MacOSX10.14.sdk en nieuwer kunnen alleen wine64 bouwen. + +Ondersteunde bestandssystemen: + Wine zou op de meeste bestandssystemen uitgevoerd moeten kunnen worden. + Er zijn enkele compatibiliteitsproblemen bekend met bestanden die via + Samba worden benaderd. Ook heeft NTFS niet alle bestandssysteemopties die + nodig zijn met sommige programma's. Een oorspronkelijk Unix + bestandssysteem wordt aangeraden. + +Basis benodigdheden: + De X11-ontwikkel-bestanden moeten geïnstalleerd zijn. (Voor Debian is dat + pakket xorg-dev in RedHat is dit libX11-devel). + + Natuurlijk is ook "make" nodig. (Hoogst waarschijnlijk GNU make.) + + Ook zijn bison en flex versie 2.5.33 of nieuwer nodig. + +Optionele bibliotheken: + Tijdens het uitvoeren van ./configure wordt er aangegeven of de optionele + bibliotheken zijn gevonden op het systeem. Bekijk + https://wiki.winehq.org/Building_Wine voor meer informatie over welke + pakketten er geïnstalleerd zouden moeten worden. Op 64-bit systemen + moeten ook de 32-bit versies van deze pakketten geïnstalleerd worden. + + +4. COMPILEREN + +Om Wine te bouwen, voer het volgende uit: + +./configure +make + +Hiermee wordt het programma "wine" en talrijke ondersteunende bibliotheken +en uitvoerbare bestanden gemaakt. Het programma "wine" laadt en voert de +uitvoerbare Windows bestanden uit. +De bibliotheek "libwine" ("Winelib") kan worden gebruikt om Windows +broncode te compileren en te linken in Unix. + +Voor alle opties tijdens het compileren, voer ./configure --help uit. + +Voor meer informatie bekijk: https://wiki.winehq.org/Building_Wine + + +5. SETUP + +Wanneer Wine goed in elkaar is gezet, kan Wine geïnstalleerd worden met +"make install". Deze opdracht installeert het uitvoerbare wine bestand, +de bibliotheken, de Wine man pagina's en alle andere benodigde bestanden. + +Vergeet niet om eerst elke tegenstrijdige Wine installatie te verwijderen. +Dit kan voor de installatie met "dpkg -r wine", "rpm -e wine" of met +"make uninstall" + +Eenmaal geïnstalleerd, kan het configuratie programma "winecfg" worden +uitgevoerd. Bekijk de Support pagina op https://www.winehq.org/ voor +configuratiehints. + + +6. PROGRAMMA'S UITVOEREN + +Bij het gebruiken van Wine kan het gehele pad naar het uitvoerbare bestand +worden gebruikt of alleen de bestandsnaam. + +Voorbeeld: het Kladblok (Notepad) uitvoeren: + + wine notepad (gebruikt het zoek-pad, zoals in het register is + wine notepad.exe opgegeven, om het bestand te vinden) + + wine c:\\windows\\notepad.exe (met een DOS bestandsnaam constructie) + + wine ~/.wine/drive_c/windows/notepad.exe (een Unix constructie) + + wine notepad.exe readme.txt (een programma met parameters) + +Wine is niet perfect. Dus sommige programma's kunnen crashen. Als dat +gebeurd komt er een logboek van de crash. Deze kan bijgevoegd worden als de +fout wordt gerapporteerd. + + +7. MEER INFORMATIE + +WWW: Een grote verscheidenheid aan informatie voor Wine is beschikbaar + gemaakt door WineHQ op https://www.winehq.org/ : verschillende + handleidingen, programma database, bug tracking. Dit is + waarschijnlijk de beste plek om te beginnen. + +FAQ: Veel vragen over Wine zijn te vinden op https://www.winehq.org/FAQ + +Wiki: De Wine-Wiki staat op https://wiki.winehq.org + +Mail-lijsten: + Er zijn meerdere mail-lijsten voor gebruikers en ontwikkelaars van + Wine. Bekijk https://www.winehq.org/forums voor meer informatie. + +Fouten: Op https://bugs.winehq.org kunnen fouten gemeld worden aan de Wine + Bugzilla. Doorzoek eerst de database van bugzilla om te kijken of + de fout al bekend of gerepareerd is voordat de fout gemeld wordt. + +IRC: Online hulp is beschikbaar in kanaal #WineHQ op irc.freenode.net + +Git: De huidige ontwikkeling van Wine is beschikbaar op Git. Bezoek + https://www.winehq.org/git voor meer informatie. + +Om iets toe te voegen aan de volgende uitgave van Wine of om een fout op te +lossen, stuur een patch (de voorkeur heeft een git-format-patch) naar de +wine-devel(a)winehq.org lijst. + +-- +Alexandre Julliard +julliard(a)winehq.org + -- 2.30.0

1 0

[PATCH] documentation: Change obsolete Debian and Red Hat packages.
by Floris Renaud 28 Jan '21

28 Jan '21

xlib6g-dev on Debian and XFree86-devel on Red Hat no longer exist. Replaced with: xorg-dev (Debian) and libX11-devel (Red Hat) Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 4 ++-- documentation/README.fr | 4 ++-- documentation/README.hu | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 4 ++-- documentation/README.no | 4 ++-- documentation/README.pt | 2 +- documentation/README.pt_br | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 4 ++-- documentation/README.tr | 2 +- documentation/README.uk | 2 +- documentation/README.zh_cn | 6 ++---- 17 files changed, 23 insertions(+), 25 deletions(-) diff --git a/README b/README index 21ab6f23b20..7d834db0a8f 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ Supported file systems: Basic requirements: You need to have the X11 development include files installed - (called xlib6g-dev in Debian and XFree86-devel in Red Hat). + (called xorg-dev in Debian and libX11-devel in Red Hat). Of course you also need "make" (most likely GNU make). diff --git a/documentation/README.de b/documentation/README.de index b30575a356d..be8c033dba5 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -80,7 +80,7 @@ Unterstützte Dateisysteme: Grundsätzliche Voraussetzungen: Sie müssen die Entwicklungsdateien für X11 installiert haben - (Debian nennt diese xlib6g-dev, Red Hat XFree86-devel). + (Debian nennt diese xorg-dev, Red Hat libX11-devel). Selbstverständlich benötigen Sie auch "make" (höchstwahrscheinlich GNU make). diff --git a/documentation/README.es b/documentation/README.es index 8068217ebcd..19b43dd02ec 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -68,7 +68,7 @@ Sistemas de ficheros soportados: Requisitos básicos: Necesitará tener instalados los archivos include X11 para desarrollo - (llamados xlib6g-dev en Debian y XFree86-devel en RedHat). + (llamados xorg-dev en Debian y libX11-devel en RedHat). Además necesitará "make" (preferiblemente GNU make). diff --git a/documentation/README.fi b/documentation/README.fi index b2c6524548e..13af44b1e9b 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -71,8 +71,8 @@ Tuetut tiedostojärjestelmät: on suotavaa. Perusvaatimukset: - Koneella täytyy olla X11:n kehitystiedostot (Debianissa xlib6g-dev, - Red Hatissa XFree86-devel). + Koneella täytyy olla X11:n kehitystiedostot (Debianissa xorg-dev, + Red Hatissa libX11-devel). Luonnollisesti myös make (yleensä GNU make) on tarpeen. diff --git a/documentation/README.fr b/documentation/README.fr index 28729a5b41e..2105502cf55 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -74,8 +74,8 @@ Systèmes de fichiers pris en charge : est recommandée. Configuration de base requise : - Les fichiers d'en-tête de X11 (appelés xlib6g-dev sous Debian et - XFree86-devel sous Red Hat) doivent être installés. + Les fichiers d'en-tête de X11 (appelés xorg-dev sous Debian et + libX11-devel sous Red Hat) doivent être installés. Bien entendu, vous aurez besoin du programme « make » (très probablement GNU make). diff --git a/documentation/README.hu b/documentation/README.hu index f672dea43d2..e28c534c51e 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -73,7 +73,7 @@ Támogatott fájlrendszerek: Alap követelmények: Önnek fel kell telepítenie az X11 fejlesztõi fájlokat - (xlib6g-dev néven van a Debianban és XFree86-devel néven a Red Hat-ben). + (xorg-dev néven van a Debianban és libX11-devel néven a Red Hat-ben). Fordítási eszköz követelmények: x86 rendszereken gcc >= 2.7.2 szükséges. diff --git a/documentation/README.it b/documentation/README.it index ecb4aed75e8..68f0df1f75f 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -68,7 +68,7 @@ File system supportati: Requisiti basilari: Devono essere installati i file include di sviluppo di X11 - (chiamato xlib6g-dev in Debian e XFree86-devel in Red Hat). + (chiamato xorg-dev in Debian e libX11-devel in Red Hat). Ovviamente necessario anche "make" (possibilmente GNU make). diff --git a/documentation/README.ja b/documentation/README.ja index ea584853db1..72e1ce2fe46 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -77,7 +77,7 @@ Mac OS X情報: 基本的な要件: X11開発includeファイルをインストールする必要があります。 - （Debianではxlib6g-devでRed HatではXFree86-develと呼ばれます。[訳注: 最近の + （Debianではxorg-devでRed HatではlibX11-develと呼ばれます。[訳注: 最近のディストリビューションでは別のパッケージで置き換えられています]）もちろん"make"も必要です（大概はGNU make）。 diff --git a/documentation/README.ko b/documentation/README.ko index a22cc1ea149..17fcfee318a 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -72,8 +72,8 @@ Mac OS X 정보: 기본 요구 사항: - X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xlib6g-dev, - 레드햇에서는 XFree86-devel이란 패키지명으로 되어 있습니다). + X11 개발용 헤더 파일이 설치되어 있어야 합니다 (데비안에서는 xorg-dev, + 레드햇에서는 libX11-devel이란 패키지명으로 되어 있습니다). 당연히 "make" 프로그램도 필요합니다 (대부분 GNU make 사용). diff --git a/documentation/README.no b/documentation/README.no index 14d7ebcd498..a25b47f7fce 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -64,8 +64,8 @@ Støttede filsystemer: programmer trenger. Det anbefales å bruke et ekte Unix-filsystem. Basiskrav: - Inkluderingsfilene for X11 må være installert (kalt «xlib6g-dev» i - Debian og «XFree86-devel» i RedHat). + Inkluderingsfilene for X11 må være installert (kalt «xorg-dev» i + Debian og «libX11-devel» i RedHat). Du må selvfølgelig også ha «make», sannsynligvis «GNU make». diff --git a/documentation/README.pt b/documentation/README.pt index 848d2d2eb26..256eb2310c0 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -73,7 +73,7 @@ possa escrever. Requisitos básicos: Tu precisas de ter instalados os fucheiros de include do X11 development -(chamados xlib6g-dev em Debian e Xfree86-devel no RedHat). +(chamados xorg-dev em Debian e libX11-devel no RedHat). Requisitos para as ferramentas de construção: Em sistemas x86 o gcc >= 2.7.2 é requerido. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 05a3d037bd5..a8025b55ac0 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -68,7 +68,7 @@ Sistemas de arquivo suportados: Requisitos básicos: Você necessita ter instalados os arquivos de inclusão para desenvolvimento - do X11 (chamados de xlib6g-dev no Debian e XFree86-devel no RedHat). + do X11 (chamados de xorg-dev no Debian e libX11-devel no RedHat). Obviamente você também irá precisar do "make" (comumente o GNU make). diff --git a/documentation/README.ru b/documentation/README.ru index f3328edd13a..78ee9a50959 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -66,7 +66,7 @@ Mac OS X: Базовые требования: У вас должны быть установлены заголовочные файлы X11 - (xlib6g-dev в Debian и XFree86-devel в Red Hat). + (xorg-dev в Debian и libX11-devel в Red Hat). Разумеется, вам необходим «make» (лучше всего использовать GNU make). diff --git a/documentation/README.sv b/documentation/README.sv index b68e6997d92..be017d40d7f 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -70,8 +70,8 @@ Stödda filsystem: program. Det rekommenderas att använda ett riktigt Unix-filsystem. Grundläggande krav: - Utvecklingsfilerna för X11 måste vara installerade (de kallas xlib6g-dev i - Debian och XFree86-devel i Red Hat). + Utvecklingsfilerna för X11 måste vara installerade (de kallas xorg-dev i + Debian och libX11-devel i Red Hat). Du måste givetvis också ha "make" (mest troligt "GNU make"). diff --git a/documentation/README.tr b/documentation/README.tr index 28b17b8c377..ae145171269 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -69,7 +69,7 @@ Desteklenen dosya sistemleri: Temel gereksinimler: X11 geliştirme dosyalarının kurulu olması gereklidir. - (Debian'da xlib6g-dev, Red Hat'da XFree86-devel adlı paketler). + (Debian'da xorg-dev, Red Hat'da libX11-devel adlı paketler). "make" komutuna kesinlikle ihtiyacınız vardır. (çoğunlukla GNU make) diff --git a/documentation/README.uk b/documentation/README.uk index a70e4979f11..8fea73571af 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -70,7 +70,7 @@ Mac OS X: Базові вимоги: У вас повинні бути встановлені файли заголовків X11 - (Xlib6g-dev в Debian та XFree86-devel в Red Hat). + (xorg-dev в Debian та libX11-devel в Red Hat). Звісно, вам потрібен "make" (краще всього використовувати GNU make). diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index 963b15720b0..934079fdef4 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -63,10 +63,8 @@ Mac OS X 信息: 文件系统。基本要求： - 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xlib6g-dev - ，在 Red Hat 中可能被称为 XFree86-devel [译注：在新版本的 Linux - 发行版中可能有其它名称，例如使用替代 Xlib 的 XCB library，此时 - Debian 的包名称应为 libxcb1-dev]）。 + 您需要安装 X11 开发用头文件（在 Debian 中可能被称为 xorg-dev + ，在 Red Hat 中可能被称为 libX11-devel）。当然您同样需要“make”工具（一般应当为 GNU make）。 -- 2.30.0

1 0

[PATCH 1/6] windowscodecs: Add IWICMetadataBlockWriter stub interface.
by Paul Gofman 28 Jan '21

28 Jan '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windowscodecs/encoder.c | 120 ++++++++++++++++++++++++- dlls/windowscodecs/libjpeg.c | 2 +- dlls/windowscodecs/libpng.c | 2 +- dlls/windowscodecs/libtiff.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 1 + 5 files changed, 122 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/encoder.c b/dlls/windowscodecs/encoder.c index 8e05048d1df..e72ceb0735c 100644 --- a/dlls/windowscodecs/encoder.c +++ b/dlls/windowscodecs/encoder.c @@ -58,6 +58,7 @@ typedef struct CommonEncoder { typedef struct CommonEncoderFrame { IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + IWICMetadataBlockWriter IWICMetadataBlockWriter_iface; LONG ref; CommonEncoder *parent; struct encoder_frame encoder_frame; @@ -77,10 +78,15 @@ static inline CommonEncoderFrame *impl_from_IWICBitmapFrameEncode(IWICBitmapFram return CONTAINING_RECORD(iface, CommonEncoderFrame, IWICBitmapFrameEncode_iface); } +static inline CommonEncoderFrame *impl_from_IWICMetadataBlockWriter(IWICMetadataBlockWriter *iface) +{ + return CONTAINING_RECORD(iface, CommonEncoderFrame, IWICMetadataBlockWriter_iface); +} + static HRESULT WINAPI CommonEncoderFrame_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - CommonEncoderFrame *This = impl_from_IWICBitmapFrameEncode(iface); + CommonEncoderFrame *object = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -88,7 +94,12 @@ static HRESULT WINAPI CommonEncoderFrame_QueryInterface(IWICBitmapFrameEncode *i if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = &This->IWICBitmapFrameEncode_iface; + *ppv = &object->IWICBitmapFrameEncode_iface; + } + else if (object->parent->encoder_info.flags & ENCODER_FLAGS_SUPPORTS_METADATA + && IsEqualIID(&IID_IWICMetadataBlockWriter, iid)) + { + *ppv = &object->IWICMetadataBlockWriter_iface; } else { @@ -628,6 +639,110 @@ static HRESULT WINAPI CommonEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBit return WINCODEC_ERR_UNSUPPORTEDOPERATION; } +static HRESULT WINAPI CommonEncoderFrame_Block_QueryInterface(IWICMetadataBlockWriter *iface, REFIID iid, void **ppv) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_QueryInterface(&encoder->IWICBitmapFrameEncode_iface, iid, ppv); +} + +static ULONG WINAPI CommonEncoderFrame_Block_AddRef(IWICMetadataBlockWriter *iface) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_AddRef(&encoder->IWICBitmapFrameEncode_iface); +} + +static ULONG WINAPI CommonEncoderFrame_Block_Release(IWICMetadataBlockWriter *iface) +{ + CommonEncoderFrame *encoder = impl_from_IWICMetadataBlockWriter(iface); + + return IWICBitmapFrameEncode_Release(&encoder->IWICBitmapFrameEncode_iface); +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetContainerFormat(IWICMetadataBlockWriter *iface, GUID *container_format) +{ + FIXME("iface %p, container_format %p stub.\n", iface, container_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetCount(IWICMetadataBlockWriter *iface, UINT *count) +{ + FIXME("iface %p, count %p stub.\n", iface, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetReaderByIndex(IWICMetadataBlockWriter *iface, + UINT index, IWICMetadataReader **metadata_reader) +{ + FIXME("iface %p, index %d, metadata_reader %p stub.\n", iface, index, metadata_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetEnumerator(IWICMetadataBlockWriter *iface, IEnumUnknown **enum_metadata) +{ + FIXME("iface %p, ppIEnumMetadata %p stub.\n", iface, enum_metadata); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_InitializeFromBlockReader(IWICMetadataBlockWriter *iface, + IWICMetadataBlockReader *metadata_block_reader) +{ + FIXME("iface %p, metadata_block_reader %p stub.\n", iface, metadata_block_reader); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_GetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter **metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_AddWriter(IWICMetadataBlockWriter *iface, IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, metadata_writer %p.\n", iface, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_SetWriterByIndex(IWICMetadataBlockWriter *iface, UINT index, + IWICMetadataWriter *metadata_writer) +{ + FIXME("iface %p, index %u, metadata_writer %p stub.\n", iface, index, metadata_writer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CommonEncoderFrame_Block_RemoveWriterByIndex(IWICMetadataBlockWriter *iface, UINT index) +{ + FIXME("iface %p, index %u.\n", iface, index); + + return E_NOTIMPL; +} + +static const IWICMetadataBlockWriterVtbl CommonEncoderFrame_BlockVtbl = +{ + CommonEncoderFrame_Block_QueryInterface, + CommonEncoderFrame_Block_AddRef, + CommonEncoderFrame_Block_Release, + CommonEncoderFrame_Block_GetContainerFormat, + CommonEncoderFrame_Block_GetCount, + CommonEncoderFrame_Block_GetReaderByIndex, + CommonEncoderFrame_Block_GetEnumerator, + CommonEncoderFrame_Block_InitializeFromBlockReader, + CommonEncoderFrame_Block_GetWriterByIndex, + CommonEncoderFrame_Block_AddWriter, + CommonEncoderFrame_Block_SetWriterByIndex, + CommonEncoderFrame_Block_RemoveWriterByIndex, +}; + static HRESULT WINAPI CommonEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { @@ -661,6 +776,7 @@ static HRESULT WINAPI CommonEncoder_CreateNewFrame(IWICBitmapEncoder *iface, } result->IWICBitmapFrameEncode_iface.lpVtbl = &CommonEncoderFrame_Vtbl; + result->IWICMetadataBlockWriter_iface.lpVtbl = &CommonEncoderFrame_BlockVtbl; result->ref = 1; result->parent = This; diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 84e4df5e007..96a9b79f358 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -746,7 +746,7 @@ HRESULT CDECL jpeg_encoder_create(struct encoder_info *info, struct encoder **re This->cinfo_initialized = FALSE; *result = &This->encoder; - info->flags = 0; + info->flags = ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatJpeg; info->clsid = CLSID_WICJpegEncoder; info->encoder_options[0] = ENCODER_OPTION_IMAGE_QUALITY; diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index a5068c20349..0571f5a2aad 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -997,7 +997,7 @@ HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **res This->data = NULL; *result = &This->encoder; - info->flags = 0; + info->flags = ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatPng; info->clsid = CLSID_WICPngEncoder; info->encoder_options[0] = ENCODER_OPTION_INTERLACE; diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 6f5cfc53c62..25d8c1c6081 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1414,7 +1414,7 @@ HRESULT CDECL tiff_encoder_create(struct encoder_info *info, struct encoder **re This->tiff = NULL; This->num_frames = 0; - info->flags = ENCODER_FLAGS_MULTI_FRAME; + info->flags = ENCODER_FLAGS_MULTI_FRAME | ENCODER_FLAGS_SUPPORTS_METADATA; info->container_format = GUID_ContainerFormatTiff; info->clsid = CLSID_WICTiffEncoder; info->encoder_options[0] = ENCODER_OPTION_COMPRESSION_METHOD; diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 85d057cc278..997bdee3446 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -355,6 +355,7 @@ enum encoder_option #define ENCODER_FLAGS_MULTI_FRAME 0x1 #define ENCODER_FLAGS_ICNS_SIZE 0x2 +#define ENCODER_FLAGS_SUPPORTS_METADATA 0x4 struct encoder_info { -- 2.29.2

2 13

[tools] testbot/TestWTBS: Add support for checking timeouts.
by Francois Gouget 28 Jan '21

28 Jan '21

Timeouts can get reported in many different ways depending on whether they are detected by TestLauncher, the WineRun* script or the Engine. That makes a simple error matching or grep impossible. So provide specific support for checking that a task timed out. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 94 +++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 67b1c8f96..6f78406ad 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -402,7 +402,10 @@ sub LoadTestInfo($) my $Status = ($TestInfo->{job}->{Status} ne 'completed' or $TestInfo->{win32}->{TestFailures} or $TestInfo->{win64}->{TestFailures} or - $TestInfo->{wine}->{TestFailures}) ? "Failed" : "OK"; + $TestInfo->{wine}->{TestFailures} or + $TestInfo->{win32}->{HasTimeout} or + $TestInfo->{win64}->{HasTimeout} or + $TestInfo->{wine}->{HasTimeout}) ? "Failed" : "OK"; SetDefault($TestInfo, "webpatch", "Status", $Status); } @@ -555,6 +558,16 @@ sub IsMailingListJob($) return $Job->Remarks =~ /^\[\Q$PatchesMailingList\E\] /; } +sub IsTimeoutError($$) +{ + my ($GroupName, $Error) = @_; + + return (($GroupName ne "" and # Test dll or Report validation errors + $Error =~ /^[_a-z0-9]+: Timeout$/) or # Test unit + ($GroupName eq "" and # testbot.log case + $Error eq "The task timed out")); +} + =pod =item <tasks.(report|log|testbot).groupname> @@ -584,17 +597,19 @@ directives, win32 will not inherit anything from the win category. =cut -sub CheckLogErrors($$$) +sub CheckLogErrors($$$$) { - my ($LogInfo, $RefInfo, $LogKey) = @_; + my ($LogInfo, $RefInfo, $LogKey, $IgnoreTimeouts) = @_; + my $HasTimeout; foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + # Prevent $RefInfo from springing into existence + my $RefGroup = $RefInfo ? $RefInfo->{ErrGroups}->{$GroupName} : undef; if ($RefGroup) { + # Match the log errors to the expected errors for this group my $Diff = Algorithm::Diff->new($LogGroup->{Errors}, $RefGroup->{Errors}, { keyGen => \&WineTestBot::LogUtils::_GetLineKey }); my ($LogIndex, $RefIndex) = (0, 0); @@ -613,6 +628,12 @@ sub CheckLogErrors($$$) foreach (1..$ExtraCount) { next if (!$LogGroup->{IsNew}->[$LogIndex]); + if ($IgnoreTimeouts and + IsTimeoutError($GroupName, $LogGroup->{Errors}->[$LogIndex])) + { + next; + } + fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); $LogIndex++; } @@ -626,27 +647,39 @@ sub CheckLogErrors($$$) } } } - else + + # Check for timeouts and new errors if no error was expected for that group + foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) { - # Check that the log's extra errors are old errors - foreach my $ErrIndex (0..@{$LogGroup->{Errors}} - 1) + if (IsTimeoutError($GroupName, $LogGroup->{Errors}->[$ErrIndex])) + { + $HasTimeout = 1; + next if ($IgnoreTimeouts); # ignore expected timeouts + } + if ($RefInfo and !$RefGroup and $LogGroup->{IsNew}->[$ErrIndex]) { - next if (!$LogGroup->{IsNew}->[$ErrIndex]); fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$ErrIndex]"); } } } - foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) - { - my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; - next if ($LogGroup); - my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; - foreach my $Error (@{$RefGroup->{Errors}}) + if ($RefInfo) + { + # Check for groups missing from the log file + foreach my $GroupName (@{$RefInfo->{ErrGroupNames}}) { - fail("$LogKey is missing an error in $GroupName: $Error"); + my $LogGroup = $LogInfo->{ErrGroups}->{$GroupName}; + next if ($LogGroup); + + my $RefGroup = $RefInfo->{ErrGroups}->{$GroupName}; + foreach my $Error (@{$RefGroup->{Errors}}) + { + fail("$LogKey is missing an error in $GroupName: $Error"); + } } } + + return $HasTimeout; } sub GrepFile($$$$;$) @@ -716,6 +749,18 @@ By default the Status field should be 'completed'. Checks the value of the task's TestFailures field. By default the TestFailures field is not checked. +=item <tasks.HasTimeout> + +When true verifies that the task timed out. +This also disables reporting timeout errors as unexpected errors. + +Use this instead of looking for a specific error in the report because +timeouts can get reported in many different ways depending whether they are +detected by TestLauncher, the WineRun* script or the Engine. It can also +depend on whether the test was the last one run by the task (in the Wine case). +By default this check is skipped and timeout errors are reported like any +other unexpected error. + =item <tasks.(report|log|testbot).Grep> =item <tasks.(report|log|testbot).GrepV> @@ -754,7 +799,10 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } - my ($ReportCount, $NewFailures) = (0, 0); + my $CheckTimeouts = ($Task->Status eq "completed" and + CheckValue($TaskInfo->{HasTimeout})); + + my ($ReportCount, $TimeoutCount, $NewFailures) = (0, 0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { my $LogPath = $Task->GetDir() ."/$LogName"; @@ -777,13 +825,19 @@ sub CheckTask($$$$) $LogType = "testbot"; } - if ($TaskInfo->{"$LogType.errors"}) + if ($TaskInfo->{"$LogType.errors"} or $CheckTimeouts) { - CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, - TaskKeyStr($Task) ."/$LogName"); + my $HasTimeout = CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, + TaskKeyStr($Task) ."/$LogName", + $TaskInfo->{HasTimeout}); + $TimeoutCount++ if ($HasTimeout); } GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); } + if ($CheckTimeouts) + { + ok($TimeoutCount >= $ReportCount, "Expecting 1+ timeout per report: $TimeoutCount timeouts, $ReportCount reports"); + } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) { # Scale the expected TestFailures count with the number of times the test -- 2.20.1

1 0

[tools] winetest/dissect: Improve the misplaced subtest error message.
by Francois Gouget 28 Jan '21

28 Jan '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c62f9141b..e9729dbc8 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -624,7 +624,7 @@ while ($line = <IN>) { } else { - add_test_line("end", "Misplaced $l_subunit subtest\n"); + add_test_line("end", "$l_unit has a misplaced $l_subunit subtest line\n"); $extra_failures++; } } -- 2.20.1

1 0

[tools] testbot/LogUtils: Improve the misplaced subtest error message.
by Francois Gouget 28 Jan '21

28 Jan '21

A subtest line, misplaced or not, also proves this is a Wine test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d537af26d..1b4ee7a28 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -579,8 +579,9 @@ sub ParseWineTestReport($$$) } else { - _AddExtra($LogInfo, "Misplaced $SubUnit subtest"); + _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); } + $LogInfo->{IsWineTest} = 1; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or -- 2.20.1

1 0

[PATCH 1/2] include: Include ntddndis.h in ndis.h.
by Zebediah Figura 28 Jan '21

28 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ddk/ndis.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index a4b0e540fa1..38eec8a7ac4 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -21,6 +21,8 @@ #ifndef _NDIS_ #define _NDIS_ +#include <ntddndis.h> + typedef ULONG NDIS_AF, *PNDIS_AF; typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; -- 2.30.0

1 1

[PATCH 1/4] winegstreamer: Use the "filesize" field in push_data().
by Zebediah Figura 27 Jan '21

27 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5c6266f4bd0..9b47bf4f88c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -823,10 +823,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) static DWORD CALLBACK push_data(LPVOID iface) { - LONGLONG maxlen, curlen; struct parser *This = iface; GstMapInfo mapping; GstBuffer *buffer; + LONGLONG maxlen; HRESULT hr; if (!(buffer = gst_buffer_new_allocate(NULL, 16384, NULL))) @@ -837,10 +837,7 @@ static DWORD CALLBACK push_data(LPVOID iface) IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); - if (!This->stop) - IAsyncReader_Length(This->reader, &maxlen, &curlen); - else - maxlen = This->stop; + maxlen = This->stop ? This->stop : This->filesize; TRACE("Starting..\n"); for (;;) { -- 2.30.0

1 3

[PATCH v3 1/2] widl: Support WinRT runtimeclass type parsing.
by Rémi Bernon 27 Jan '21

27 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: * Use is_attr in type_runtimeclass_get_default_iface, * early return if interface list is empty * remove the assert, * check the default interface in type_runtimeclass_define and emit an error message when it is missing. Supersedes: 198730-198731 tools/widl/expr.c | 1 + tools/widl/header.c | 44 ++++++- tools/widl/header.h | 1 - tools/widl/parser.l | 1 + tools/widl/parser.y | 269 ++++++++++++++++++++++++----------------- tools/widl/typegen.c | 4 + tools/widl/typelib.c | 1 + tools/widl/typetree.c | 19 +++ tools/widl/typetree.h | 24 ++++ tools/widl/widltypes.h | 7 ++ 10 files changed, 256 insertions(+), 115 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index be8311cfb7f..13bd5a889aa 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -463,6 +463,7 @@ static type_t *find_identifier(const char *identifier, const type_t *cont_type, case TYPE_ARRAY: case TYPE_BITFIELD: case TYPE_APICONTRACT: + case TYPE_RUNTIMECLASS: /* nothing to do */ break; case TYPE_ALIAS: diff --git a/tools/widl/header.c b/tools/widl/header.c index d5e35aac92f..ad205df0d05 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -463,6 +463,9 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i case TYPE_COCLASS: fprintf(h, "%s", name); break; + case TYPE_RUNTIMECLASS: + fprintf(h, "%s", type_get_name(type_runtimeclass_get_default_iface(t), name_type)); + break; case TYPE_VOID: fprintf(h, "void"); break; @@ -545,6 +548,7 @@ void write_type_right(FILE *h, type_t *t, int is_field) case TYPE_MODULE: case TYPE_COCLASS: case TYPE_INTERFACE: + case TYPE_RUNTIMECLASS: break; case TYPE_APICONTRACT: /* not supposed to be here */ @@ -1031,7 +1035,8 @@ static int is_aggregate_return(const var_t *func) { enum type_type type = type_get_type(type_function_get_rettype(func->declspec.type)); return type == TYPE_STRUCT || type == TYPE_UNION || - type == TYPE_COCLASS || type == TYPE_INTERFACE; + type == TYPE_COCLASS || type == TYPE_INTERFACE || + type == TYPE_RUNTIMECLASS; } static char *get_vtbl_entry_name(const type_t *iface, const var_t *func) @@ -1689,6 +1694,39 @@ static void write_apicontract(FILE *header, type_t *apicontract) free(name); } +static void write_runtimeclass(FILE *header, type_t *runtimeclass) +{ + expr_t *contract = get_attrp(runtimeclass->attrs, ATTR_CONTRACT); + char *name, *c_name; + name = format_namespace(runtimeclass->namespace, "", ".", runtimeclass->name, NULL); + c_name = format_namespace(runtimeclass->namespace, "", "_", runtimeclass->name, NULL); + fprintf(header, "/*\n"); + fprintf(header, " * Class %s\n", name); + fprintf(header, " */\n"); + if (contract) write_apicontract_guard_start(header, contract); + fprintf(header, "#ifndef RUNTIMECLASS_%s_DEFINED\n", c_name); + fprintf(header, "#define RUNTIMECLASS_%s_DEFINED\n", c_name); + fprintf(header, "#endif /* RUNTIMECLASS_%s_DEFINED */\n", c_name); + free(c_name); + free(name); + if (contract) write_apicontract_guard_end(header, contract); + fprintf(header, "\n"); +} + +static void write_runtimeclass_forward(FILE *header, type_t *runtimeclass) +{ + fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", runtimeclass->c_name); + fprintf(header, "#define __%s_FWD_DEFINED__\n", runtimeclass->c_name); + fprintf(header, "#ifdef __cplusplus\n"); + write_namespace_start(header, runtimeclass->namespace); + write_line(header, 0, "class %s;", runtimeclass->name); + write_namespace_end(header, runtimeclass->namespace); + fprintf(header, "#else\n"); + fprintf(header, "typedef struct %s %s;\n", runtimeclass->c_name, runtimeclass->c_name); + fprintf(header, "#endif /* defined __cplusplus */\n"); + fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", runtimeclass->c_name); +} + static void write_import(FILE *header, const char *fname) { char *hname, *p; @@ -1753,6 +1791,8 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts) } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass_forward(header, stmt->u.type); + else if (type_get_type(stmt->u.type) == TYPE_RUNTIMECLASS) + write_runtimeclass_forward(header, stmt->u.type); break; case STMT_TYPEREF: case STMT_IMPORTLIB: @@ -1809,6 +1849,8 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons write_coclass(header, stmt->u.type); else if (type_get_type(stmt->u.type) == TYPE_APICONTRACT) write_apicontract(header, stmt->u.type); + else if (type_get_type(stmt->u.type) == TYPE_RUNTIMECLASS) + write_runtimeclass(header, stmt->u.type); else { write_type_definition(header, stmt->u.type, stmt->declonly); diff --git a/tools/widl/header.h b/tools/widl/header.h index d14e310addf..f949d1e6d0d 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -25,7 +25,6 @@ extern int is_ptrchain_attr(const var_t *var, enum attr_type t); extern int is_aliaschain_attr(const type_t *var, enum attr_type t); -extern int is_attr(const attr_list_t *list, enum attr_type t); extern void *get_attrp(const attr_list_t *list, enum attr_type t); extern unsigned int get_attrv(const attr_list_t *list, enum attr_type t); extern const char* get_name(const var_t *v); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 7a811d537d1..6bbfed5e80b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -298,6 +298,7 @@ static const struct keyword keywords[] = { {"pascal", tPASCAL, 0}, {"properties", tPROPERTIES, 0}, {"register", tREGISTER, 0}, + {"runtimeclass", tRUNTIMECLASS, 1}, {"short", tSHORT, 0}, {"signed", tSIGNED, 0}, {"sizeof", tSIZEOF, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 351bbd12107..d12caa06b63 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -100,6 +100,7 @@ static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +static attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func); @@ -247,6 +248,7 @@ static typelib_t *current_typelib; %token tREQUESTEDIT %token tRESTRICTED %token tRETVAL +%token tRUNTIMECLASS %token tSAFEARRAY %token tSHORT %token tSIGNED tSINGLENODE @@ -292,8 +294,8 @@ static typelib_t *current_typelib; %type <type> base_type int_std %type <type> enumdef structdef uniondef typedecl %type <type> type qualified_seq qualified_type -%type <ifref> coclass_int -%type <ifref_list> coclass_ints +%type <ifref> class_interface +%type <ifref_list> class_interfaces %type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> funcdef %type <var_list> m_args arg_list args dispint_meths @@ -304,6 +306,7 @@ static typelib_t *current_typelib; %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclasshdr coclassdef +%type <type> runtimeclass runtimeclass_hdr runtimeclass_def %type <type> apicontract %type <num> contract_ver %type <num> pointer_type threading_type marshaling_behavior version @@ -364,6 +367,9 @@ gbl_statements: { $$ = NULL; } } | gbl_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } + | gbl_statements runtimeclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } + | gbl_statements runtimeclass_def { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | gbl_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | gbl_statements librarydef { $$ = append_statement($1, make_statement_library($2)); } | gbl_statements statement { $$ = append_statement($1, $2); } @@ -380,6 +386,9 @@ imp_statements: { $$ = NULL; } } | imp_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } + | imp_statements runtimeclass ';' { $$ = $1; reg_type($2, $2->name, current_namespace, 0); } + | imp_statements runtimeclass_def { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | imp_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | imp_statements statement { $$ = append_statement($1, $2); } | imp_statements importlib { $$ = append_statement($1, make_statement_importlib($2)); } @@ -562,7 +571,9 @@ attribute: { $$ = NULL; } | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY, $3); } - | tEXCLUSIVETO '(' decl_spec ')' { $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } + | tEXCLUSIVETO '(' decl_spec ')' { if ($3->type->type_type != TYPE_RUNTIMECLASS) + error_loc("type %s is not a runtimeclass\n", $3->type->name); + $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } @@ -897,10 +908,29 @@ coclasshdr: attributes coclass { $$ = $2; } ; -coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt +coclassdef: coclasshdr '{' class_interfaces '}' semicolon_opt { $$ = type_coclass_define($1, $3); } ; +runtimeclass: + tRUNTIMECLASS aIDENTIFIER { $$ = type_new_runtimeclass($2, current_namespace); } + | tRUNTIMECLASS aKNOWNTYPE { $$ = find_type($2, NULL, 0); + if (type_get_type_detect_alias($$) != TYPE_RUNTIMECLASS) + error_loc("%s was not declared a runtimeclass at %s:%d\n", $2, + $$->loc_info.input_name, $$->loc_info.line_number); + } + ; + +runtimeclass_hdr: attributes runtimeclass { $$ = $2; + check_def($$); + $$->attrs = check_runtimeclass_attrs($2->name, $1); + } + ; + +runtimeclass_def: runtimeclass_hdr '{' class_interfaces '}' semicolon_opt + { $$ = type_runtimeclass_define($1, $3); } + ; + apicontract: attributes tAPICONTRACT aIDENTIFIER '{' '}' { $$ = get_type(TYPE_APICONTRACT, $3, current_namespace, 0); check_def($$); @@ -912,11 +942,11 @@ namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } | tNAMESPACE aNAMESPACE { $$ = $2; } ; -coclass_ints: { $$ = NULL; } - | coclass_ints coclass_int { $$ = append_ifref( $1, $2 ); } +class_interfaces: { $$ = NULL; } + | class_interfaces class_interface { $$ = append_ifref( $1, $2 ); } ; -coclass_int: +class_interface: m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } ; @@ -2185,117 +2215,118 @@ struct allowed_attr unsigned int on_module : 1; unsigned int on_coclass : 1; unsigned int on_apicontract : 1; + unsigned int on_runtimeclass : 1; const char *display_name; }; struct allowed_attr allowed_attr[] = { - /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC <display name> } */ - /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "aggregatable" }, - /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, - /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, - /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "appobject" }, - /* ATTR_ASYNC */ { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, - /* ATTR_ASYNCUUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "async_uuid" }, - /* ATTR_AUTO_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, - /* ATTR_BINDABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, - /* ATTR_BROADCAST */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, - /* ATTR_CALLAS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "call_as" }, - /* ATTR_CALLCONV */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, - /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "case" }, - /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, - /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, - /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, - /* ATTR_CONTRACT */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, "contract" }, - /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "contractversion" }, - /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, "control" }, - /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, "custom" }, - /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, - /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, "default" }, - /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, - /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, - /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, - /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "defaultvtable" }, - /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, - /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, - /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, - /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "dllname" }, - /* ATTR_DUAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, - /* ATTR_ENABLEALLOCATE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "enable_allocate" }, - /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, - /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, - /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, - /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, - /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, - /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, - /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, - /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, - /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpcontext" }, - /* ATTR_HELPFILE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "helpfile" }, - /* ATTR_HELPSTRING */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpstring" }, - /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpstringcontext" }, - /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, "hidden" }, - /* ATTR_ID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, "id" }, - /* ATTR_IDEMPOTENT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, - /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "ignore" }, - /* ATTR_IIDIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "iid_is" }, - /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, - /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, - /* ATTR_IN */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, - /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, - /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "length_is" }, - /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "lcid" }, - /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "licensed" }, - /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, - /* ATTR_MARSHALING_BEHAVIOR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "marshaling_behavior" }, - /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, - /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, - /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, - /* ATTR_NONBROWSABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, - /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "noncreatable" }, - /* ATTR_NONEXTENSIBLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, - /* ATTR_NOTIFY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify" }, - /* ATTR_NOTIFYFLAG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify_flag" }, - /* ATTR_OBJECT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, - /* ATTR_ODL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "odl" }, - /* ATTR_OLEAUTOMATION */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, - /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, - /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, - /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, - /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, - /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, - /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, - /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "ref, unique or ptr" }, - /* ATTR_PROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "progid" }, - /* ATTR_PROPGET */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, - /* ATTR_PROPPUT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, - /* ATTR_PROPPUTREF */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, - /* ATTR_PROXY */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "proxy" }, - /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "public" }, - /* ATTR_RANGE */ { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, "range" }, - /* ATTR_READONLY */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "readonly" }, - /* ATTR_REPRESENTAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "represent_as" }, - /* ATTR_REQUESTEDIT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, - /* ATTR_RESTRICTED */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, "restricted" }, - /* ATTR_RETVAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, - /* ATTR_SIZEIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "size_is" }, - /* ATTR_SOURCE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "source" }, - /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, - /* ATTR_STRING */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "string" }, - /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "switch_is" }, - /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "switch_type" }, - /* ATTR_THREADING */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "threading" }, - /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "transmit_as" }, - /* ATTR_UIDEFAULT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "uidefault" }, - /* ATTR_USESGETLASTERROR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "usesgetlasterror" }, - /* ATTR_USERMARSHAL */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "user_marshal" }, - /* ATTR_UUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, "uuid" }, - /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, - /* ATTR_VARARG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 1, 0, "version" }, - /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "vi_progid" }, - /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, + /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC R <display name> } */ + /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "aggregatable" }, + /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, + /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, + /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "appobject" }, + /* ATTR_ASYNC */ { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, + /* ATTR_ASYNCUUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "async_uuid" }, + /* ATTR_AUTO_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, + /* ATTR_BINDABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, + /* ATTR_BROADCAST */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, + /* ATTR_CALLAS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "call_as" }, + /* ATTR_CALLCONV */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "case" }, + /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, + /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, + /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTRACT */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, "contract" }, + /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "contractversion" }, + /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, "control" }, + /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, "custom" }, + /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, + /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "default" }, + /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, + /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, + /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, + /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" }, + /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, + /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, + /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "dllname" }, + /* ATTR_DUAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, + /* ATTR_ENABLEALLOCATE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "enable_allocate" }, + /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, + /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, + /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, + /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, + /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, + /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, + /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpcontext" }, + /* ATTR_HELPFILE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "helpfile" }, + /* ATTR_HELPSTRING */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpstring" }, + /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpstringcontext" }, + /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "helpstringdll" }, + /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0, "hidden" }, + /* ATTR_ID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, "id" }, + /* ATTR_IDEMPOTENT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, + /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "ignore" }, + /* ATTR_IIDIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "iid_is" }, + /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, + /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, + /* ATTR_IN */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, + /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, + /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "length_is" }, + /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "lcid" }, + /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "licensed" }, + /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, + /* ATTR_MARSHALING_BEHAVIOR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "marshaling_behavior" }, + /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, + /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, + /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, + /* ATTR_NONBROWSABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, + /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "noncreatable" }, + /* ATTR_NONEXTENSIBLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, + /* ATTR_NOTIFY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify" }, + /* ATTR_NOTIFYFLAG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify_flag" }, + /* ATTR_OBJECT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, + /* ATTR_ODL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "odl" }, + /* ATTR_OLEAUTOMATION */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, + /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, + /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, + /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, + /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, + /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, + /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "ref, unique or ptr" }, + /* ATTR_PROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "progid" }, + /* ATTR_PROPGET */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, + /* ATTR_PROPPUT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, + /* ATTR_PROPPUTREF */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, + /* ATTR_PROXY */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "proxy" }, + /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "public" }, + /* ATTR_RANGE */ { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "range" }, + /* ATTR_READONLY */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "readonly" }, + /* ATTR_REPRESENTAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "represent_as" }, + /* ATTR_REQUESTEDIT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, + /* ATTR_RESTRICTED */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 0, "restricted" }, + /* ATTR_RETVAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, + /* ATTR_SIZEIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "size_is" }, + /* ATTR_SOURCE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "source" }, + /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, + /* ATTR_STRING */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "string" }, + /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "switch_is" }, + /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "switch_type" }, + /* ATTR_THREADING */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, "threading" }, + /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "transmit_as" }, + /* ATTR_UIDEFAULT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "uidefault" }, + /* ATTR_USESGETLASTERROR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "usesgetlasterror" }, + /* ATTR_USERMARSHAL */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "user_marshal" }, + /* ATTR_UUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, "uuid" }, + /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, + /* ATTR_VARARG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, + /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 1, 0, 1, "version" }, + /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "vi_progid" }, + /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) @@ -2510,6 +2541,17 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs) return attrs; } +static attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + if (!allowed_attr[attr->type].on_runtimeclass) + error_loc("inapplicable attribute %s for runtimeclass %s\n", + allowed_attr[attr->type].display_name, name); + return attrs; +} + static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; @@ -2559,6 +2601,7 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_FUNCTION: case TYPE_INTERFACE: case TYPE_BITFIELD: + case TYPE_RUNTIMECLASS: return FALSE; case TYPE_APICONTRACT: /* not supposed to be here */ diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5d0f24be06f..2e9be0748c1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -353,6 +353,7 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_ENUM; case TYPE_POINTER: if (type_get_type(type_pointer_get_ref_type(type)) == TYPE_INTERFACE || + type_get_type(type_pointer_get_ref_type(type)) == TYPE_RUNTIMECLASS || (type_get_type(type_pointer_get_ref_type(type)) == TYPE_VOID && is_attr(attrs, ATTR_IIDIS))) return TGT_IFACE_POINTER; else if (is_aliaschain_attr(type_pointer_get_ref_type(type), ATTR_CONTEXTHANDLE)) @@ -373,6 +374,7 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att case TYPE_VOID: case TYPE_ALIAS: case TYPE_BITFIELD: + case TYPE_RUNTIMECLASS: break; case TYPE_APICONTRACT: /* not supposed to be here */ @@ -1971,6 +1973,7 @@ unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) case TYPE_FUNCTION: case TYPE_BITFIELD: case TYPE_APICONTRACT: + case TYPE_RUNTIMECLASS: /* these types should not be encountered here due to language * restrictions (interface, void, coclass, module), logical * restrictions (alias - due to type_get_type call above) or @@ -2073,6 +2076,7 @@ static unsigned int type_buffer_alignment(const type_t *t) case TYPE_FUNCTION: case TYPE_BITFIELD: case TYPE_APICONTRACT: + case TYPE_RUNTIMECLASS: /* these types should not be encountered here due to language * restrictions (interface, void, coclass, module), logical * restrictions (alias - due to type_get_type call above) or diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index faf76440f93..ace6424e3a0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -218,6 +218,7 @@ unsigned short get_type_vt(type_t *t) case TYPE_MODULE: case TYPE_UNION: case TYPE_ENCAPSULATED_UNION: + case TYPE_RUNTIMECLASS: return VT_USERDEFINED; case TYPE_VOID: diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index df883576915..a18ffe1f4a5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -215,6 +215,16 @@ type_t *type_new_coclass(char *name) return type; } +type_t *type_new_runtimeclass(char *name, struct namespace *namespace) +{ + type_t *type = get_type(TYPE_RUNTIMECLASS, name, NULL, 0); + if (type->type_type != TYPE_RUNTIMECLASS || type->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + type->name = name; + type->namespace = namespace; + return type; +} type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is) @@ -509,6 +519,15 @@ type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces) return coclass; } +type_t *type_runtimeclass_define(type_t *runtimeclass, ifref_list_t *ifaces) +{ + runtimeclass->details.runtimeclass.ifaces = ifaces; + runtimeclass->defined = TRUE; + if (!type_runtimeclass_get_default_iface(runtimeclass)) + error_loc("missing default interface on runtimeclass %s\n", runtimeclass->name); + return runtimeclass; +} + int type_is_equal(const type_t *type1, const type_t *type2) { if (type_get_type_detect_alias(type1) != type_get_type_detect_alias(type2)) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 7abec41a8fd..dc44c3f5fa7 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -44,14 +44,17 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); +type_t *type_new_runtimeclass(char *name, struct namespace *namespace); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); +type_t *type_runtimeclass_define(type_t *runtimeclass, ifref_list_t *ifaces); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void); +extern int is_attr(const attr_list_t *list, enum attr_type t); /* FIXME: shouldn't need to export this */ type_t *duptype(type_t *t, int dupname); @@ -222,6 +225,7 @@ static inline int type_is_complete(const type_t *type) case TYPE_POINTER: case TYPE_ARRAY: case TYPE_BITFIELD: + case TYPE_RUNTIMECLASS: return TRUE; case TYPE_APICONTRACT: assert(0); @@ -322,6 +326,26 @@ static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) return type->details.coclass.ifaces; } +static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) +{ + type = type_get_real_type(type); + assert(type_get_type(type) == TYPE_RUNTIMECLASS); + return type->details.runtimeclass.ifaces; +} + +static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) +{ + ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); + ifref_t *entry; + + if (!ifaces) return NULL; + LIST_FOR_EACH_ENTRY(entry, ifaces, ifref_t, entry) + if (is_attr(entry->attrs, ATTR_DEFAULT)) + return entry->iface; + + return NULL; +} + static inline const decl_spec_t *type_pointer_get_ref(const type_t *type) { type = type_get_real_type(type); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index fbaabfbc8c3..46a44dac039 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -425,6 +425,11 @@ struct alias_details struct _decl_spec_t aliasee; }; +struct runtimeclass_details +{ + ifref_list_t *ifaces; +}; + #define HASHMAX 64 struct namespace { @@ -452,6 +457,7 @@ enum type_type TYPE_ARRAY, TYPE_BITFIELD, TYPE_APICONTRACT, + TYPE_RUNTIMECLASS, }; struct _type_t { @@ -472,6 +478,7 @@ struct _type_t { struct pointer_details pointer; struct bitfield_details bitfield; struct alias_details alias; + struct runtimeclass_details runtimeclass; } details; const char *c_name; unsigned int typestring_offset; -- 2.30.0

2 3

[PATCH v2 1/2] windowscodecs: Use IWICComponentFactory_CreateQueryReaderFromBlockReader in GetMetadataQueryReader.
by Rémi Bernon 27 Jan '21

27 Jan '21

Instead of MetadataQueryReader_CreateInstance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 198376-198377 dlls/windowscodecs/decoder.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index b05d50dfea9..b0fcd34c742 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -433,6 +433,8 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD IWICMetadataQueryReader **ppIMetadataQueryReader) { CommonDecoderFrame *This = impl_from_IWICBitmapFrameDecode(iface); + IWICComponentFactory* factory; + HRESULT hr; TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); @@ -442,7 +444,18 @@ static HRESULT WINAPI CommonDecoderFrame_GetMetadataQueryReader(IWICBitmapFrameD if (!(This->parent->file_info.flags & WICBitmapDecoderCapabilityCanEnumerateMetadata)) return WINCODEC_ERR_UNSUPPORTEDOPERATION; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, &This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + IWICComponentFactory_Release(factory); + } + + if (FAILED(hr)) + *ppIMetadataQueryReader = NULL; + + return hr; } static HRESULT WINAPI CommonDecoderFrame_GetColorContexts(IWICBitmapFrameDecode *iface, -- 2.30.0

2 4

[PATCH 3/3] mshtml: Make xhr.open async argument optional in IE9+ mode.
by Jacek Caban 27 Jan '21

27 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/documentmode.js | 14 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 38 +++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-)

2 1

[PATCH] msvcrt: Fix reading BOM-less files opened with ccs=unicode
by Martin Storsjo 27 Jan '21

27 Jan '21

This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/file.c | 1 + dlls/msvcrt/tests/file.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..258ae2ac811 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2184,6 +2184,7 @@ static int check_bom(HANDLE h, int oflags, BOOL seek) oflags = (oflags & ~(_O_WTEXT | _O_U8TEXT)) | _O_U16TEXT; }else if (seek) { SetFilePointer(h, 0, NULL, FILE_BEGIN); + oflags = oflags & ~_O_WTEXT; } return oflags; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..b094ca5d1e8 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,43 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + // Test BOM-less utf8 + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + utf8_text[ret] = '\0'; + ok(ret > 0, "utf-8 conversion failed\n"); + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + // ccs=utf-8 interprets BOM-less content correctly + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + // ccs=unicode without a BOM only returns raw bytes + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); } -- 2.25.1

2 2

[PATCH 1/3] mshtml/tests: Use more winetest.js helpers in documentmode.js.
by Jacek Caban 27 Jan '21

27 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/documentmode.js | 79 +++++++++---------------------- dlls/mshtml/tests/winetest.js | 8 ++++ 2 files changed, 31 insertions(+), 56 deletions(-)

2 1

[PATCH resend v2 1/2] winemac.drv: Use Metal to get a display's GPU info if possible.
by Brendan Shanks 27 Jan '21

27 Jan '21

Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 39 +++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /*********************************************************************** -- 2.26.2

1 1

[PATCH 2/3] mshtml: Implement IHTMLCSSStyleDeclaration2::animation property.
by Jacek Caban 27 Jan '21

27 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)

1 0

[PATCH v2] msvcrt: Fix reading BOM-less files opened with ccs=unicode
by Piotr Caban 27 Jan '21

27 Jan '21

From: Martin Storsjo <martin(a)martin.st> This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - changed the implementation so internal fd->exflag value is correct - removed C++ style comments dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-)

1 0

[PATCH] ntdll: Exclude lldiv variants from relay tracing.
by Dmitry Timoshkov 27 Jan '21

27 Jan '21

Similar to 9be8c5255bb2c02467373bf373b6eefcfb0337ac. Otherwise ucrtbase initialization code crashes with +relay enabled when compiled with clang as a PE build. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9f7bfae76d..4b3d3d09b8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1450,7 +1450,7 @@ @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @ cdecl __toascii(long) -@ cdecl -arch=i386 -ret64 _alldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) @ cdecl -arch=i386 -ret64 _allmul(int64 int64) @ cdecl -arch=i386 -norelay _alloca_probe() @@ -1458,7 +1458,7 @@ @ stdcall -arch=i386 -ret64 _allshl(int64 long) @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -ret64 _atoi64(str) -@ cdecl -arch=i386 -ret64 _aulldiv(int64 int64) +@ cdecl -norelay -arch=i386 -ret64 _aulldiv(int64 int64) @ cdecl -arch=i386 -norelay _aulldvrm(int64 int64) @ cdecl -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -- 2.29.2

3 4

[PATCH 1/2] mf/sar: Release pending items when audio client is released.
by Nikolay Sivov 27 Jan '21

27 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index e318576e80e..d839cba90f1 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -228,7 +228,13 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { + struct queued_object *obj, *obj2; + MFCancelWorkItem(renderer->buffer_ready_key); + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) + { + release_pending_object(obj); + } renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -253,7 +259,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); ULONG refcount = InterlockedDecrement(&renderer->refcount); - struct queued_object *obj, *obj2; TRACE("%p, refcount %u.\n", iface, refcount); @@ -273,10 +278,6 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) IMFMediaType_Release(renderer->current_media_type); audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); - LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &renderer->queue, struct queued_object, entry) - { - release_pending_object(obj); - } DeleteCriticalSection(&renderer->cs); heap_free(renderer); } -- 2.29.2

1 1

[PATCH 1/2] mfmediaengine: Add partial implementation of a time range object.
by Nikolay Sivov 27 Jan '21

27 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 212 ++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 98 +++++++++++ 2 files changed, 307 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5981548c9f8..0573ea844c1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -34,6 +34,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -106,6 +133,27 @@ struct media_engine CRITICAL_SECTION cs; }; +struct range +{ + double start; + double end; +}; + +struct time_range +{ + IMFMediaTimeRange IMFMediaTimeRange_iface; + LONG refcount; + + struct range *ranges; + size_t count; + size_t capacity; +}; + +static struct time_range *impl_from_IMFMediaTimeRange(IMFMediaTimeRange *iface) +{ + return CONTAINING_RECORD(iface, struct time_range, IMFMediaTimeRange_iface); +} + struct media_error { IMFMediaError IMFMediaError_iface; @@ -226,6 +274,164 @@ static HRESULT create_media_error(IMFMediaError **ret) return S_OK; } +static HRESULT WINAPI time_range_QueryInterface(IMFMediaTimeRange *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTimeRange) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTimeRange_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI time_range_AddRef(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedIncrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI time_range_Release(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + ULONG refcount = InterlockedDecrement(&range->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(range->ranges); + heap_free(range); + } + + return refcount; +} + +static DWORD WINAPI time_range_GetLength(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + return range->count; +} + +static HRESULT WINAPI time_range_GetStart(IMFMediaTimeRange *iface, DWORD idx, double *start) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, start); + + if (idx >= range->count) + return E_INVALIDARG; + + *start = range->ranges[idx].start; + + return S_OK; +} + +static HRESULT WINAPI time_range_GetEnd(IMFMediaTimeRange *iface, DWORD idx, double *end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %u, %p.\n", iface, idx, end); + + if (idx >= range->count) + return E_INVALIDARG; + + *end = range->ranges[idx].end; + + return S_OK; +} + +static BOOL WINAPI time_range_ContainsTime(IMFMediaTimeRange *iface, double time) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + size_t i; + + TRACE("%p, %.8e.\n", iface, time); + + for (i = 0; i < range->count; ++i) + { + if (time >= range->ranges[i].start && time <= range->ranges[i].end) + return TRUE; + } + + return FALSE; +} + +static HRESULT WINAPI time_range_AddRange(IMFMediaTimeRange *iface, double start, double end) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p, %.8e, %.8e.\n", iface, start, end); + + if (range->count) + { + FIXME("Range merging is not implemented.\n"); + return E_NOTIMPL; + } + + if (!mf_array_reserve((void **)&range->ranges, &range->capacity, range->count + 1, sizeof(*range->ranges))) + return E_OUTOFMEMORY; + + range->ranges[range->count].start = start; + range->ranges[range->count].end = end; + range->count++; + + return S_OK; +} + +static HRESULT WINAPI time_range_Clear(IMFMediaTimeRange *iface) +{ + struct time_range *range = impl_from_IMFMediaTimeRange(iface); + + TRACE("%p.\n", iface); + + range->count = 0; + + return S_OK; +} + +static const IMFMediaTimeRangeVtbl time_range_vtbl = +{ + time_range_QueryInterface, + time_range_AddRef, + time_range_Release, + time_range_GetLength, + time_range_GetStart, + time_range_GetEnd, + time_range_ContainsTime, + time_range_AddRange, + time_range_Clear, +}; + +static HRESULT create_time_range(IMFMediaTimeRange **range) +{ + struct time_range *object; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTimeRange_iface.lpVtbl = &time_range_vtbl; + object->refcount = 1; + + *range = &object->IMFMediaTimeRange_iface; + + return S_OK; +} + static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) { if (value) @@ -1718,11 +1924,11 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac } static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFactory *iface, - IMFMediaTimeRange **range) + IMFMediaTimeRange **range) { - FIXME("(%p, %p): stub.\n", iface, range); + TRACE("%p, %p.\n", iface, range); - return E_NOTIMPL; + return create_time_range(range); } static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f9f8fed4a74..1cc88420568 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -590,6 +590,103 @@ static void test_error(void) IMFMediaError_Release(eo); } +static void test_time_range(void) +{ + IMFMediaTimeRange *range; + double start, end; + DWORD count; + HRESULT hr; + BOOL ret; + + hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Empty ranges. */ + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaTimeRange_ContainsTime(range, 10.0); + ok(!ret, "Unexpected return value %d.\n", ret); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Add a range. */ + hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 1.0, "Unexpected end %.e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); +todo_wine + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(end == 3.0, "Unexpected end %.8e.\n", end); + + start = 0.0; + hr = IMFMediaTimeRange_GetStart(range, 1, &start); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.8e.\n", start); +} + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.0, "Unexpected end %.8e.\n", end); +} + hr = IMFMediaTimeRange_Clear(range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(!count, "Unexpected range count.\n"); + + IMFMediaTimeRange_Release(range); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -617,6 +714,7 @@ START_TEST(mfmediaengine) test_playback_rate(); test_mute(); test_error(); + test_time_range(); IMFMediaEngineClassFactory_Release(factory); -- 2.29.2

1 1

[PATCH v2 3/3] gdi32: Report real VREFRESH values for GetDeviceCaps() with display DCs.
by Zhiyi Zhang 27 Jan '21

27 Jan '21

Even though MSDN says 0 and 1 are both valid and they represent the default refresh rate of display hardware. Some games rely on the value being the real refresh rate and use it to cap frame rates. Fix an issue that Sakuna: Of Rice and Ruin reports monitors of 1Hz and cap to 1fps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 25 ++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index bb98c554238..e146a3a4f85 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -82,6 +82,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); +static BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR, DWORD, LPDEVMODEW); static HWND (WINAPI *pGetDesktopWindow)(void); static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); @@ -245,6 +246,7 @@ void CDECL __wine_set_display_driver( HMODULE module ) pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); + pEnumDisplaySettingsW = (void *)GetProcAddress( user32, "EnumDisplaySettingsW" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } @@ -471,7 +473,28 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case PHYSICALOFFSETY: return 0; case SCALINGFACTORX: return 0; case SCALINGFACTORY: return 0; - case VREFRESH: return GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY ? 1 : 0; + case VREFRESH: + { + DEVMODEW devmode; + WCHAR *display; + DC *dc; + + if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) != DT_RASDISPLAY) + return 0; + + if (pEnumDisplaySettingsW) + { + dc = get_nulldrv_dc( dev ); + + memset( &devmode, 0, sizeof(devmode) ); + devmode.dmSize = sizeof(devmode); + display = dc->display[0] ? dc->display : NULL; + if (pEnumDisplaySettingsW( display, ENUM_CURRENT_SETTINGS, &devmode )) + return devmode.dmDisplayFrequency ? devmode.dmDisplayFrequency : 1; + } + + return 1; + } case DESKTOPHORZRES: if (GetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY && pGetSystemMetrics) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 08557867566..58b3f0d5e0c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2020,7 +2020,7 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ dm->dmPelsHeight, value); value = GetDeviceCaps(hdc, VREFRESH); - todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + todo_wine_if(allow_todo) ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", dm->dmDisplayFrequency, value); } -- 2.27.0

2 1

[PATCH v2 2/3] gdi32: Report correct HORZRES and VERTRES values for GetDeviceCaps() with DCs on a specific monitor.
by Zhiyi Zhang 27 Jan '21

27 Jan '21

Fix DLC Quest uses the primary monitor size to render when in fullscreen mode on non-primary monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/dc.c | 18 +++++++++++ dlls/gdi32/driver.c | 64 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/gdi_private.h | 4 +++ dlls/user32/tests/monitor.c | 4 +-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a9a37d9efe7..830fabf6e78 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -623,6 +623,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) { + const WCHAR *display, *p; HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; @@ -663,6 +664,23 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, } } + if (is_display_device( driver )) + display = driver; + else if (is_display_device( device )) + display = device; + else + display = NULL; + + if (display) + { + /* Copy only the display name. For example, \\.\DISPLAY1 in \\.\DISPLAY1\Monitor0 */ + p = display + 12; + while (iswdigit( *p )) + ++p; + lstrcpynW( dc->display, display, p - display + 1 ); + dc->display[p - display] = '\0'; + } + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e2528ece046..bb98c554238 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -81,7 +81,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static BOOL (WINAPI *pEnumDisplayMonitors)(HDC, LPRECT, MONITORENUMPROC, LPARAM); static HWND (WINAPI *pGetDesktopWindow)(void); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR, LPMONITORINFO); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); @@ -137,10 +139,13 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * is_display_device */ -static BOOL is_display_device( LPCWSTR name ) +BOOL is_display_device( LPCWSTR name ) { const WCHAR *p = name; + if (!name) + return FALSE; + if (wcsnicmp( name, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) return FALSE; p += lstrlenW(L"\\\\.\\DISPLAY"); @@ -237,10 +242,33 @@ void CDECL __wine_set_display_driver( HMODULE module ) HeapFree( GetProcessHeap(), 0, driver ); user32 = LoadLibraryA( "user32.dll" ); + pGetMonitorInfoW = (void *)GetProcAddress( user32, "GetMonitorInfoW" ); pGetSystemMetrics = (void *)GetProcAddress( user32, "GetSystemMetrics" ); + pEnumDisplayMonitors = (void *)GetProcAddress( user32, "EnumDisplayMonitors" ); pSetThreadDpiAwarenessContext = (void *)GetProcAddress( user32, "SetThreadDpiAwarenessContext" ); } +struct monitor_info +{ + const WCHAR *name; + RECT rect; +}; + +static BOOL CALLBACK monitor_enum_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + MONITORINFOEXW mi; + + mi.cbSize = sizeof(mi); + pGetMonitorInfoW( monitor, (MONITORINFO *)&mi ); + if (!lstrcmpiW( info->name, mi.szDevice )) + { + info->rect = mi.rcMonitor; + return FALSE; + } + + return TRUE; +} static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) { @@ -378,8 +406,38 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) GetDeviceCaps( dev->hdc, LOGPIXELSX ) * 10 ); case VERTSIZE: return MulDiv( GetDeviceCaps( dev->hdc, VERTRES ), 254, GetDeviceCaps( dev->hdc, LOGPIXELSY ) * 10 ); - case HORZRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; - case VERTRES: return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + case HORZRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.right - info.rect.left; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CXSCREEN ) : 640; + } + case VERTRES: + { + DC *dc = get_nulldrv_dc( dev ); + struct monitor_info info; + + if (dc->display[0] && pEnumDisplayMonitors && pGetMonitorInfoW) + { + info.name = dc->display; + SetRectEmpty( &info.rect ); + pEnumDisplayMonitors( NULL, NULL, monitor_enum_proc, (LPARAM)&info ); + if (!IsRectEmpty( &info.rect )) + return info.rect.bottom - info.rect.top; + } + + return pGetSystemMetrics ? pGetSystemMetrics( SM_CYSCREEN ) : 480; + } case BITSPIXEL: return 32; case PLANES: return 1; case NUMBRUSHES: return -1; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8d917a795c0..2bf16e8eaf8 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,6 +84,7 @@ typedef struct tagDC int pixel_format; /* pixel format (for memory DCs) */ UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; + WCHAR display[CCHDEVICENAME]; /* Display name when created for a specific display device */ int flags; DWORD layout; @@ -487,6 +488,9 @@ typedef struct #define WMFC_MAGIC 0x43464d57 +/* driver.c */ +extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; + /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index ee435a4faf4..08557867566 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2085,7 +2085,7 @@ static void test_display_dc(void) hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); - check_display_dc(hdc, &dm, TRUE); + check_display_dc(hdc, &dm, FALSE); /* Tests after mode changes */ memset(&dm2, 0, sizeof(dm2)); @@ -2108,7 +2108,7 @@ static void test_display_dc(void) continue; } - check_display_dc(hdc, &dm2, TRUE); + check_display_dc(hdc, &dm2, FALSE); /* Tests after monitor detach */ if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) -- 2.27.0

2 1

[PATCH v2 1/3] user32/tests: Add display DC tests.
by Zhiyi Zhang 27 Jan '21

27 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Move tests to user32 and simplify them. Supersede 198367~198369. The newly added tests are still in a separate function because there are more tests coming that rely on the same tests setup. dlls/user32/tests/monitor.c | 156 ++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5e4cc9d154f..ee435a4faf4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1992,6 +1992,161 @@ static void test_handles(void) ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); } +#define check_display_dc(a, b, c) _check_display_dc(__LINE__, a, b, c) +static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_todo) +{ + INT value; + + value = GetDeviceCaps(hdc, HORZRES); + todo_wine_if(allow_todo && dm->dmPelsWidth != GetSystemMetrics(SM_CXSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected HORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, VERTRES); + todo_wine_if(allow_todo && dm->dmPelsHeight != GetSystemMetrics(SM_CYSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected VERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, DESKTOPHORZRES); + todo_wine_if(dm->dmPelsWidth != GetSystemMetrics(SM_CXVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CXVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsWidth, "Expected DESKTOPHORZRES %d, got %d.\n", + dm->dmPelsWidth, value); + + value = GetDeviceCaps(hdc, DESKTOPVERTRES); + todo_wine_if(dm->dmPelsHeight != GetSystemMetrics(SM_CYVIRTUALSCREEN) + && value == GetSystemMetrics(SM_CYVIRTUALSCREEN)) + ok_(__FILE__, line)(value == dm->dmPelsHeight, "Expected DESKTOPVERTRES %d, got %d.\n", + dm->dmPelsHeight, value); + + value = GetDeviceCaps(hdc, VREFRESH); + todo_wine_if(value != dm->dmDisplayFrequency && value == 1) + ok_(__FILE__, line)(value == dm->dmDisplayFrequency, "Expected VREFRESH %d, got %d.\n", + dm->dmDisplayFrequency, value); +} + +static void test_display_dc(void) +{ + DWORD device_idx, mode_idx; + DEVMODEA dm, dm2, dm3; + INT count, old_count; + DISPLAY_DEVICEA dd; + BOOL ret; + LONG res; + HDC hdc; + + /* Test DCs covering the entire virtual screen */ + hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ok(!!hdc, "CreateDCA failed.\n"); + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + + check_display_dc(hdc, &dm, FALSE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution.\n"); + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + if (res == DISP_CHANGE_SUCCESSFUL) + { + check_display_dc(hdc, &dm2, FALSE); + + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %d.\n", res); + } + + DeleteDC(hdc); + + /* Test DCs covering a specific monitor */ + dd.cb = sizeof(dd); + for (device_idx = 0; EnumDisplayDevicesA(NULL, device_idx, &dd, 0); ++device_idx) + { + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + hdc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(!!hdc, "CreateDCA %s failed.\n", dd.DeviceName); + + check_display_dc(hdc, &dm, TRUE); + + /* Tests after mode changes */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(dd.DeviceName, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, + "Failed to find a different resolution for %s.\n", dd.DeviceName); + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm2, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", dd.DeviceName, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", dd.DeviceName); + DeleteDC(hdc); + continue; + } + + check_display_dc(hdc, &dm2, TRUE); + + /* Tests after monitor detach */ + if (!(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) + { + old_count = GetSystemMetrics(SM_CMONITORS); + + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + ret = EnumDisplaySettingsA(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm3); + ok(ret, "EnumDisplaySettingsA %s failed.\n", dd.DeviceName); + + dm3.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm3.dmPelsWidth = 0; + dm3.dmPelsHeight = 0; + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm3, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(dd.DeviceName, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + + count = GetSystemMetrics(SM_CMONITORS); + ok(count == old_count - 1, "Expected monitor count %d, got %d.\n", old_count - 1, count); + + /* Should report the same values before detach */ + check_display_dc(hdc, &dm2, TRUE); + } + + res = ChangeDisplaySettingsExA(dd.DeviceName, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + dd.DeviceName, res); + DeleteDC(hdc); + } +} + START_TEST(monitor) { init_function_pointers(); @@ -2002,4 +2157,5 @@ START_TEST(monitor) test_work_area(); test_display_config(); test_handles(); + test_display_dc(); } -- 2.27.0

2 1

[PATCH] iphlpapi: Mark adapter addresses as DNS eligible when interface has a gateway.
by Paul Gofman 27 Jan '21

27 Jan '21

Fixes hang on attempt to enter a single player game in Kingdoms Reborn. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++-------------- dlls/iphlpapi/tests/iphlpapi.c | 6 ++++++ include/iptypes.h | 3 +++ 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 81c4992ac73..bd1fea02e19 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -940,16 +940,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index DWORD *v4addrs = NULL, *v4masks = NULL; SOCKET_ADDRESS *v6addrs = NULL, *v6masks = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; + BOOL output_gateways; + + if ((flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) || !(flags & GAA_FLAG_SKIP_UNICAST)) + { + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); + if (ret) return ret; + num_v4_gateways = count_v4_gateways(index, routeTable); + } + output_gateways = (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) && (family == WS_AF_INET || family == WS_AF_UNSPEC); if (family == WS_AF_INET) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } } else if (family == WS_AF_INET6) { @@ -958,12 +961,6 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index else if (family == WS_AF_UNSPEC) { ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs, &v4masks); - - if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) - { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); - if (!ret) num_v4_gateways = count_v4_gateways(index, routeTable); - } if (!ret) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs, &v6masks); } else @@ -996,7 +993,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs; total_size += sizeof(struct sockaddr_in) * num_v4addrs; - total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; + if (output_gateways) + total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways; total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v6addrs; total_size += sizeof(SOCKET_ADDRESS) * num_v6addrs; for (i = 0; i < num_v6addrs; i++) @@ -1050,7 +1048,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->Luid.Info.NetLuidIndex = index; aa->Luid.Info.IfType = aa->IfType; - if (num_v4_gateways) + if (output_gateways && num_v4_gateways) { PMIB_IPFORWARDROW adapterRow; @@ -1089,6 +1087,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); + if (num_v4_gateways) + ua->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; sa = (struct WS_sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = WS_AF_INET; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..358084fde68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1277,6 +1277,7 @@ static void testWin2KFunctions(void) static void test_GetAdaptersAddresses(void) { + BOOL dns_eligible_found = FALSE; ULONG ret, size, osize, i; IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; @@ -1349,6 +1350,10 @@ static void test_GetAdaptersAddresses(void) S(U(*ua)).Flags, ua->PrefixOrigin, ua->SuffixOrigin, ua->DadState, ua->ValidLifetime, ua->PreferredLifetime, ua->LeaseLifetime, S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength); + + if (ua->Flags & IP_ADAPTER_ADDRESS_DNS_ELIGIBLE) + dns_eligible_found = TRUE; + ua = ua->Next; } for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++) @@ -1380,6 +1385,7 @@ static void test_GetAdaptersAddresses(void) ok(!strcasecmp(aa->AdapterName, buf), "expected '%s' got '%s'\n", aa->AdapterName, buf); } } + ok(dns_eligible_found, "Did not find any dns eligible addresses.\n"); HeapFree(GetProcessHeap(), 0, ptr); } diff --git a/include/iptypes.h b/include/iptypes.h index c1a253d7b41..c1ee7322b01 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,6 +94,9 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ +#define IP_ADAPTER_ADDRESS_DNS_ELIGIBLE 0x00000001 +#define IP_ADAPTER_ADDRESS_TRANSIENT 0x00000002 + typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct { -- 2.29.2

1 0

[PATCH] msvcrt/tests: Add a test for reading ascii files (without bom) opened with _wsopen_dispatch as unicode
by Martin Storsjo 27 Jan '21

27 Jan '21

The added test points out a regression since b0ab1b76029eaface724a28483fe8b0ea36029dc, which is noticed when running MSVC 2010 in wine. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/tests/file.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..9ad91b578f5 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,37 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + // Test missing bom + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + fwrite("1234", 1, 4, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; i < 4; i++) + { + ch = fgetwc(tempfh); + ok(ch == '1' + i, + "got %04hx, expected %04x\n", ch, '1' + i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=utf-16le"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; i < 4; i++) + { + ch = fgetwc(tempfh); + todo_wine ok(ch == '1' + i, + "got %04hx, expected %04x\n", ch, '1' + i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + unlink(temppath); } -- 2.25.1

2 2

[PATCH 1/2] ntdll/tests: Add more tests for registry notifications.
by Zebediah Figura 27 Jan '21

27 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 61 ++++++++++++++++++++++++++++++------------ 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9335d9cc927..a619bc45cb8 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1853,28 +1853,30 @@ static void test_notify(void) LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; UNICODE_STRING str; - HANDLE key, events[2], subkey; + HANDLE key, key2, events[4], subkey; NTSTATUS status; + unsigned int i; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + status = pNtOpenKey(&key2, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - events[0] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[0] != NULL, "CreateEvent failed: %u\n", GetLastError()); - events[1] = CreateEventW(NULL, FALSE, TRUE, NULL); - ok(events[1] != NULL, "CreateEvent failed: %u\n", GetLastError()); + for (i = 0; i < ARRAY_SIZE(events); ++i) + events[i] = CreateEventW(NULL, TRUE, TRUE, NULL); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[2], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = pNtNotifyChangeKey(key2, events[3], NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); - timeout.QuadPart = 0; - status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); - status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); attr.RootDirectory = key; attr.ObjectName = &str; @@ -1885,22 +1887,43 @@ static void test_notify(void) pRtlFreeUnicodeString(&str); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); status = pNtNotifyChangeKey(key, events[0], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + status = pNtWaitForSingleObject(events[0], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[1], FALSE, &timeout); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtNotifyChangeKey(key, events[1], NULL, NULL, &iosb, 0, FALSE, NULL, 0, TRUE); ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + status = WaitForMultipleObjects(4, events, FALSE, 0); + ok(status == WAIT_TIMEOUT, "got %d\n", status); + status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); pNtClose(subkey); @@ -1912,9 +1935,13 @@ static void test_notify(void) pNtClose(key); status = pNtWaitForSingleObject(events[0], FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + todo_wine ok(!status, "got %#x\n", status); status = pNtWaitForSingleObject(events[1], FALSE, &timeout); - ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(!status, "got %#x\n", status); + status = pNtWaitForSingleObject(events[2], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + status = pNtWaitForSingleObject(events[3], FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); if (pNtNotifyChangeMultipleKeys) { -- 2.30.0

2 3

[tools] testbot/web: The ISO 8601 date format uses dashes rather than slashes.
by Francois Gouget 27 Jan '21

27 Jan '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is just cosmetic obviously. testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- testbot/web/JobDetails.pl | 2 +- testbot/web/index.pl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index f9e590c80..b523d142c 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -85,7 +85,7 @@ function Pad2(n) function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + var Pretty = Dt.getFullYear() + '-' + Pad2(Dt.getMonth() + 1) + '-' + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) if (Id != null) @@ -461,7 +461,7 @@ sub GetDisplayValue($$$) { $Value = "<noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; @@ -487,7 +487,7 @@ sub GetEscapedDisplayValue($$$) $Value = "<script type='text/javascript'></script><noscript><div>" . - strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . + strftime("%Y-%m-%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n"; } } diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5a484da36..7a4f4fc35 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -696,7 +696,7 @@ sub GenerateDataCell($$$$$) my $Duration = $StepTask->Ended - $StepTask->Started; my $TagId = "E". $StepTask->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $StepTask->Ended, ",'$TagId');\n"; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 39fea3e7a..088aea111 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -163,7 +163,7 @@ sub GenerateDataCell($$$$) my $Duration = $Item->Ended - $Item->Submitted; my $TagId = "E". $Item->Id; print "<td><a id='$TagId' class='title' title='", - strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + strftime("%Y-%m-%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; print "<script type='text/javascript'><!--\n"; print " ShowDateTime(", $Item->Ended, ",'$TagId');\n"; -- 2.20.1

1 0

[tools] testbot/LogUtils: Ignore empty report lines.
by Francois Gouget 27 Jan '21

27 Jan '21

They have no impact on the ParseWineTestReport() result. Also this matches the winetest parser behavior. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 65ce6177b..b16334ace 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -531,6 +531,7 @@ sub ParseWineTestReport($$$) { $LineNo++; $Cur->{UnitSize} += length($Line); + next if ($Line =~ /^\s*$/); # empty lines have no impact chomp $Line; $Line =~ s/\r+$//; -- 2.20.1

1 0

[tools] testbot/PatchUtils: Run make_requests when it is modified.
by Francois Gouget 27 Jan '21

27 Jan '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite tests: WTBS S8.2 - Check the make_* scripts are still run (advpack:advpack). WTBS S8.1 - Trigger a run of all known make_* scripts. testbot/lib/WineTestBot/PatchUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 5588df204..b2749c4e5 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -324,7 +324,7 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) + elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; -- 2.20.1

1 0

[tools] testbot/TestWTBS: Allow checking emails that don't contain a patch.
by Francois Gouget 27 Jan '21

27 Jan '21

When an email contains no patch it is not saved in the patches folder, which also makes putting TestWTBS directives in the email body pointless. This patch allows telling TestWTBS this is expected by adding 'WTBS' and 'NoPatch' anywhere in the subject line. Conversely, if the subject contains 'WTBS' but not 'NoPatch', TestWTBS expects to find a file in the patches folder. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index d0e7cabca..67b1c8f96 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -1152,9 +1152,19 @@ sub CheckPatches() foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { my $PatchFileName = "$DataDir/patches/". $Patch->Id; - next if (!-f $PatchFileName); - my $TestInfo = LoadTestInfo($PatchFileName); - CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + if (-f $PatchFileName) + { + ok($Patch->Subject !~ /NoPatch/, "Found a file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + my $TestInfo = LoadTestInfo($PatchFileName); + CheckPatch($Jobs, $Patch, $TestInfo) if ($TestInfo); + } + elsif ($Patch->Subject =~ /\bWTBS\b/) + { + ok(($Patch->Subject =~ /NoPatch/ or $Patch->Disposition eq "Reply to a patch series"), + "Found no file for patch ". $Patch->Id .": ". $Patch->Subject) + or diag("Disposition=". $Patch->Disposition); + } } } -- 2.20.1

1 0

[PATCH v2 1/2] advapi32/tests: Add some tests for querying the security of pseudo-handles.
by Zebediah Figura 27 Jan '21

27 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Add tests for NtQuerySecurityObject(); also fix a warning. dlls/advapi32/tests/security.c | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 020e69277e0..40fd1316624 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7878,6 +7878,44 @@ static void test_create_process_token_child(void) } } +static void test_pseudo_handle_security(void) +{ + char buffer[200]; + PSECURITY_DESCRIPTOR sd = buffer, sd_ptr; + NTSTATUS status; + DWORD size; + BOOL ret; + + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + status = NtQuerySecurityObject(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + + ret = GetKernelObjectSecurity(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + status = NtQuerySecurityObject(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!status, "got %#x\n", status); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(HKEY_CLASSES_ROOT, OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError()); + + status = NtQuerySecurityObject(HKEY_CLASSES_ROOT, OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(status == STATUS_INVALID_HANDLE, "got %#x\n", status); + + ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_REGISTRY_KEY, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + todo_wine ok(!ret, "got error %u\n", ret); + LocalFree(sd_ptr); + + ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_KERNEL_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + ok(ret == ERROR_INVALID_HANDLE, "got error %u\n", ret); +} + START_TEST(security) { init(); @@ -7940,6 +7978,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_pseudo_handle_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.30.0

1 1

[PATCH 1/4] winegstreamer: Avoid using Wine debug functions in removed_decoded_pad().
by Zebediah Figura 26 Jan '21

26 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5181d0951d5..5c13d5e06f3 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1136,7 +1136,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) unsigned int i; char *name; - TRACE("filter %p, bin %p, pad %p.\n", filter, bin, pad); + GST_LOG("filter %p, bin %p, pad %p.", filter, bin, pad); for (i = 0; i < filter->source_count; ++i) { @@ -1155,7 +1155,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) } name = gst_pad_get_name(pad); - WARN("No pin matching pad %s found.\n", debugstr_a(name)); + GST_LOG("No pin matching pad \"%s\" found.", name); g_free(name); } -- 2.30.0

1 3

[PATCH vkd3d v2 1/4] vkd3d-shader: Parse #line directives.
by Zebediah Figura 26 Jan '21

26 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++------ libs/vkd3d-shader/preproc.y | 12 ++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 1bf14ff4..0ce75f0e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -52,6 +52,7 @@ static void update_location(struct preproc_ctx *ctx); %s ERROR %s INCLUDE +%s LINE NEWLINE \r?\n WS [ \t] @@ -91,9 +92,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>## {return T_CONCAT;} @@ -103,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">>"=? {return T_TEXT;} <INITIAL>[-+*/%&|^]= {return T_TEXT;} -<INCLUDE>\"[^"]*\" {return T_STRING;} +<INCLUDE,LINE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} /* C strings (including escaped quotes). */ @@ -131,6 +132,12 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_INCLUDE; } + if (!strcmp(p, "line")) + { + BEGIN(LINE); + return T_LINE; + } + if (!strcmp(p, "define")) return T_DEFINE; if (!strcmp(p, "elif")) @@ -155,8 +162,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_TEXT; } -<INITIAL,INCLUDE>\\{NEWLINE} {} -<INITIAL,INCLUDE,ERROR>{NEWLINE} { +<INITIAL,INCLUDE,LINE>\\{NEWLINE} {} +<INITIAL,INCLUDE,ERROR,LINE>{NEWLINE} { BEGIN(INITIAL); return T_NEWLINE; } @@ -371,6 +378,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_LINE: case T_PRAGMA: case T_UNDEF: ctx->current_directive = token; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 7a995430..01437b2b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_LINE "#line" %token T_PRAGMA "#pragma" %token T_UNDEF "#undef" @@ -671,6 +672,17 @@ directive } vkd3d_free($2); } + | T_LINE T_INTEGER T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + } + | T_LINE T_INTEGER T_STRING T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + vkd3d_free($3); + } primary_expr : T_INTEGER -- 2.30.0

5 13

[PATCH vkd3d v3] vkd3d-shader: Import the HLSL compiler from Wine.
by Zebediah Figura 26 Jan '21

26 Jan '21

This corresponds to Wine commit 9f9fec18799bf59df6211b7294f8d338caa7f4db. Note that for the moment, compilation messages have not been ported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 16 +- libs/vkd3d-shader/hlsl.c | 1672 ++++++++++++ libs/vkd3d-shader/hlsl.h | 644 +++++ libs/vkd3d-shader/hlsl.l | 288 +++ libs/vkd3d-shader/hlsl.y | 2961 ++++++++++++++++++++++ libs/vkd3d-shader/trace.c | 9 + libs/vkd3d-shader/vkd3d_shader_main.c | 13 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 + 8 files changed, 5609 insertions(+), 3 deletions(-) create mode 100644 libs/vkd3d-shader/hlsl.c create mode 100644 libs/vkd3d-shader/hlsl.h create mode 100644 libs/vkd3d-shader/hlsl.l create mode 100644 libs/vkd3d-shader/hlsl.y diff --git a/Makefile.am b/Makefile.am index 27d933c9..96d6140d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,9 +126,22 @@ libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-sh @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< -BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h +libs/vkd3d-shader/hlsl.yy.c: $(srcdir)/libs/vkd3d-shader/hlsl.l + @$(MKDIR_P) libs/vkd3d-shader + $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< + +libs/vkd3d-shader/hlsl.tab.c libs/vkd3d-shader/hlsl.tab.h &: libs/vkd3d-shader/hlsl.y + @$(MKDIR_P) libs/vkd3d-shader + $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/hlsl.tab.c $< + +BUILT_SOURCES += \ + libs/vkd3d-shader/hlsl.tab.h \ + libs/vkd3d-shader/preproc.tab.h vkd3d_shader_yyfiles = \ + libs/vkd3d-shader/hlsl.tab.c \ + libs/vkd3d-shader/hlsl.tab.h \ + libs/vkd3d-shader/hlsl.yy.c \ libs/vkd3d-shader/preproc.tab.c \ libs/vkd3d-shader/preproc.tab.h \ libs/vkd3d-shader/preproc.yy.c @@ -146,6 +159,7 @@ libvkd3d_shader_la_SOURCES = \ include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ + libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/trace.c \ libs/vkd3d-shader/vkd3d_shader.map \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c new file mode 100644 index 00000000..61a9e5c5 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.c @@ -0,0 +1,1672 @@ +/* + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "hlsl.h" + +BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(decl->name, var->name)) + return FALSE; + } + if (local_var && scope->upper->upper == hlsl_ctx.globals) + { + /* Check whether the variable redefines a function parameter. */ + LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(decl->name, var->name)) + return FALSE; + } + } + + list_add_tail(&scope->vars, &decl->scope_entry); + return TRUE; +} + +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (!strcmp(name, var->name)) + return var; + } + if (!scope->upper) + return NULL; + return get_variable(scope->upper, name); +} + +void free_declaration(struct hlsl_ir_var *decl) +{ + vkd3d_free((void *)decl->name); + vkd3d_free((void *)decl->semantic); + vkd3d_free((void *)decl->reg_reservation); + vkd3d_free(decl); +} + +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->name = name; + type->type = type_class; + type->base_type = base_type; + type->dimx = dimx; + type->dimy = dimy; + if (type_class == HLSL_CLASS_MATRIX) + type->reg_size = is_row_major(type) ? dimy : dimx; + else + type->reg_size = 1; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) +{ + struct hlsl_type *type = new_hlsl_type(NULL, HLSL_CLASS_ARRAY, HLSL_TYPE_FLOAT, 1, 1); + + if (!type) + return NULL; + + type->modifiers = basic_type->modifiers; + type->e.array.elements_count = array_size; + type->e.array.type = basic_type; + type->reg_size = basic_type->reg_size * array_size; + type->dimx = basic_type->dimx; + type->dimy = basic_type->dimy; + return type; +} + +struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) +{ + struct rb_entry *entry = rb_get(&scope->types, name); + + if (entry) + return RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); + + if (recursive && scope->upper) + return get_type(scope->upper, name, recursive); + return NULL; +} + +BOOL find_function(const char *name) +{ + return rb_get(&hlsl_ctx.functions, name) != NULL; +} + +unsigned int components_count_type(struct hlsl_type *type) +{ + struct hlsl_struct_field *field; + unsigned int count = 0; + + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + return type->dimx * type->dimy; + } + if (type->type == HLSL_CLASS_ARRAY) + { + return components_count_type(type->e.array.type) * type->e.array.elements_count; + } + if (type->type != HLSL_CLASS_STRUCT) + { + ERR("Unexpected data type %s.\n", debug_hlsl_type(type)); + return 0; + } + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + count += components_count_type(field->type); + } + return count; +} + +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) +{ + if (t1 == t2) + return TRUE; + + if (t1->type != t2->type) + return FALSE; + if (t1->base_type != t2->base_type) + return FALSE; + if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + return FALSE; + if ((t1->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + != (t2->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + return FALSE; + if (t1->dimx != t2->dimx) + return FALSE; + if (t1->dimy != t2->dimy) + return FALSE; + if (t1->type == HLSL_CLASS_STRUCT) + { + struct list *t1cur, *t2cur; + struct hlsl_struct_field *t1field, *t2field; + + t1cur = list_head(t1->e.elements); + t2cur = list_head(t2->e.elements); + while (t1cur && t2cur) + { + t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); + t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); + if (!compare_hlsl_types(t1field->type, t2field->type)) + return FALSE; + if (strcmp(t1field->name, t2field->name)) + return FALSE; + t1cur = list_next(t1->e.elements, t1cur); + t2cur = list_next(t2->e.elements, t2cur); + } + if (t1cur != t2cur) + return FALSE; + } + if (t1->type == HLSL_CLASS_ARRAY) + return t1->e.array.elements_count == t2->e.array.elements_count + && compare_hlsl_types(t1->e.array.type, t2->e.array.type); + + return TRUE; +} + +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) +{ + struct hlsl_struct_field *old_field, *field; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + + if (old->name) + { + type->name = vkd3d_strdup(old->name); + if (!type->name) + { + vkd3d_free(type); + return NULL; + } + } + type->type = old->type; + type->base_type = old->base_type; + type->dimx = old->dimx; + type->dimy = old->dimy; + type->modifiers = old->modifiers; + if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + type->modifiers |= default_majority; + type->sampler_dim = old->sampler_dim; + switch (old->type) + { + case HLSL_CLASS_ARRAY: + type->e.array.type = clone_hlsl_type(old->e.array.type, default_majority); + type->e.array.elements_count = old->e.array.elements_count; + type->reg_size = type->e.array.elements_count * type->e.array.type->reg_size; + break; + + case HLSL_CLASS_STRUCT: + { + unsigned int reg_size = 0; + + if (!(type->e.elements = vkd3d_malloc(sizeof(*type->e.elements)))) + { + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } + list_init(type->e.elements); + LIST_FOR_EACH_ENTRY(old_field, old->e.elements, struct hlsl_struct_field, entry) + { + if (!(field = vkd3d_calloc(1, sizeof(*field)))) + { + LIST_FOR_EACH_ENTRY_SAFE(field, old_field, type->e.elements, struct hlsl_struct_field, entry) + { + vkd3d_free((void *)field->semantic); + vkd3d_free((void *)field->name); + vkd3d_free(field); + } + vkd3d_free(type->e.elements); + vkd3d_free((void *)type->name); + vkd3d_free(type); + return NULL; + } + field->type = clone_hlsl_type(old_field->type, default_majority); + field->name = vkd3d_strdup(old_field->name); + if (old_field->semantic) + field->semantic = vkd3d_strdup(old_field->semantic); + field->modifiers = old_field->modifiers; + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + list_add_tail(type->e.elements, &field->entry); + } + type->reg_size = reg_size; + break; + } + + case HLSL_CLASS_MATRIX: + type->reg_size = is_row_major(type) ? type->dimy : type->dimx; + break; + + default: + type->reg_size = 1; + break; + } + + list_add_tail(&hlsl_ctx.types, &type->entry); + return type; +} + +static BOOL convertible_data_type(struct hlsl_type *type) +{ + return type->type != HLSL_CLASS_OBJECT; +} + +BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be cast to pretty much everything */ + if (t1->dimx == 1 && t1->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return t1->dimx >= t2->dimx; + } + + /* The other way around is true too i.e. whatever to scalar */ + if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_ARRAY) + { + if (compare_hlsl_types(t1->e.array.type, t2)) + /* e.g. float4[3] to float4 is allowed */ + return TRUE; + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + else + return components_count_type(t1) == components_count_type(t2); + } + + if (t1->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) == components_count_type(t2); + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (components_count_type(t1) >= components_count_type(t2)) + return TRUE; + return FALSE; +} + +static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be converted to any other numeric data type */ + if (t1->dimx == 1 && t1->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + /* The other way around is true too */ + if (t2->dimx == 1 && t2->dimy == 1 && t2->type <= HLSL_CLASS_LAST_NUMERIC) + return TRUE; + } + + if (t1->type == HLSL_CLASS_ARRAY && t2->type == HLSL_CLASS_ARRAY) + { + return components_count_type(t1) == components_count_type(t2); + } + + if ((t1->type == HLSL_CLASS_ARRAY && t2->type <= HLSL_CLASS_LAST_NUMERIC) + || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) + { + /* e.g. float4[3] to float4 is allowed */ + if (t1->type == HLSL_CLASS_ARRAY && compare_hlsl_types(t1->e.array.type, t2)) + return TRUE; + if (components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type <= HLSL_CLASS_VECTOR && t2->type <= HLSL_CLASS_VECTOR) + { + if (t1->dimx >= t2->dimx) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX + && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) + return compare_hlsl_types(t1, t2); + + return FALSE; +} + +static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) + return FALSE; + + /* Scalar vars can be converted to pretty much everything */ + if ((t1->dimx == 1 && t1->dimy == 1) || (t2->dimx == 1 && t2->dimy == 1)) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return TRUE; + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + /* Matrix-vector conversion is apparently allowed if either they have the same components + count or the matrix is nx1 or 1xn */ + if (t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + { + if (components_count_type(t1) == components_count_type(t2)) + return TRUE; + + return (t1->type == HLSL_CLASS_MATRIX && (t1->dimx == 1 || t1->dimy == 1)) + || (t2->type == HLSL_CLASS_MATRIX && (t2->dimx == 1 || t2->dimy == 1)); + } + + /* Both matrices */ + if ((t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + || (t1->dimx <= t2->dimx && t1->dimy <= t2->dimy)) + return TRUE; + } + + return FALSE; +} + +static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) +{ + static const enum hlsl_base_type types[] = + { + HLSL_TYPE_BOOL, + HLSL_TYPE_INT, + HLSL_TYPE_UINT, + HLSL_TYPE_HALF, + HLSL_TYPE_FLOAT, + HLSL_TYPE_DOUBLE, + }; + int t1_idx = -1, t2_idx = -1, i; + + for (i = 0; i < ARRAY_SIZE(types); ++i) + { + /* Always convert away from HLSL_TYPE_HALF */ + if (t1 == types[i]) + t1_idx = t1 == HLSL_TYPE_HALF ? i + 1 : i; + if (t2 == types[i]) + t2_idx = t2 == HLSL_TYPE_HALF ? i + 1 : i; + + if (t1_idx != -1 && t2_idx != -1) + break; + } + if (t1_idx == -1 || t2_idx == -1) + { + FIXME("Unexpected base type.\n"); + return HLSL_TYPE_FLOAT; + } + return t1_idx >= t2_idx ? t1 : t2; +} + +static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type *t2, + struct source_location *loc) +{ + enum hlsl_type_class type; + enum hlsl_base_type base; + unsigned int dimx, dimy; + + if (t1->type > HLSL_CLASS_LAST_NUMERIC || t2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "non scalar/vector/matrix data type in expression"); + return NULL; + } + + if (compare_hlsl_types(t1, t2)) + return t1; + + if (!expr_compatible_data_types(t1, t2)) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "expression data types are incompatible"); + return NULL; + } + + if (t1->base_type == t2->base_type) + base = t1->base_type; + else + base = expr_common_base_type(t1->base_type, t2->base_type); + + if (t1->dimx == 1 && t1->dimy == 1) + { + type = t2->type; + dimx = t2->dimx; + dimy = t2->dimy; + } + else if (t2->dimx == 1 && t2->dimy == 1) + { + type = t1->type; + dimx = t1->dimx; + dimy = t1->dimy; + } + else if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX) + { + type = HLSL_CLASS_MATRIX; + dimx = min(t1->dimx, t2->dimx); + dimy = min(t1->dimy, t2->dimy); + } + else + { + /* Two vectors or a vector and a matrix (matrix must be 1xn or nx1) */ + unsigned int max_dim_1, max_dim_2; + + max_dim_1 = max(t1->dimx, t1->dimy); + max_dim_2 = max(t2->dimx, t2->dimy); + if (t1->dimx * t1->dimy == t2->dimx * t2->dimy) + { + type = HLSL_CLASS_VECTOR; + dimx = max(t1->dimx, t2->dimx); + dimy = 1; + } + else if (max_dim_1 <= max_dim_2) + { + type = t1->type; + if (type == HLSL_CLASS_VECTOR) + { + dimx = max_dim_1; + dimy = 1; + } + else + { + dimx = t1->dimx; + dimy = t1->dimy; + } + } + else + { + type = t2->type; + if (type == HLSL_CLASS_VECTOR) + { + dimx = max_dim_2; + dimy = 1; + } + else + { + dimx = t2->dimx; + dimy = t2->dimy; + } + } + } + + if (type == HLSL_CLASS_SCALAR) + return hlsl_ctx.builtin_types.scalar[base]; + if (type == HLSL_CLASS_VECTOR) + return hlsl_ctx.builtin_types.vector[base][dimx - 1]; + return new_hlsl_type(NULL, type, base, dimx, dimy); +} + +struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, + struct hlsl_type *dst_type, struct source_location *loc) +{ + struct hlsl_type *src_type = node->data_type; + struct hlsl_ir_expr *cast; + + if (compare_hlsl_types(src_type, dst_type)) + return node; + + if (!implicit_compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "can't implicitly convert %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return NULL; + } + + if (dst_type->dimx * dst_type->dimy < src_type->dimx * src_type->dimy) + hlsl_report_message(*loc, HLSL_LEVEL_WARNING, "implicit truncation of vector type"); + + TRACE("Implicit conversion from %s to %s.\n", debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + + if (!(cast = new_cast(node, dst_type, loc))) + return NULL; + list_add_tail(instrs, &cast->node.entry); + return &cast->node; +} + +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], + struct source_location *loc) +{ + struct hlsl_ir_expr *expr; + struct hlsl_type *type; + unsigned int i; + + type = operands[0]->data_type; + for (i = 1; i <= 2; ++i) + { + if (!operands[i]) + break; + type = expr_common_type(type, operands[i]->data_type, loc); + if (!type) + return NULL; + } + for (i = 0; i <= 2; ++i) + { + struct hlsl_ir_expr *cast; + + if (!operands[i]) + break; + if (compare_hlsl_types(operands[i]->data_type, type)) + continue; + TRACE("Implicitly converting %s into %s in an expression.\n", debug_hlsl_type(operands[i]->data_type), debug_hlsl_type(type)); + if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 + && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) + { + hlsl_report_message(operands[i]->loc, HLSL_LEVEL_WARNING, "implicit truncation of vector/matrix type"); + } + + if (!(cast = new_cast(operands[i], type, &operands[i]->loc))) + return NULL; + list_add_after(&operands[i]->entry, &cast->node.entry); + operands[i] = &cast->node; + } + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, type, *loc); + expr->op = op; + for (i = 0; i <= 2; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); + list_add_tail(instrs, &expr->node.entry); + + return expr; +} + +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) +{ + struct hlsl_ir_node *cast; + + cast = new_unary_expr(HLSL_IR_UNOP_CAST, node, *loc); + if (cast) + cast->data_type = type; + return expr_from_node(cast); +} + +static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) +{ + static const enum hlsl_ir_expr_op ops[] = + { + 0, + HLSL_IR_BINOP_ADD, + HLSL_IR_BINOP_SUB, + HLSL_IR_BINOP_MUL, + HLSL_IR_BINOP_DIV, + HLSL_IR_BINOP_MOD, + HLSL_IR_BINOP_LSHIFT, + HLSL_IR_BINOP_RSHIFT, + HLSL_IR_BINOP_BIT_AND, + HLSL_IR_BINOP_BIT_OR, + HLSL_IR_BINOP_BIT_XOR, + }; + + return ops[op]; +} + +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) +{ + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; + + /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ + for (i = 0; i < 4; ++i) + { + if (*writemask & (1 << i)) + { + unsigned int s = (*swizzle >> (i * 2)) & 3; + new_swizzle |= s << (bit++ * 2); + if (new_writemask & (1 << s)) + return FALSE; + new_writemask |= 1 << s; + } + } + width = bit; + + /* Invert the swizzle. */ + bit = 0; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < width; ++j) + { + unsigned int s = (new_swizzle >> (j * 2)) & 3; + if (s == i) + inverted |= j << (bit++ * 2); + } + } + + *swizzle = inverted; + *writemask = new_writemask; + *ret_width = width; + return TRUE; +} + +struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, + enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) +{ + struct hlsl_ir_assignment *assign; + struct hlsl_type *lhs_type; + DWORD writemask = 0; + + lhs_type = lhs->data_type; + if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + writemask = (1 << lhs_type->dimx) - 1; + + if (!(rhs = add_implicit_conversion(instrs, rhs, lhs_type, &rhs->loc))) + return NULL; + } + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + while (lhs->type != HLSL_IR_LOAD) + { + struct hlsl_ir_node *lhs_inner; + + if (lhs->type == HLSL_IR_EXPR && expr_from_node(lhs)->op == HLSL_IR_UNOP_CAST) + { + FIXME("Cast on the lhs.\n"); + vkd3d_free(assign); + return NULL; + } + else if (lhs->type == HLSL_IR_SWIZZLE) + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; + + if (lhs->data_type->type == HLSL_CLASS_MATRIX) + FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); + + lhs_inner = swizzle->val.node; + hlsl_src_remove(&swizzle->val); + list_remove(&lhs->entry); + + list_add_after(&rhs->entry, &lhs->entry); + hlsl_src_from_node(&swizzle->val, rhs); + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); + vkd3d_free(assign); + return NULL; + } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + swizzle->node.data_type = hlsl_ctx.builtin_types.vector[swizzle_type->base_type][width - 1]; + rhs = &swizzle->node; + } + else + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); + vkd3d_free(assign); + return NULL; + } + + lhs = lhs_inner; + } + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); + assign->writemask = writemask; + assign->lhs.var = load_from_node(lhs)->src.var; + hlsl_src_from_node(&assign->lhs.offset, load_from_node(lhs)->src.offset.node); + if (assign_op != ASSIGN_OP_ASSIGN) + { + enum hlsl_ir_expr_op op = op_from_assignment(assign_op); + struct hlsl_ir_node *expr; + + TRACE("Adding an expression for the compound assignment.\n"); + expr = new_binary_expr(op, lhs, rhs); + list_add_after(&rhs->entry, &expr->entry); + rhs = expr; + } + hlsl_src_from_node(&assign->rhs, rhs); + list_add_tail(instrs, &assign->node.entry); + + return &assign->node; +} + +static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) +{ + const struct hlsl_type *type = RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); + const char *name = key; + + if (name == type->name) + return 0; + + if (!name || !type->name) + { + ERR("hlsl_type without a name in a scope?\n"); + return -1; + } + return strcmp(name, type->name); +} + +void push_scope(struct hlsl_parse_ctx *ctx) +{ + struct hlsl_scope *new_scope; + + if (!(new_scope = vkd3d_malloc(sizeof(*new_scope)))) + return; + TRACE("Pushing a new scope.\n"); + list_init(&new_scope->vars); + rb_init(&new_scope->types, compare_hlsl_types_rb); + new_scope->upper = ctx->cur_scope; + ctx->cur_scope = new_scope; + list_add_tail(&ctx->scopes, &new_scope->entry); +} + +BOOL pop_scope(struct hlsl_parse_ctx *ctx) +{ + struct hlsl_scope *prev_scope = ctx->cur_scope->upper; + + if (!prev_scope) + return FALSE; + TRACE("Popping current scope.\n"); + ctx->cur_scope = prev_scope; + return TRUE; +} + +static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) +{ + if (t1->type != t2->type) + { + if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR) + || (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_SCALAR))) + return t1->type - t2->type; + } + if (t1->base_type != t2->base_type) + return t1->base_type - t2->base_type; + if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + return t1->sampler_dim - t2->sampler_dim; + if (t1->dimx != t2->dimx) + return t1->dimx - t2->dimx; + if (t1->dimy != t2->dimy) + return t1->dimx - t2->dimx; + if (t1->type == HLSL_CLASS_STRUCT) + { + struct list *t1cur, *t2cur; + struct hlsl_struct_field *t1field, *t2field; + int r; + + t1cur = list_head(t1->e.elements); + t2cur = list_head(t2->e.elements); + while (t1cur && t2cur) + { + t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); + t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); + if ((r = compare_param_hlsl_types(t1field->type, t2field->type))) + return r; + if ((r = strcmp(t1field->name, t2field->name))) + return r; + t1cur = list_next(t1->e.elements, t1cur); + t2cur = list_next(t2->e.elements, t2cur); + } + if (t1cur != t2cur) + return t1cur ? 1 : -1; + return 0; + } + if (t1->type == HLSL_CLASS_ARRAY) + { + if (t1->e.array.elements_count != t2->e.array.elements_count) + return t1->e.array.elements_count - t2->e.array.elements_count; + return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type); + } + + return 0; +} + +static int compare_function_decl_rb(const void *key, const struct rb_entry *entry) +{ + const struct list *params = key; + const struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); + int decl_params_count = decl->parameters ? list_count(decl->parameters) : 0; + int params_count = params ? list_count(params) : 0; + struct list *p1cur, *p2cur; + int r; + + if (params_count != decl_params_count) + return params_count - decl_params_count; + + p1cur = params ? list_head(params) : NULL; + p2cur = decl->parameters ? list_head(decl->parameters) : NULL; + while (p1cur && p2cur) + { + struct hlsl_ir_var *p1, *p2; + p1 = LIST_ENTRY(p1cur, struct hlsl_ir_var, param_entry); + p2 = LIST_ENTRY(p2cur, struct hlsl_ir_var, param_entry); + if ((r = compare_param_hlsl_types(p1->data_type, p2->data_type))) + return r; + p1cur = list_next(params, p1cur); + p2cur = list_next(decl->parameters, p2cur); + } + return 0; +} + +static int compare_function_rb(const void *key, const struct rb_entry *entry) +{ + const char *name = key; + const struct hlsl_ir_function *func = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function,entry); + + return strcmp(name, func->name); +} + +void init_functions_tree(struct rb_tree *funcs) +{ + rb_init(&hlsl_ctx.functions, compare_function_rb); +} + +const char *debug_base_type(const struct hlsl_type *type) +{ + const char *name = "(unknown)"; + + switch (type->base_type) + { + case HLSL_TYPE_FLOAT: name = "float"; break; + case HLSL_TYPE_HALF: name = "half"; break; + case HLSL_TYPE_DOUBLE: name = "double"; break; + case HLSL_TYPE_INT: name = "int"; break; + case HLSL_TYPE_UINT: name = "uint"; break; + case HLSL_TYPE_BOOL: name = "bool"; break; + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; + case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; + case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; + case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; + case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; + } + break; + default: + FIXME("Unhandled case %u.\n", type->base_type); + } + return name; +} + +const char *debug_hlsl_type(const struct hlsl_type *type) +{ + const char *name; + + if (type->name) + return debugstr_a(type->name); + + if (type->type == HLSL_CLASS_STRUCT) + return "<anonymous struct>"; + + if (type->type == HLSL_CLASS_ARRAY) + { + name = debug_base_type(type->e.array.type); + return vkd3d_dbg_sprintf("%s[%u]", name, type->e.array.elements_count); + } + + name = debug_base_type(type); + + if (type->type == HLSL_CLASS_SCALAR) + return vkd3d_dbg_sprintf("%s", name); + if (type->type == HLSL_CLASS_VECTOR) + return vkd3d_dbg_sprintf("%s%u", name, type->dimx); + if (type->type == HLSL_CLASS_MATRIX) + return vkd3d_dbg_sprintf("%s%ux%u", name, type->dimx, type->dimy); + return "unexpected_type"; +} + +const char *debug_modifiers(DWORD modifiers) +{ + char string[110]; + + string[0] = 0; + if (modifiers & HLSL_STORAGE_EXTERN) + strcat(string, " extern"); /* 7 */ + if (modifiers & HLSL_STORAGE_NOINTERPOLATION) + strcat(string, " nointerpolation"); /* 16 */ + if (modifiers & HLSL_MODIFIER_PRECISE) + strcat(string, " precise"); /* 8 */ + if (modifiers & HLSL_STORAGE_SHARED) + strcat(string, " shared"); /* 7 */ + if (modifiers & HLSL_STORAGE_GROUPSHARED) + strcat(string, " groupshared"); /* 12 */ + if (modifiers & HLSL_STORAGE_STATIC) + strcat(string, " static"); /* 7 */ + if (modifiers & HLSL_STORAGE_UNIFORM) + strcat(string, " uniform"); /* 8 */ + if (modifiers & HLSL_STORAGE_VOLATILE) + strcat(string, " volatile"); /* 9 */ + if (modifiers & HLSL_MODIFIER_CONST) + strcat(string, " const"); /* 6 */ + if (modifiers & HLSL_MODIFIER_ROW_MAJOR) + strcat(string, " row_major"); /* 10 */ + if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + strcat(string, " column_major"); /* 13 */ + if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) + strcat(string, " inout"); /* 6 */ + else if (modifiers & HLSL_STORAGE_IN) + strcat(string, " in"); /* 3 */ + else if (modifiers & HLSL_STORAGE_OUT) + strcat(string, " out"); /* 4 */ + + return vkd3d_dbg_sprintf("%s", string[0] ? string + 1 : ""); +} + +const char *debug_node_type(enum hlsl_ir_node_type type) +{ + static const char * const names[] = + { + "HLSL_IR_ASSIGNMENT", + "HLSL_IR_CONSTANT", + "HLSL_IR_EXPR", + "HLSL_IR_IF", + "HLSL_IR_LOAD", + "HLSL_IR_LOOP", + "HLSL_IR_JUMP", + "HLSL_IR_SWIZZLE", + }; + + if (type >= ARRAY_SIZE(names)) + return "Unexpected node type"; + return names[type]; +} + +static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); + +static void debug_dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) + { + debug_dump_instr(buffer, instr); + vkd3d_string_buffer_printf(buffer, "\n"); + } +} + +static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) +{ + if (src->node->index) + vkd3d_string_buffer_printf(buffer, "@%u", src->node->index); + else + vkd3d_string_buffer_printf(buffer, "%p", src->node); +} + +static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) +{ + if (var->modifiers) + vkd3d_string_buffer_printf(buffer, "%s ", debug_modifiers(var->modifiers)); + vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(var->data_type), var->name); + if (var->semantic) + vkd3d_string_buffer_printf(buffer, " : %s", var->semantic); +} + +static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) +{ + if (deref->offset.node) + /* Print the variable's type for convenience. */ + vkd3d_string_buffer_printf(buffer, "(%s %s)", debug_hlsl_type(deref->var->data_type), deref->var->name); + else + vkd3d_string_buffer_printf(buffer, "%s", deref->var->name); + if (deref->offset.node) + { + vkd3d_string_buffer_printf(buffer, "["); + debug_dump_src(buffer, &deref->offset); + vkd3d_string_buffer_printf(buffer, "]"); + } +} + +static const char *debug_writemask(DWORD writemask) +{ + static const char components[] = {'x', 'y', 'z', 'w'}; + char string[5]; + unsigned int i = 0, pos = 0; + + assert(!(writemask & ~VKD3DSP_WRITEMASK_ALL)); + + while (writemask) + { + if (writemask & 1) + string[pos++] = components[i]; + writemask >>= 1; + i++; + } + string[pos] = '\0'; + return vkd3d_dbg_sprintf(".%s", string); +} + +static void debug_dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) +{ + vkd3d_string_buffer_printf(buffer, "= ("); + debug_dump_deref(buffer, &assign->lhs); + if (assign->writemask != VKD3DSP_WRITEMASK_ALL) + vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(assign->writemask)); + vkd3d_string_buffer_printf(buffer, " "); + debug_dump_src(buffer, &assign->rhs); + vkd3d_string_buffer_printf(buffer, ")"); +} + +static void debug_dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) +{ + struct hlsl_type *type = constant->node.data_type; + unsigned int x; + + if (type->dimx != 1) + vkd3d_string_buffer_printf(buffer, "{"); + for (x = 0; x < type->dimx; ++x) + { + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + vkd3d_string_buffer_printf(buffer, "%s ", constant->value.b[x] ? "true" : "false"); + break; + + case HLSL_TYPE_DOUBLE: + vkd3d_string_buffer_printf(buffer, "%.16e ", constant->value.d[x]); + break; + + case HLSL_TYPE_FLOAT: + vkd3d_string_buffer_printf(buffer, "%.8e ", constant->value.f[x]); + break; + + case HLSL_TYPE_INT: + vkd3d_string_buffer_printf(buffer, "%d ", constant->value.i[x]); + break; + + case HLSL_TYPE_UINT: + vkd3d_string_buffer_printf(buffer, "%u ", constant->value.u[x]); + break; + + default: + vkd3d_string_buffer_printf(buffer, "Constants of type %s not supported\n", debug_base_type(type)); + } + } + if (type->dimx != 1) + vkd3d_string_buffer_printf(buffer, "}"); +} + +static const char *debug_expr_op(const struct hlsl_ir_expr *expr) +{ + static const char * const op_names[] = + { + "~", + "!", + "-", + "abs", + "sign", + "rcp", + "rsq", + "sqrt", + "nrm", + "exp2", + "log2", + + "cast", + + "fract", + + "sin", + "cos", + "sin_reduced", + "cos_reduced", + + "dsx", + "dsy", + + "sat", + + "pre++", + "pre--", + "post++", + "post--", + + "+", + "-", + "*", + "/", + + "%", + + "<", + ">", + "<=", + ">=", + "==", + "!=", + + "&&", + "||", + + "<<", + ">>", + "&", + "|", + "^", + + "dot", + "crs", + "min", + "max", + + "pow", + + "lerp", + + ",", + }; + + if (expr->op == HLSL_IR_UNOP_CAST) + return debug_hlsl_type(expr->node.data_type); + + return op_names[expr->op]; +} + +/* Dumps the expression in a prefix "operator (operands)" form */ +static void debug_dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) +{ + unsigned int i; + + vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); + for (i = 0; i < 3 && expr->operands[i].node; ++i) + { + debug_dump_src(buffer, &expr->operands[i]); + vkd3d_string_buffer_printf(buffer, " "); + } + vkd3d_string_buffer_printf(buffer, ")"); +} + +static void debug_dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) +{ + vkd3d_string_buffer_printf(buffer, "if ("); + debug_dump_src(buffer, &if_node->condition); + vkd3d_string_buffer_printf(buffer, ")\n{\n"); + debug_dump_instr_list(buffer, &if_node->then_instrs); + vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); + debug_dump_instr_list(buffer, &if_node->else_instrs); + vkd3d_string_buffer_printf(buffer, "}\n"); +} + +static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) +{ + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + vkd3d_string_buffer_printf(buffer, "break"); + break; + + case HLSL_IR_JUMP_CONTINUE: + vkd3d_string_buffer_printf(buffer, "continue"); + break; + + case HLSL_IR_JUMP_DISCARD: + vkd3d_string_buffer_printf(buffer, "discard"); + break; + + case HLSL_IR_JUMP_RETURN: + vkd3d_string_buffer_printf(buffer, "return"); + break; + } +} + +static void debug_dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) +{ + vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); + debug_dump_instr_list(buffer, &loop->body); + vkd3d_string_buffer_printf(buffer, "}\n"); +} + +static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +{ + unsigned int i; + + debug_dump_src(buffer, &swizzle->val); + vkd3d_string_buffer_printf(buffer, "."); + if (swizzle->val.node->data_type->dimy > 1) + { + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + vkd3d_string_buffer_printf(buffer, "_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); + } + else + { + static const char c[] = {'x', 'y', 'z', 'w'}; + + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + vkd3d_string_buffer_printf(buffer, "%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + } +} + +static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) +{ + if (instr->index) + vkd3d_string_buffer_printf(buffer, "%4u: ", instr->index); + else + vkd3d_string_buffer_printf(buffer, "%p: ", instr); + + vkd3d_string_buffer_printf(buffer, "%10s | ", instr->data_type ? debug_hlsl_type(instr->data_type) : ""); + + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + debug_dump_ir_assignment(buffer, assignment_from_node(instr)); + break; + + case HLSL_IR_CONSTANT: + debug_dump_ir_constant(buffer, constant_from_node(instr)); + break; + + case HLSL_IR_EXPR: + debug_dump_ir_expr(buffer, expr_from_node(instr)); + break; + + case HLSL_IR_IF: + debug_dump_ir_if(buffer, if_from_node(instr)); + break; + + case HLSL_IR_JUMP: + debug_dump_ir_jump(buffer, jump_from_node(instr)); + break; + + case HLSL_IR_LOAD: + debug_dump_deref(buffer, &load_from_node(instr)->src); + break; + + case HLSL_IR_LOOP: + debug_dump_ir_loop(buffer, loop_from_node(instr)); + break; + + case HLSL_IR_SWIZZLE: + debug_dump_ir_swizzle(buffer, swizzle_from_node(instr)); + break; + + default: + vkd3d_string_buffer_printf(buffer, "<No dump function for %s>", debug_node_type(instr->type)); + } +} + +void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) +{ + struct vkd3d_string_buffer buffer; + struct hlsl_ir_var *param; + + vkd3d_string_buffer_init(&buffer); + vkd3d_string_buffer_printf(&buffer, "Dumping function %s.\n", func->func->name); + vkd3d_string_buffer_printf(&buffer, "Function parameters:\n"); + LIST_FOR_EACH_ENTRY(param, func->parameters, struct hlsl_ir_var, param_entry) + { + debug_dump_ir_var(&buffer, param); + vkd3d_string_buffer_printf(&buffer, "\n"); + } + if (func->semantic) + vkd3d_string_buffer_printf(&buffer, "Function semantic: %s\n", func->semantic); + if (func->body) + debug_dump_instr_list(&buffer, func->body); + + vkd3d_string_buffer_trace(&buffer); + vkd3d_string_buffer_cleanup(&buffer); +} + +void free_hlsl_type(struct hlsl_type *type) +{ + struct hlsl_struct_field *field, *next_field; + + vkd3d_free((void *)type->name); + if (type->type == HLSL_CLASS_STRUCT) + { + LIST_FOR_EACH_ENTRY_SAFE(field, next_field, type->e.elements, struct hlsl_struct_field, entry) + { + vkd3d_free((void *)field->name); + vkd3d_free((void *)field->semantic); + vkd3d_free(field); + } + } + vkd3d_free(type); +} + +void free_instr_list(struct list *list) +{ + struct hlsl_ir_node *node, *next_node; + + if (!list) + return; + /* Iterate in reverse, to avoid use-after-free when unlinking sources from + * the "uses" list. */ + LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) + free_instr(node); + vkd3d_free(list); +} + +static void free_ir_assignment(struct hlsl_ir_assignment *assignment) +{ + hlsl_src_remove(&assignment->rhs); + hlsl_src_remove(&assignment->lhs.offset); + vkd3d_free(assignment); +} + +static void free_ir_constant(struct hlsl_ir_constant *constant) +{ + vkd3d_free(constant); +} + +static void free_ir_expr(struct hlsl_ir_expr *expr) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + hlsl_src_remove(&expr->operands[i]); + vkd3d_free(expr); +} + +static void free_ir_if(struct hlsl_ir_if *if_node) +{ + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) + free_instr(node); + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) + free_instr(node); + hlsl_src_remove(&if_node->condition); + vkd3d_free(if_node); +} + +static void free_ir_jump(struct hlsl_ir_jump *jump) +{ + vkd3d_free(jump); +} + +static void free_ir_load(struct hlsl_ir_load *load) +{ + hlsl_src_remove(&load->src.offset); + vkd3d_free(load); +} + +static void free_ir_loop(struct hlsl_ir_loop *loop) +{ + struct hlsl_ir_node *node, *next_node; + + LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) + free_instr(node); + vkd3d_free(loop); +} + +static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) +{ + hlsl_src_remove(&swizzle->val); + vkd3d_free(swizzle); +} + +void free_instr(struct hlsl_ir_node *node) +{ + switch (node->type) + { + case HLSL_IR_ASSIGNMENT: + free_ir_assignment(assignment_from_node(node)); + break; + + case HLSL_IR_CONSTANT: + free_ir_constant(constant_from_node(node)); + break; + + case HLSL_IR_EXPR: + free_ir_expr(expr_from_node(node)); + break; + + case HLSL_IR_IF: + free_ir_if(if_from_node(node)); + break; + + case HLSL_IR_JUMP: + free_ir_jump(jump_from_node(node)); + break; + + case HLSL_IR_LOAD: + free_ir_load(load_from_node(node)); + break; + + case HLSL_IR_LOOP: + free_ir_loop(loop_from_node(node)); + break; + + case HLSL_IR_SWIZZLE: + free_ir_swizzle(swizzle_from_node(node)); + break; + + default: + FIXME("Unsupported node type %s.\n", debug_node_type(node->type)); + } +} + +static void free_function_decl(struct hlsl_ir_function_decl *decl) +{ + vkd3d_free((void *)decl->semantic); + vkd3d_free(decl->parameters); + free_instr_list(decl->body); + vkd3d_free(decl); +} + +static void free_function_decl_rb(struct rb_entry *entry, void *context) +{ + free_function_decl(RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry)); +} + +static void free_function(struct hlsl_ir_function *func) +{ + rb_destroy(&func->overloads, free_function_decl_rb, NULL); + vkd3d_free((void *)func->name); + vkd3d_free(func); +} + +void free_function_rb(struct rb_entry *entry, void *context) +{ + free_function(RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry)); +} + +void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, BOOL intrinsic) +{ + struct hlsl_ir_function *func; + struct rb_entry *func_entry, *old_entry; + + func_entry = rb_get(funcs, name); + if (func_entry) + { + func = RB_ENTRY_VALUE(func_entry, struct hlsl_ir_function, entry); + if (intrinsic != func->intrinsic) + { + if (intrinsic) + { + ERR("Redeclaring a user defined function as an intrinsic.\n"); + return; + } + TRACE("Function %s redeclared as a user defined function.\n", debugstr_a(name)); + func->intrinsic = intrinsic; + rb_destroy(&func->overloads, free_function_decl_rb, NULL); + rb_init(&func->overloads, compare_function_decl_rb); + } + decl->func = func; + if ((old_entry = rb_get(&func->overloads, decl->parameters))) + { + struct hlsl_ir_function_decl *old_decl = + RB_ENTRY_VALUE(old_entry, struct hlsl_ir_function_decl, entry); + + if (!decl->body) + { + free_function_decl(decl); + vkd3d_free(name); + return; + } + rb_remove(&func->overloads, old_entry); + free_function_decl(old_decl); + } + rb_put(&func->overloads, decl->parameters, &decl->entry); + vkd3d_free(name); + return; + } + func = vkd3d_malloc(sizeof(*func)); + func->name = name; + rb_init(&func->overloads, compare_function_decl_rb); + decl->func = func; + rb_put(&func->overloads, decl->parameters, &decl->entry); + func->intrinsic = intrinsic; + rb_put(funcs, func->name, &func->entry); +} + +struct hlsl_profile_info +{ + const char *name; + enum vkd3d_shader_type type; + DWORD sm_major; + DWORD sm_minor; + DWORD level_major; + DWORD level_minor; + BOOL sw; +}; + +static const struct hlsl_profile_info *get_target_info(const char *target) +{ + unsigned int i; + + static const struct hlsl_profile_info profiles[] = + { + {"cs_4_0", VKD3D_SHADER_TYPE_COMPUTE, 4, 0, 0, 0, FALSE}, + {"cs_4_1", VKD3D_SHADER_TYPE_COMPUTE, 4, 1, 0, 0, FALSE}, + {"cs_5_0", VKD3D_SHADER_TYPE_COMPUTE, 5, 0, 0, 0, FALSE}, + {"ds_5_0", VKD3D_SHADER_TYPE_DOMAIN, 5, 0, 0, 0, FALSE}, + {"fx_2_0", VKD3D_SHADER_TYPE_EFFECT, 2, 0, 0, 0, FALSE}, + {"fx_4_0", VKD3D_SHADER_TYPE_EFFECT, 4, 0, 0, 0, FALSE}, + {"fx_4_1", VKD3D_SHADER_TYPE_EFFECT, 4, 1, 0, 0, FALSE}, + {"fx_5_0", VKD3D_SHADER_TYPE_EFFECT, 5, 0, 0, 0, FALSE}, + {"gs_4_0", VKD3D_SHADER_TYPE_GEOMETRY, 4, 0, 0, 0, FALSE}, + {"gs_4_1", VKD3D_SHADER_TYPE_GEOMETRY, 4, 1, 0, 0, FALSE}, + {"gs_5_0", VKD3D_SHADER_TYPE_GEOMETRY, 5, 0, 0, 0, FALSE}, + {"hs_5_0", VKD3D_SHADER_TYPE_HULL, 5, 0, 0, 0, FALSE}, + {"ps.1.0", VKD3D_SHADER_TYPE_PIXEL, 1, 0, 0, 0, FALSE}, + {"ps.1.1", VKD3D_SHADER_TYPE_PIXEL, 1, 1, 0, 0, FALSE}, + {"ps.1.2", VKD3D_SHADER_TYPE_PIXEL, 1, 2, 0, 0, FALSE}, + {"ps.1.3", VKD3D_SHADER_TYPE_PIXEL, 1, 3, 0, 0, FALSE}, + {"ps.1.4", VKD3D_SHADER_TYPE_PIXEL, 1, 4, 0, 0, FALSE}, + {"ps.2.0", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, FALSE}, + {"ps.2.a", VKD3D_SHADER_TYPE_PIXEL, 2, 1, 0, 0, FALSE}, + {"ps.2.b", VKD3D_SHADER_TYPE_PIXEL, 2, 2, 0, 0, FALSE}, + {"ps.2.sw", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, TRUE}, + {"ps.3.0", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, FALSE}, + {"ps_1_0", VKD3D_SHADER_TYPE_PIXEL, 1, 0, 0, 0, FALSE}, + {"ps_1_1", VKD3D_SHADER_TYPE_PIXEL, 1, 1, 0, 0, FALSE}, + {"ps_1_2", VKD3D_SHADER_TYPE_PIXEL, 1, 2, 0, 0, FALSE}, + {"ps_1_3", VKD3D_SHADER_TYPE_PIXEL, 1, 3, 0, 0, FALSE}, + {"ps_1_4", VKD3D_SHADER_TYPE_PIXEL, 1, 4, 0, 0, FALSE}, + {"ps_2_0", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, FALSE}, + {"ps_2_a", VKD3D_SHADER_TYPE_PIXEL, 2, 1, 0, 0, FALSE}, + {"ps_2_b", VKD3D_SHADER_TYPE_PIXEL, 2, 2, 0, 0, FALSE}, + {"ps_2_sw", VKD3D_SHADER_TYPE_PIXEL, 2, 0, 0, 0, TRUE}, + {"ps_3_0", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, FALSE}, + {"ps_3_sw", VKD3D_SHADER_TYPE_PIXEL, 3, 0, 0, 0, TRUE}, + {"ps_4_0", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 0, 0, FALSE}, + {"ps_4_0_level_9_0", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 0, FALSE}, + {"ps_4_0_level_9_1", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 1, FALSE}, + {"ps_4_0_level_9_3", VKD3D_SHADER_TYPE_PIXEL, 4, 0, 9, 3, FALSE}, + {"ps_4_1", VKD3D_SHADER_TYPE_PIXEL, 4, 1, 0, 0, FALSE}, + {"ps_5_0", VKD3D_SHADER_TYPE_PIXEL, 5, 0, 0, 0, FALSE}, + {"tx_1_0", VKD3D_SHADER_TYPE_TEXTURE, 1, 0, 0, 0, FALSE}, + {"vs.1.0", VKD3D_SHADER_TYPE_VERTEX, 1, 0, 0, 0, FALSE}, + {"vs.1.1", VKD3D_SHADER_TYPE_VERTEX, 1, 1, 0, 0, FALSE}, + {"vs.2.0", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, FALSE}, + {"vs.2.a", VKD3D_SHADER_TYPE_VERTEX, 2, 1, 0, 0, FALSE}, + {"vs.2.sw", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, TRUE}, + {"vs.3.0", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, FALSE}, + {"vs.3.sw", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, TRUE}, + {"vs_1_0", VKD3D_SHADER_TYPE_VERTEX, 1, 0, 0, 0, FALSE}, + {"vs_1_1", VKD3D_SHADER_TYPE_VERTEX, 1, 1, 0, 0, FALSE}, + {"vs_2_0", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, FALSE}, + {"vs_2_a", VKD3D_SHADER_TYPE_VERTEX, 2, 1, 0, 0, FALSE}, + {"vs_2_sw", VKD3D_SHADER_TYPE_VERTEX, 2, 0, 0, 0, TRUE}, + {"vs_3_0", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, FALSE}, + {"vs_3_sw", VKD3D_SHADER_TYPE_VERTEX, 3, 0, 0, 0, TRUE}, + {"vs_4_0", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 0, 0, FALSE}, + {"vs_4_0_level_9_0", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 0, FALSE}, + {"vs_4_0_level_9_1", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 1, FALSE}, + {"vs_4_0_level_9_3", VKD3D_SHADER_TYPE_VERTEX, 4, 0, 9, 3, FALSE}, + {"vs_4_1", VKD3D_SHADER_TYPE_VERTEX, 4, 1, 0, 0, FALSE}, + {"vs_5_0", VKD3D_SHADER_TYPE_VERTEX, 5, 0, 0, 0, FALSE}, + }; + + for (i = 0; i < ARRAY_SIZE(profiles); ++i) + { + if (!strcmp(target, profiles[i].name)) + return &profiles[i]; + } + + return NULL; +} + +int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; + const struct hlsl_profile_info *profile; + + if (!(hlsl_source_info = vkd3d_find_struct(compile_info->next, HLSL_SOURCE_INFO))) + { + ERR("No HLSL source info given.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (!(profile = get_target_info(hlsl_source_info->profile))) + { + FIXME("Unknown compilation target %s.\n", debugstr_a(hlsl_source_info->profile)); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + vkd3d_shader_dump_shader(profile->type, &compile_info->source); + + return hlsl_lexer_compile(text, profile->type, profile->sm_major, profile->sm_minor, + hlsl_source_info->entry_point, dxbc, message_context); +} diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h new file mode 100644 index 00000000..128de1d6 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.h @@ -0,0 +1,644 @@ +/* + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __VKD3D_SHADER_HLSL_H +#define __VKD3D_SHADER_HLSL_H + +#include "vkd3d_shader_private.h" +#include "rbtree.h" + +enum parse_status +{ + PARSE_SUCCESS = 0, + PARSE_WARN = 1, + PARSE_ERR = 2 +}; + +/* The general IR structure is inspired by Mesa GLSL hir, even though the code + * ends up being quite different in practice. Anyway, here comes the relevant + * licensing information. + * + * Copyright © 2010 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#define HLSL_SWIZZLE_X (0u) +#define HLSL_SWIZZLE_Y (1u) +#define HLSL_SWIZZLE_Z (2u) +#define HLSL_SWIZZLE_W (3u) + +#define HLSL_SWIZZLE(x, y, z, w) \ + (((HLSL_SWIZZLE_ ## x) << 0) \ + | ((HLSL_SWIZZLE_ ## y) << 2) \ + | ((HLSL_SWIZZLE_ ## z) << 4) \ + | ((HLSL_SWIZZLE_ ## w) << 6)) + +enum hlsl_type_class +{ + HLSL_CLASS_SCALAR, + HLSL_CLASS_VECTOR, + HLSL_CLASS_MATRIX, + HLSL_CLASS_LAST_NUMERIC = HLSL_CLASS_MATRIX, + HLSL_CLASS_STRUCT, + HLSL_CLASS_ARRAY, + HLSL_CLASS_OBJECT, +}; + +enum hlsl_base_type +{ + HLSL_TYPE_FLOAT, + HLSL_TYPE_HALF, + HLSL_TYPE_DOUBLE, + HLSL_TYPE_INT, + HLSL_TYPE_UINT, + HLSL_TYPE_BOOL, + HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, + HLSL_TYPE_SAMPLER, + HLSL_TYPE_TEXTURE, + HLSL_TYPE_PIXELSHADER, + HLSL_TYPE_VERTEXSHADER, + HLSL_TYPE_STRING, + HLSL_TYPE_VOID, +}; + +enum hlsl_sampler_dim +{ + HLSL_SAMPLER_DIM_GENERIC, + HLSL_SAMPLER_DIM_1D, + HLSL_SAMPLER_DIM_2D, + HLSL_SAMPLER_DIM_3D, + HLSL_SAMPLER_DIM_CUBE, + HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE +}; + +enum hlsl_matrix_majority +{ + HLSL_COLUMN_MAJOR, + HLSL_ROW_MAJOR +}; + +struct hlsl_type +{ + struct list entry; + struct rb_entry scope_entry; + enum hlsl_type_class type; + enum hlsl_base_type base_type; + enum hlsl_sampler_dim sampler_dim; + const char *name; + unsigned int modifiers; + unsigned int dimx; + unsigned int dimy; + unsigned int reg_size; + union + { + struct list *elements; + struct + { + struct hlsl_type *type; + unsigned int elements_count; + } array; + } e; +}; + +struct hlsl_struct_field +{ + struct list entry; + struct hlsl_type *type; + const char *name; + const char *semantic; + DWORD modifiers; + unsigned int reg_offset; +}; + +struct source_location +{ + const char *file; + unsigned int line; + unsigned int col; +}; + +enum hlsl_ir_node_type +{ + HLSL_IR_ASSIGNMENT = 0, + HLSL_IR_CONSTANT, + HLSL_IR_EXPR, + HLSL_IR_IF, + HLSL_IR_LOAD, + HLSL_IR_LOOP, + HLSL_IR_JUMP, + HLSL_IR_SWIZZLE, +}; + +struct hlsl_ir_node +{ + struct list entry; + enum hlsl_ir_node_type type; + struct hlsl_type *data_type; + + struct list uses; + + struct source_location loc; + + /* Liveness ranges. "index" is the index of this instruction. Since this is + * essentially an SSA value, the earliest live point is the index. This is + * true even for loops, since currently we can't have a reference to a + * value generated in an earlier iteration of the loop. */ + unsigned int index, last_read; +}; + +struct hlsl_src +{ + struct hlsl_ir_node *node; + struct list entry; +}; + +#define HLSL_STORAGE_EXTERN 0x00000001 +#define HLSL_STORAGE_NOINTERPOLATION 0x00000002 +#define HLSL_MODIFIER_PRECISE 0x00000004 +#define HLSL_STORAGE_SHARED 0x00000008 +#define HLSL_STORAGE_GROUPSHARED 0x00000010 +#define HLSL_STORAGE_STATIC 0x00000020 +#define HLSL_STORAGE_UNIFORM 0x00000040 +#define HLSL_STORAGE_VOLATILE 0x00000080 +#define HLSL_MODIFIER_CONST 0x00000100 +#define HLSL_MODIFIER_ROW_MAJOR 0x00000200 +#define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 +#define HLSL_STORAGE_IN 0x00000800 +#define HLSL_STORAGE_OUT 0x00001000 + +#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ + HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ + HLSL_MODIFIER_COLUMN_MAJOR) + +#define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + +struct reg_reservation +{ + enum vkd3d_shader_register_type type; + DWORD regnum; +}; + +struct hlsl_ir_var +{ + struct hlsl_type *data_type; + struct source_location loc; + const char *name; + const char *semantic; + unsigned int modifiers; + const struct reg_reservation *reg_reservation; + struct list scope_entry, param_entry; + + unsigned int first_write, last_read; +}; + +struct hlsl_ir_function +{ + struct rb_entry entry; + const char *name; + struct rb_tree overloads; + BOOL intrinsic; +}; + +struct hlsl_ir_function_decl +{ + struct hlsl_type *return_type; + struct hlsl_ir_var *return_var; + struct source_location loc; + struct rb_entry entry; + struct hlsl_ir_function *func; + const char *semantic; + struct list *parameters; + struct list *body; +}; + +struct hlsl_ir_if +{ + struct hlsl_ir_node node; + struct hlsl_src condition; + struct list then_instrs; + struct list else_instrs; +}; + +struct hlsl_ir_loop +{ + struct hlsl_ir_node node; + /* loop condition is stored in the body (as "if (!condition) break;") */ + struct list body; + unsigned int next_index; /* liveness index of the end of the loop */ +}; + +enum hlsl_ir_expr_op +{ + HLSL_IR_UNOP_BIT_NOT = 0, + HLSL_IR_UNOP_LOGIC_NOT, + HLSL_IR_UNOP_NEG, + HLSL_IR_UNOP_ABS, + HLSL_IR_UNOP_SIGN, + HLSL_IR_UNOP_RCP, + HLSL_IR_UNOP_RSQ, + HLSL_IR_UNOP_SQRT, + HLSL_IR_UNOP_NRM, + HLSL_IR_UNOP_EXP2, + HLSL_IR_UNOP_LOG2, + + HLSL_IR_UNOP_CAST, + + HLSL_IR_UNOP_FRACT, + + HLSL_IR_UNOP_SIN, + HLSL_IR_UNOP_COS, + HLSL_IR_UNOP_SIN_REDUCED, /* Reduced range [-pi, pi] */ + HLSL_IR_UNOP_COS_REDUCED, /* Reduced range [-pi, pi] */ + + HLSL_IR_UNOP_DSX, + HLSL_IR_UNOP_DSY, + + HLSL_IR_UNOP_SAT, + + HLSL_IR_UNOP_PREINC, + HLSL_IR_UNOP_PREDEC, + HLSL_IR_UNOP_POSTINC, + HLSL_IR_UNOP_POSTDEC, + + HLSL_IR_BINOP_ADD, + HLSL_IR_BINOP_SUB, + HLSL_IR_BINOP_MUL, + HLSL_IR_BINOP_DIV, + + HLSL_IR_BINOP_MOD, + + HLSL_IR_BINOP_LESS, + HLSL_IR_BINOP_GREATER, + HLSL_IR_BINOP_LEQUAL, + HLSL_IR_BINOP_GEQUAL, + HLSL_IR_BINOP_EQUAL, + HLSL_IR_BINOP_NEQUAL, + + HLSL_IR_BINOP_LOGIC_AND, + HLSL_IR_BINOP_LOGIC_OR, + + HLSL_IR_BINOP_LSHIFT, + HLSL_IR_BINOP_RSHIFT, + HLSL_IR_BINOP_BIT_AND, + HLSL_IR_BINOP_BIT_OR, + HLSL_IR_BINOP_BIT_XOR, + + HLSL_IR_BINOP_DOT, + HLSL_IR_BINOP_CRS, + HLSL_IR_BINOP_MIN, + HLSL_IR_BINOP_MAX, + + HLSL_IR_BINOP_POW, + + HLSL_IR_TEROP_LERP, + + HLSL_IR_SEQUENCE, +}; + +struct hlsl_ir_expr +{ + struct hlsl_ir_node node; + enum hlsl_ir_expr_op op; + struct hlsl_src operands[3]; +}; + +enum hlsl_ir_jump_type +{ + HLSL_IR_JUMP_BREAK, + HLSL_IR_JUMP_CONTINUE, + HLSL_IR_JUMP_DISCARD, + HLSL_IR_JUMP_RETURN, +}; + +struct hlsl_ir_jump +{ + struct hlsl_ir_node node; + enum hlsl_ir_jump_type type; +}; + +struct hlsl_ir_swizzle +{ + struct hlsl_ir_node node; + struct hlsl_src val; + DWORD swizzle; +}; + +struct hlsl_deref +{ + struct hlsl_ir_var *var; + struct hlsl_src offset; +}; + +struct hlsl_ir_load +{ + struct hlsl_ir_node node; + struct hlsl_deref src; +}; + +struct hlsl_ir_assignment +{ + struct hlsl_ir_node node; + struct hlsl_deref lhs; + struct hlsl_src rhs; + unsigned char writemask; +}; + +struct hlsl_ir_constant +{ + struct hlsl_ir_node node; + union + { + unsigned u[4]; + int i[4]; + float f[4]; + double d[4]; + BOOL b[4]; + } value; +}; + +struct hlsl_scope +{ + struct list entry; + struct list vars; + struct rb_tree types; + struct hlsl_scope *upper; +}; + +/* Structures used only during parsing */ +struct parse_parameter +{ + struct hlsl_type *type; + const char *name; + const char *semantic; + const struct reg_reservation *reg_reservation; + unsigned int modifiers; +}; + +struct parse_colon_attribute +{ + const char *semantic; + struct reg_reservation *reg_reservation; +}; + +struct parse_initializer +{ + struct hlsl_ir_node **args; + unsigned int args_count; + struct list *instrs; +}; + +struct parse_variable_def +{ + struct list entry; + struct source_location loc; + + char *name; + unsigned int array_size; + const char *semantic; + struct reg_reservation *reg_reservation; + struct parse_initializer initializer; +}; + +struct parse_function +{ + char *name; + struct hlsl_ir_function_decl *decl; +}; + +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + +enum parse_unary_op +{ + UNARY_OP_PLUS, + UNARY_OP_MINUS, + UNARY_OP_LOGICNOT, + UNARY_OP_BITNOT, +}; + +enum parse_assign_op +{ + ASSIGN_OP_ASSIGN, + ASSIGN_OP_ADD, + ASSIGN_OP_SUB, + ASSIGN_OP_MUL, + ASSIGN_OP_DIV, + ASSIGN_OP_MOD, + ASSIGN_OP_LSHIFT, + ASSIGN_OP_RSHIFT, + ASSIGN_OP_AND, + ASSIGN_OP_OR, + ASSIGN_OP_XOR, +}; + +struct hlsl_parse_ctx +{ + const char **source_files; + unsigned int source_files_count; + const char *source_file; + unsigned int line_no; + unsigned int column; + enum parse_status status; + struct vkd3d_shader_message_context *message_context; + + struct hlsl_scope *cur_scope; + struct hlsl_scope *globals; + struct list scopes; + + struct list types; + struct rb_tree functions; + const struct hlsl_ir_function_decl *cur_function; + + enum hlsl_matrix_majority matrix_majority; + + struct + { + struct hlsl_type *scalar[HLSL_TYPE_LAST_SCALAR + 1]; + struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; + struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1]; + struct hlsl_type *Void; + } builtin_types; + + struct list static_initializers; +}; + +extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; + +enum hlsl_error_level +{ + HLSL_LEVEL_ERROR = 0, + HLSL_LEVEL_WARNING, + HLSL_LEVEL_NOTE, +}; + +void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(3,4) DECLSPEC_HIDDEN; + +static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_ASSIGNMENT); + return CONTAINING_RECORD(node, struct hlsl_ir_assignment, node); +} + +static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_CONSTANT); + return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); +} + +static inline struct hlsl_ir_expr *expr_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_EXPR); + return CONTAINING_RECORD(node, struct hlsl_ir_expr, node); +} + +static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_IF); + return CONTAINING_RECORD(node, struct hlsl_ir_if, node); +} + +static inline struct hlsl_ir_jump *jump_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_JUMP); + return CONTAINING_RECORD(node, struct hlsl_ir_jump, node); +} + +static inline struct hlsl_ir_load *load_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOAD); + return CONTAINING_RECORD(node, struct hlsl_ir_load, node); +} + +static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOOP); + return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); +} + +static inline struct hlsl_ir_swizzle *swizzle_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_SWIZZLE); + return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); +} + +static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, + struct hlsl_type *data_type, struct source_location loc) +{ + memset(node, 0, sizeof(*node)); + node->type = type; + node->data_type = data_type; + node->loc = loc; + list_init(&node->uses); +} + +static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) +{ + src->node = node; + if (node) + list_add_tail(&node->uses, &src->entry); +} + +static inline void hlsl_src_remove(struct hlsl_src *src) +{ + if (src->node) + list_remove(&src->entry); + src->node = NULL; +} + +static inline void set_parse_status(enum parse_status *current, enum parse_status update) +{ + if (update == PARSE_ERR) + *current = PARSE_ERR; + else if (update == PARSE_WARN && *current == PARSE_SUCCESS) + *current = PARSE_WARN; +} + +struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lhs, + enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[3], + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; + +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, + struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, + struct source_location loc) DECLSPEC_HIDDEN; + +BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; +struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; +void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; +struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; +BOOL is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL find_function(const char *name) DECLSPEC_HIDDEN; +unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; +BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; +void push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; +BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; +void init_functions_tree(struct rb_tree *funcs) DECLSPEC_HIDDEN; +void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, + BOOL intrinsic) DECLSPEC_HIDDEN; + +int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; +int hlsl_parser_compile(enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + +const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; +const char *debug_node_type(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; +void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; + +void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +void free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; +void free_instr_list(struct list *list) DECLSPEC_HIDDEN; +void free_function_rb(struct rb_entry *entry, void *context) DECLSPEC_HIDDEN; + +#endif diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l new file mode 100644 index 00000000..0bb1ee88 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.l @@ -0,0 +1,288 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni 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 + */ + +%{ +#define YY_NO_UNISTD_H +#include "hlsl.h" +#include "hlsl.tab.h" + +#define YY_USER_ACTION \ + do { \ + hlsl_lloc.first_column = hlsl_ctx.column; \ + hlsl_lloc.first_line = hlsl_ctx.line_no; \ + hlsl_ctx.column += yyleng; \ + } while(0); + +%} + +%option prefix="hlsl_" +%option never-interactive +%option noinput +%option nounput +%option noyywrap + +%x pp pp_line pp_pragma pp_ignore + +RESERVED1 auto|case|catch|char|class|const_cast|default|delete|dynamic_cast|enum +RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public +RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try +RESERVED4 typename|union|unsigned|using|virtual + +WS [ \t] +NEWLINE (\n)|(\r\n) +DOUBLESLASHCOMMENT "//"[^\n]* +STRING \"[^\"]*\" +IDENTIFIER [A-Za-z_][A-Za-z0-9_]* + +ANY (.) + +%% +{RESERVED1} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED2} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED3} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED4} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + +BlendState {return KW_BLENDSTATE; } +break {return KW_BREAK; } +Buffer {return KW_BUFFER; } +cbuffer {return KW_CBUFFER; } +compile {return KW_COMPILE; } +const {return KW_CONST; } +continue {return KW_CONTINUE; } +DepthStencilState {return KW_DEPTHSTENCILSTATE; } +DepthStencilView {return KW_DEPTHSTENCILVIEW; } +discard {return KW_DISCARD; } +do {return KW_DO; } +double {return KW_DOUBLE; } +else {return KW_ELSE; } +extern {return KW_EXTERN; } +false {return KW_FALSE; } +for {return KW_FOR; } +GeometryShader {return KW_GEOMETRYSHADER; } +groupshared {return KW_GROUPSHARED; } +if {return KW_IF; } +in {return KW_IN; } +inline {return KW_INLINE; } +inout {return KW_INOUT; } +matrix {return KW_MATRIX; } +namespace {return KW_NAMESPACE; } +nointerpolation {return KW_NOINTERPOLATION; } +out {return KW_OUT; } +pass {return KW_PASS; } +PixelShader {return KW_PIXELSHADER; } +precise {return KW_PRECISE; } +RasterizerState {return KW_RASTERIZERSTATE; } +RenderTargetView {return KW_RENDERTARGETVIEW; } +return {return KW_RETURN; } +register {return KW_REGISTER; } +sampler {return KW_SAMPLER; } +sampler1D {return KW_SAMPLER1D; } +sampler2D {return KW_SAMPLER2D; } +sampler3D {return KW_SAMPLER3D; } +samplerCUBE {return KW_SAMPLERCUBE; } +sampler_state {return KW_SAMPLER_STATE; } +SamplerComparisonState {return KW_SAMPLERCOMPARISONSTATE;} +shared {return KW_SHARED; } +stateblock {return KW_STATEBLOCK; } +stateblock_state {return KW_STATEBLOCK_STATE; } +static {return KW_STATIC; } +string {return KW_STRING; } +struct {return KW_STRUCT; } +switch {return KW_SWITCH; } +tbuffer {return KW_TBUFFER; } +technique {return KW_TECHNIQUE; } +technique10 {return KW_TECHNIQUE10; } +texture {return KW_TEXTURE; } +texture1D {return KW_TEXTURE1D; } +Texture1DArray {return KW_TEXTURE1DARRAY; } +texture2D {return KW_TEXTURE2D; } +Texture2DArray {return KW_TEXTURE2DARRAY; } +Texture2DMS {return KW_TEXTURE2DMS; } +Texture2DMSArray {return KW_TEXTURE2DMSARRAY; } +texture3D {return KW_TEXTURE3D; } +Texture3DArray {return KW_TEXTURE3DARRAY; } +textureCUBE {return KW_TEXTURECUBE; } +true {return KW_TRUE; } +typedef {return KW_TYPEDEF; } +uniform {return KW_UNIFORM; } +vector {return KW_VECTOR; } +VertexShader {return KW_VERTEXSHADER; } +void {return KW_VOID; } +volatile {return KW_VOLATILE; } +while {return KW_WHILE; } + +\+\+ {return OP_INC; } +\-\- {return OP_DEC; } +&& {return OP_AND; } +\|\| {return OP_OR; } +== {return OP_EQ; } +\<\< {return OP_LEFTSHIFT; } +\<\<= {return OP_LEFTSHIFTASSIGN; } +\>\> {return OP_RIGHTSHIFT; } +\>\>= {return OP_RIGHTSHIFTASSIGN; } +\.\.\. {return OP_ELLIPSIS; } +\<= {return OP_LE; } +\>= {return OP_GE; } +!= {return OP_NE; } +\+= {return OP_ADDASSIGN; } +\-= {return OP_SUBASSIGN; } +\*= {return OP_MULASSIGN; } +\/= {return OP_DIVASSIGN; } +%= {return OP_MODASSIGN; } +&= {return OP_ANDASSIGN; } +\|= {return OP_ORASSIGN; } +^= {return OP_XORASSIGN; } +## {return OP_UNKNOWN1; } +#@ {return OP_UNKNOWN2; } +:: {return OP_UNKNOWN3; } +\-\> {return OP_UNKNOWN4; } + +column_major {return KW_COLUMN_MAJOR; } +row_major {return KW_ROW_MAJOR; } + +{IDENTIFIER} { + hlsl_lval.name = vkd3d_strdup(yytext); + if (get_variable(hlsl_ctx.cur_scope, yytext) + || find_function(yytext)) + return VAR_IDENTIFIER; + else if (get_type(hlsl_ctx.cur_scope, yytext, TRUE)) + return TYPE_IDENTIFIER; + else + return NEW_IDENTIFIER; + } + +[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { + hlsl_lval.floatval = atof(yytext); + return C_FLOAT; + } +0x[0-9a-fA-F]+ { + sscanf(yytext, "0x%x", &hlsl_lval.intval); + return C_INTEGER; + } +0[0-7]+ { + sscanf(yytext, "0%o", &hlsl_lval.intval); + return C_INTEGER; + } +[0-9]+ { + hlsl_lval.intval = (atoi(yytext)); + return C_INTEGER; + } + +{DOUBLESLASHCOMMENT} {} + +{WS}+ {} +{NEWLINE} { + hlsl_ctx.line_no++; + hlsl_ctx.column = 1; + } + +^# { + BEGIN(pp); + } + +<pp>pragma{WS}+ { + TRACE("Got a #pragma.\n"); + BEGIN(pp_pragma); + } +<pp_pragma>pack_matrix{WS}*${WS}*row_major{WS}*$ { + TRACE("#pragma setting row_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; + BEGIN(pp_ignore); + } +<pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { + TRACE("#pragma setting column_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + BEGIN(pp_ignore); + } +<pp_pragma>{NEWLINE} { + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); + BEGIN(INITIAL); + } +<pp_pragma>{ANY} {} +<pp>[0-9]+ { + TRACE("Preprocessor line info.\n"); + BEGIN(pp_line); + hlsl_lval.intval = (atoi(yytext)); + return PRE_LINE; + } +<pp_line>{STRING} { + char *string = vkd3d_strdup(yytext + 1); + + BEGIN(pp_ignore); + string[strlen(string) - 1] = 0; + hlsl_lval.name = string; + return STRING; + } +<pp_line>{WS}+ {} +<pp_line>{NEWLINE} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN(INITIAL); + } +<pp_ignore>{NEWLINE} { + BEGIN(INITIAL); + } +<pp_ignore>{ANY} {} +<pp>{NEWLINE} { + FIXME("Unexpected preprocessor directive.\n"); + BEGIN(INITIAL); + } +<pp>{ANY} {} + +{ANY} { + return yytext[0]; + } + +%% + +int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + YY_BUFFER_STATE buffer; + int ret; + + buffer = hlsl__scan_string(text); + hlsl__switch_to_buffer(buffer); + + ret = hlsl_parser_compile(type, major, minor, entrypoint, dxbc, message_context); + + hlsl__delete_buffer(buffer); + return ret; +} diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y new file mode 100644 index 00000000..4e2218c5 --- /dev/null +++ b/libs/vkd3d-shader/hlsl.y @@ -0,0 +1,2961 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * Copyright 2019-2020 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +%{ +#include "hlsl.h" +#include <stdio.h> + +int hlsl_lex(void); + +struct hlsl_parse_ctx hlsl_ctx; + +struct YYLTYPE; +static struct source_location get_location(const struct YYLTYPE *l); + +void hlsl_message(const char *fmt, ...) +{ + /* FIXME */ +} + +void hlsl_report_message(const struct source_location loc, + enum hlsl_error_level level, const char *fmt, ...) +{ + /* FIXME */ + + if (level == HLSL_LEVEL_ERROR) + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + else if (level == HLSL_LEVEL_WARNING) + set_parse_status(&hlsl_ctx.status, PARSE_WARN); +} + +static void hlsl_error(const char *s) +{ + const struct source_location loc = + { + .file = hlsl_ctx.source_file, + .line = hlsl_ctx.line_no, + .col = hlsl_ctx.column, + }; + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "%s", s); +} + +static struct hlsl_ir_node *node_from_list(struct list *list) +{ + return LIST_ENTRY(list_tail(list), struct hlsl_ir_node, entry); +} + +static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char *declname, unsigned int line_no) +{ + TRACE("Line %u: ", line_no); + if (modifiers) + TRACE("%s ", debug_modifiers(modifiers)); + TRACE("%s %s;\n", debug_hlsl_type(type), declname); +} + +static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_location loc) +{ + if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + hlsl_report_message(loc, HLSL_LEVEL_ERROR, + "'row_major' or 'column_major' modifiers are only allowed for matrices."); +} + +static BOOL type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + +static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) +{ + BOOL ret; + + TRACE("Declaring variable %s.\n", decl->name); + if (decl->data_type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(decl->modifiers, decl->loc); + + if (local) + { + DWORD invalid = decl->modifiers & (HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED + | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); + + if (invalid) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, + "modifier '%s' invalid for local variables", debug_modifiers(invalid)); + } + if (decl->semantic) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, + "semantics are not allowed on local variables"); + return FALSE; + } + } + else + { + if (find_function(decl->name)) + { + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, "redefinition of '%s'", decl->name); + return FALSE; + } + } + ret = add_declaration(hlsl_ctx.cur_scope, decl, local); + if (!ret) + { + struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); + + hlsl_report_message(decl->loc, HLSL_LEVEL_ERROR, "\"%s\" already declared", decl->name); + hlsl_report_message(old->loc, HLSL_LEVEL_NOTE, "\"%s\" was previously declared here", old->name); + return FALSE; + } + return TRUE; +} + +static DWORD add_modifiers(DWORD modifiers, DWORD mod, const struct source_location loc) +{ + if (modifiers & mod) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifier '%s' already specified", debug_modifiers(mod)); + return modifiers; + } + if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + return modifiers; + } + return modifiers | mod; +} + +static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +{ + if (get_type(scope, def->name, FALSE)) + return FALSE; + + rb_put(&scope->types, def->name, &def->scope_entry); + return TRUE; +} + +static void declare_predefined_types(struct hlsl_scope *scope) +{ + struct hlsl_type *type; + unsigned int x, y, bt; + static const char * const names[] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + char name[10]; + + static const char *const sampler_names[] = + { + "sampler", + "sampler1D", + "sampler2D", + "sampler3D", + "samplerCUBE" + }; + + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", names[bt], y, x); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); + add_type_to_scope(scope, type); + + if (y == 1) + { + sprintf(name, "%s%u", names[bt], x); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); + add_type_to_scope(scope, type); + hlsl_ctx.builtin_types.vector[bt][x - 1] = type; + + if (x == 1) + { + sprintf(name, "%s", names[bt]); + type = new_hlsl_type(vkd3d_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); + add_type_to_scope(scope, type); + hlsl_ctx.builtin_types.scalar[bt] = type; + } + } + } + } + } + + for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) + { + type = new_hlsl_type(vkd3d_strdup(sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + type->sampler_dim = bt; + hlsl_ctx.builtin_types.sampler[bt] = type; + } + + hlsl_ctx.builtin_types.Void = new_hlsl_type(vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + + /* DX8 effects predefined types */ + type = new_hlsl_type(vkd3d_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(vkd3d_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); + add_type_to_scope(scope, type); +} + +static BOOL type_is_void(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; +} + +static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = vkd3d_malloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + +static BOOL append_conditional_break(struct list *cond_list) +{ + struct hlsl_ir_node *condition, *not; + struct hlsl_ir_jump *jump; + struct hlsl_ir_if *iff; + + /* E.g. "for (i = 0; ; ++i)". */ + if (!list_count(cond_list)) + return TRUE; + + condition = node_from_list(cond_list); + if (!(not = new_unary_expr(HLSL_IR_UNOP_LOGIC_NOT, condition, condition->loc))) + return FALSE; + list_add_tail(cond_list, &not->entry); + + if (!(iff = new_if(not, condition->loc))) + return FALSE; + list_add_tail(cond_list, &iff->node.entry); + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return FALSE; + init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); + jump->type = HLSL_IR_JUMP_BREAK; + list_add_head(&iff->then_instrs, &jump->node.entry); + return TRUE; +} + +enum loop_type +{ + LOOP_FOR, + LOOP_WHILE, + LOOP_DO_WHILE +}; + +static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, + struct list *iter, struct list *body, struct source_location loc) +{ + struct list *list = NULL; + struct hlsl_ir_loop *loop = NULL; + struct hlsl_ir_if *cond_jump = NULL; + + if (!(list = vkd3d_malloc(sizeof(*list)))) + goto oom; + list_init(list); + + if (init) + list_move_head(list, init); + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + goto oom; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_add_tail(list, &loop->node.entry); + list_init(&loop->body); + + if (!append_conditional_break(cond)) + goto oom; + + if (type != LOOP_DO_WHILE) + list_move_tail(&loop->body, cond); + + list_move_tail(&loop->body, body); + + if (iter) + list_move_tail(&loop->body, iter); + + if (type == LOOP_DO_WHILE) + list_move_tail(&loop->body, cond); + + vkd3d_free(init); + vkd3d_free(cond); + vkd3d_free(body); + return list; + +oom: + vkd3d_free(loop); + vkd3d_free(cond_jump); + vkd3d_free(list); + free_instr_list(init); + free_instr_list(cond); + free_instr_list(iter); + free_instr_list(body); + return NULL; +} + +static unsigned int initializer_size(const struct parse_initializer *initializer) +{ + unsigned int count = 0, i; + + for (i = 0; i < initializer->args_count; ++i) + { + count += components_count_type(initializer->args[i]->data_type); + } + TRACE("Initializer size = %u.\n", count); + return count; +} + +static void free_parse_initializer(struct parse_initializer *initializer) +{ + free_instr_list(initializer->instrs); + vkd3d_free(initializer->args); +} + +static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle; + + if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) + return NULL; + init_node(&swizzle->node, HLSL_IR_SWIZZLE, + new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + hlsl_src_from_node(&swizzle->val, val); + swizzle->swizzle = s; + return swizzle; +} + +static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, + struct source_location *loc) +{ + unsigned int len = strlen(swizzle), component = 0; + unsigned int i, set, swiz = 0; + BOOL valid; + + if (value->data_type->type == HLSL_CLASS_MATRIX) + { + /* Matrix swizzle */ + BOOL m_swizzle; + unsigned int inc, x, y; + + if (len < 3 || swizzle[0] != '_') + return NULL; + m_swizzle = swizzle[1] == 'm'; + inc = m_swizzle ? 4 : 3; + + if (len % inc || len > inc * 4) + return NULL; + + for (i = 0; i < len; i += inc) + { + if (swizzle[i] != '_') + return NULL; + if (m_swizzle) + { + if (swizzle[i + 1] != 'm') + return NULL; + y = swizzle[i + 2] - '0'; + x = swizzle[i + 3] - '0'; + } + else + { + y = swizzle[i + 1] - '1'; + x = swizzle[i + 2] - '1'; + } + + if (x >= value->data_type->dimx || y >= value->data_type->dimy) + return NULL; + swiz |= (y << 4 | x) << component * 8; + component++; + } + return new_swizzle(swiz, component, value, loc); + } + + /* Vector swizzle */ + if (len > 4) + return NULL; + + for (set = 0; set < 2; ++set) + { + valid = TRUE; + component = 0; + for (i = 0; i < len; ++i) + { + char c[2][4] = {{'x', 'y', 'z', 'w'}, {'r', 'g', 'b', 'a'}}; + unsigned int s = 0; + + for (s = 0; s < 4; ++s) + { + if (swizzle[i] == c[set][s]) + break; + } + if (s == 4) + { + valid = FALSE; + break; + } + + if (s >= value->data_type->dimx) + return NULL; + swiz |= s << component * 2; + component++; + } + if (valid) + return new_swizzle(swiz, component, value, loc); + } + + return NULL; +} + +static struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) +{ + struct hlsl_ir_var *var; + + if (!(var = vkd3d_calloc(1, sizeof(*var)))) + { + hlsl_ctx.status = PARSE_ERR; + return NULL; + } + + var->name = name; + var->data_type = type; + var->loc = loc; + var->semantic = semantic; + var->modifiers = modifiers; + var->reg_reservation = reg_reservation; + return var; +} + +static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) +{ + struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); + + if (var) + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + return var; +} + +static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) +{ + struct hlsl_ir_assignment *assign; + + if (!writemask && type_is_single_reg(rhs->data_type)) + writemask = (1 << rhs->data_type->dimx) - 1; + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); + assign->lhs.var = var; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); + assign->writemask = writemask; + return assign; +} + +static struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + return new_assignment(lhs, NULL, rhs, 0, rhs->loc); +} + +static struct hlsl_ir_jump *add_return(struct list *instrs, + struct hlsl_ir_node *return_value, struct source_location loc) +{ + struct hlsl_type *return_type = hlsl_ctx.cur_function->return_type; + struct hlsl_ir_jump *jump; + + if (return_value) + { + struct hlsl_ir_assignment *assignment; + + if (!(return_value = add_implicit_conversion(instrs, return_value, return_type, &loc))) + return NULL; + + if (!(assignment = new_simple_assignment(hlsl_ctx.cur_function->return_var, return_value))) + return NULL; + list_add_after(&return_value->entry, &assignment->node.entry); + } + else if (!type_is_void(return_type)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "non-void function must return a value"); + return NULL; + } + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return NULL; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = HLSL_IR_JUMP_RETURN; + list_add_tail(instrs, &jump->node.entry); + + return jump; +} + +static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); + c->value.u[0] = n; + return c; +} + +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) +{ + struct hlsl_ir_expr *expr; + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg); + return &expr->node; +} + +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) +{ + struct hlsl_ir_expr *expr; + + assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); + return &expr->node; +} + +static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) +{ + struct hlsl_ir_load *load; + + if (!(load = vkd3d_calloc(1, sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); + load->src.var = var; + return load; +} + +static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, + struct hlsl_type *data_type, const struct source_location loc) +{ + struct hlsl_ir_node *add = NULL; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (var_node->type == HLSL_IR_LOAD) + { + const struct hlsl_deref *src = &load_from_node(var_node)->src; + + var = src->var; + if (src->offset.node) + { + if (!(add = new_binary_expr(HLSL_IR_BINOP_ADD, src->offset.node, offset))) + return NULL; + list_add_tail(instrs, &add->entry); + offset = add; + } + } + else + { + struct hlsl_ir_assignment *assign; + char name[27]; + + sprintf(name, "<deref-%p>", var_node); + if (!(var = new_synthetic_var(name, var_node->data_type, var_node->loc))) + return NULL; + + TRACE("Synthesized variable %p for %s node.\n", var, debug_node_type(var_node->type)); + + if (!(assign = new_simple_assignment(var, var_node))) + return NULL; + + list_add_tail(instrs, &assign->node.entry); + } + + if (!(load = vkd3d_malloc(sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, data_type, loc); + load->src.var = var; + hlsl_src_from_node(&load->src.offset, offset); + list_add_tail(instrs, &load->node.entry); + return load; +} + +static struct hlsl_ir_load *add_record_load(struct list *instrs, struct hlsl_ir_node *record, + const struct hlsl_struct_field *field, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = new_uint_constant(field->reg_offset * 4, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + + return add_load(instrs, record, &c->node, field->type, loc); +} + +static struct hlsl_ir_load *add_array_load(struct list *instrs, struct hlsl_ir_node *array, + struct hlsl_ir_node *index, const struct source_location loc) +{ + const struct hlsl_type *expr_type = array->data_type; + struct hlsl_type *data_type; + struct hlsl_ir_constant *c; + struct hlsl_ir_node *mul; + + TRACE("Array load from type %s.\n", debug_hlsl_type(expr_type)); + + if (expr_type->type == HLSL_CLASS_ARRAY) + { + data_type = expr_type->e.array.type; + } + else if (expr_type->type == HLSL_CLASS_MATRIX || expr_type->type == HLSL_CLASS_VECTOR) + { + /* This needs to be lowered now, while we still have type information. */ + FIXME("Index of matrix or vector type.\n"); + return NULL; + } + else + { + if (expr_type->type == HLSL_CLASS_SCALAR) + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "array-indexed expression is scalar"); + else + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "expression is not array-indexable"); + return NULL; + } + + if (!(c = new_uint_constant(data_type->reg_size * 4, loc))) + return NULL; + list_add_tail(instrs, &c->node.entry); + if (!(mul = new_binary_expr(HLSL_IR_BINOP_MUL, index, &c->node))) + return NULL; + list_add_tail(instrs, &mul->entry); + index = mul; + + return add_load(instrs, array, index, data_type, loc); +} + +static BOOL add_struct_field(struct list *fields, struct hlsl_struct_field *field) +{ + struct hlsl_struct_field *f; + + LIST_FOR_EACH_ENTRY(f, fields, struct hlsl_struct_field, entry) + { + if (!strcmp(f->name, field->name)) + return FALSE; + } + list_add_tail(fields, &field->entry); + return TRUE; +} + +BOOL is_row_major(const struct hlsl_type *type) +{ + /* Default to column-major if the majority isn't explicitly set, which can + * happen for anonymous nodes. */ + return !!(type->modifiers & HLSL_MODIFIER_ROW_MAJOR); +} + +static struct hlsl_type *apply_type_modifiers(struct hlsl_type *type, + unsigned int *modifiers, struct source_location loc) +{ + unsigned int default_majority = 0; + struct hlsl_type *new_type; + + /* This function is only used for declarations (i.e. variables and struct + * fields), which should inherit the matrix majority. We only explicitly set + * the default majority for declarations—typedefs depend on this—but we + * want to always set it, so that an hlsl_type object is never used to + * represent two different majorities (and thus can be used to store its + * register size, etc.) */ + if (!(*modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) + && type->type == HLSL_CLASS_MATRIX) + { + if (hlsl_ctx.matrix_majority == HLSL_COLUMN_MAJOR) + default_majority = HLSL_MODIFIER_COLUMN_MAJOR; + else + default_majority = HLSL_MODIFIER_ROW_MAJOR; + } + + if (!default_majority && !(*modifiers & HLSL_TYPE_MODIFIERS_MASK)) + return type; + + if (!(new_type = clone_hlsl_type(type, default_majority))) + return NULL; + + new_type->modifiers = add_modifiers(new_type->modifiers, *modifiers, loc); + *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; + + if (new_type->type == HLSL_CLASS_MATRIX) + new_type->reg_size = is_row_major(new_type) ? new_type->dimy : new_type->dimx; + return new_type; +} + +static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, struct list *fields) +{ + struct parse_variable_def *v, *v_next; + struct hlsl_struct_field *field; + struct list *list; + + if (type->type == HLSL_CLASS_MATRIX) + assert(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(list = vkd3d_malloc(sizeof(*list)))) + return NULL; + list_init(list); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, fields, struct parse_variable_def, entry) + { + debug_dump_decl(type, 0, v->name, v->loc.line); + if (!(field = vkd3d_calloc(1, sizeof(*field)))) + { + vkd3d_free(v); + return list; + } + if (v->array_size) + field->type = new_array_type(type, v->array_size); + else + field->type = type; + field->name = v->name; + field->modifiers = modifiers; + field->semantic = v->semantic; + if (v->initializer.args_count) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "struct field with an initializer.\n"); + free_parse_initializer(&v->initializer); + } + list_add_tail(list, &field->entry); + vkd3d_free(v); + } + vkd3d_free(fields); + return list; +} + +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + +static struct hlsl_type *new_struct_type(const char *name, struct list *fields) +{ + struct hlsl_struct_field *field; + unsigned int reg_size = 0; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; + type->name = name; + type->dimx = 0; + type->dimy = 1; + type->e.elements = fields; + + LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) + { + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); + } + type->reg_size = reg_size; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) +{ + struct parse_variable_def *v, *v_next; + struct hlsl_type *type; + BOOL ret; + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(orig_type, v->array_size); + else + type = clone_hlsl_type(orig_type, 0); + if (!type) + return FALSE; + vkd3d_free((void *)type->name); + type->name = v->name; + type->modifiers |= modifiers; + + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(type->modifiers, v->loc); + else + type->reg_size = is_row_major(type) ? type->dimy : type->dimx; + + if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); + if (!ret) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "redefinition of custom type '%s'", v->name); + vkd3d_free(v); + } + vkd3d_free(list); + return TRUE; +} + +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location loc) +{ + struct hlsl_ir_var *var; + + if (param->type->type == HLSL_CLASS_MATRIX) + assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(var = new_var(param->name, param->type, loc, param->semantic, param->modifiers, param->reg_reservation))) + return FALSE; + + if (!add_declaration(hlsl_ctx.cur_scope, var, FALSE)) + { + free_declaration(var); + return FALSE; + } + list_add_tail(list, &var->param_entry); + return TRUE; +} + +static struct reg_reservation *parse_reg_reservation(const char *reg_string) +{ + enum vkd3d_shader_register_type type; + struct reg_reservation *reg_res; + DWORD regnum = 0; + + switch (reg_string[0]) + { + case 'c': + type = VKD3DSPR_CONST; + break; + case 'i': + type = VKD3DSPR_CONSTINT; + break; + case 'b': + type = VKD3DSPR_CONSTBOOL; + break; + case 's': + type = VKD3DSPR_SAMPLER; + break; + default: + FIXME("Unsupported register type.\n"); + return NULL; + } + + if (!sscanf(reg_string + 1, "%u", &regnum)) + { + FIXME("Unsupported register reservation syntax.\n"); + return NULL; + } + + if (!(reg_res = vkd3d_malloc(sizeof(*reg_res)))) + return NULL; + reg_res->type = type; + reg_res->regnum = regnum; + return reg_res; +} + +static const struct hlsl_ir_function_decl *get_overloaded_func(struct rb_tree *funcs, char *name, + struct list *params, BOOL exact_signature) +{ + struct hlsl_ir_function *func; + struct rb_entry *entry; + + entry = rb_get(funcs, name); + if (entry) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + + entry = rb_get(&func->overloads, params); + if (!entry) + { + if (!exact_signature) + FIXME("No exact match, search for a compatible overloaded function (if any).\n"); + return NULL; + } + return RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + } + return NULL; +} + +static struct hlsl_ir_function_decl *get_func_entry(const char *name) +{ + struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if ((entry = rb_get(&hlsl_ctx.functions, name))) + { + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + RB_FOR_EACH_ENTRY(decl, &func->overloads, struct hlsl_ir_function_decl, entry) + return decl; + } + + return NULL; +} + +static struct list *make_list(struct hlsl_ir_node *node) +{ + struct list *list; + + if (!(list = vkd3d_malloc(sizeof(*list)))) + { + free_instr(node); + return NULL; + } + list_init(list); + list_add_tail(list, &node->entry); + return list; +} + +static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) +{ + if (node->data_type->type != HLSL_CLASS_SCALAR) + return 0; + + switch (node->type) + { + case HLSL_IR_CONSTANT: + { + struct hlsl_ir_constant *constant = constant_from_node(node); + + switch (constant->node.data_type->base_type) + { + case HLSL_TYPE_UINT: + return constant->value.u[0]; + case HLSL_TYPE_INT: + return constant->value.i[0]; + case HLSL_TYPE_FLOAT: + return constant->value.f[0]; + case HLSL_TYPE_DOUBLE: + return constant->value.d[0]; + case HLSL_TYPE_BOOL: + return constant->value.b[0]; + default: + WARN("Invalid type %s.\n", debug_base_type(constant->node.data_type)); + return 0; + } + } + + case HLSL_IR_EXPR: + case HLSL_IR_LOAD: + case HLSL_IR_SWIZZLE: + FIXME("Unhandled type %s.\n", debug_node_type(node->type)); + return 0; + + case HLSL_IR_ASSIGNMENT: + default: + WARN("Invalid node type %s.\n", debug_node_type(node->type)); + return 0; + } +} + +static struct list *append_unop(struct list *list, struct hlsl_ir_node *node) +{ + list_add_tail(list, &node->entry); + return list; +} + +static struct list *add_binary_expr(struct list *list1, struct list *list2, + enum hlsl_ir_expr_op op, struct source_location loc) +{ + struct hlsl_ir_node *args[3] = {node_from_list(list1), node_from_list(list2)}; + + list_move_tail(list1, list2); + vkd3d_free(list2); + add_expr(list1, op, args, &loc); + return list1; +} + +static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var, + struct parse_initializer *initializer) +{ + struct hlsl_type *type = var->data_type; + struct hlsl_struct_field *field; + unsigned int i = 0; + + if (initializer_size(initializer) != components_count_type(type)) + { + hlsl_report_message(var->loc, HLSL_LEVEL_ERROR, "structure initializer mismatch"); + free_parse_initializer(initializer); + return; + } + + list_move_tail(list, initializer->instrs); + vkd3d_free(initializer->instrs); + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + struct hlsl_ir_node *node = initializer->args[i]; + struct hlsl_ir_assignment *assign; + struct hlsl_ir_constant *c; + + if (i++ >= initializer->args_count) + break; + + if (components_count_type(field->type) == components_count_type(node->data_type)) + { + if (!(c = new_uint_constant(field->reg_offset * 4, node->loc))) + break; + list_add_tail(list, &c->node.entry); + + if (!(assign = new_assignment(var, &c->node, node, 0, node->loc))) + break; + list_add_tail(list, &assign->node.entry); + } + else + FIXME("Initializing with \"mismatched\" fields is not supported yet.\n"); + } + + vkd3d_free(initializer->args); +} + +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic); + vkd3d_free(v->reg_reservation); + vkd3d_free(v); +} + +static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) +{ + struct parse_variable_def *v, *v_next; + struct list *statements_list; + struct hlsl_ir_var *var; + struct hlsl_type *type; + BOOL ret, local = TRUE; + + if (basic_type->type == HLSL_CLASS_MATRIX) + assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); + + if (!(statements_list = vkd3d_malloc(sizeof(*statements_list)))) + { + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) + free_parse_variable_def(v); + vkd3d_free(var_list); + return NULL; + } + list_init(statements_list); + + if (!var_list) + return statements_list; + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(basic_type, v->array_size); + else + type = basic_type; + + if (!(var = new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) + { + free_parse_variable_def(v); + continue; + } + debug_dump_decl(type, modifiers, v->name, v->loc.line); + + if (hlsl_ctx.cur_scope == hlsl_ctx.globals) + { + var->modifiers |= HLSL_STORAGE_UNIFORM; + local = FALSE; + } + + if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "const variable without initializer"); + free_declaration(var); + vkd3d_free(v); + continue; + } + + ret = declare_variable(var, local); + if (!ret) + { + free_declaration(var); + vkd3d_free(v); + continue; + } + TRACE("Declared variable %s.\n", var->name); + + if (v->initializer.args_count) + { + unsigned int size = initializer_size(&v->initializer); + struct hlsl_ir_load *load; + + TRACE("Variable with initializer.\n"); + if (type->type <= HLSL_CLASS_LAST_NUMERIC + && type->dimx * type->dimy != size && size != 1) + { + if (size < type->dimx * type->dimy) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && components_count_type(type) != size) + { + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + if (type->type > HLSL_CLASS_LAST_NUMERIC) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + if (v->array_size > 0) + { + FIXME("Initializing arrays is not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + if (v->initializer.args_count > 1) + { + FIXME("Complex initializers are not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + load = new_var_load(var, var->loc); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + vkd3d_free(v->initializer.args); + + if (modifiers & HLSL_STORAGE_STATIC) + list_move_tail(&hlsl_ctx.static_initializers, v->initializer.instrs); + else + list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.instrs); + } + vkd3d_free(v); + } + vkd3d_free(var_list); + return statements_list; +} + +static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) +{ + struct hlsl_ir_function_decl *decl; + + if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) + return NULL; + decl->return_type = return_type; + decl->parameters = parameters; + decl->semantic = semantic; + decl->loc = loc; + + if (!type_is_void(return_type)) + { + struct hlsl_ir_var *return_var; + char name[28]; + + sprintf(name, "<retval-%p>", decl); + if (!(return_var = new_synthetic_var(name, return_type, loc))) + { + vkd3d_free(decl); + return NULL; + } + decl->return_var = return_var; + } + + return decl; +} + +%} + +%locations +%define parse.error verbose +%define api.prefix {hlsl_} +%expect 1 + +%union +{ + struct hlsl_type *type; + INT intval; + FLOAT floatval; + BOOL boolval; + char *name; + DWORD modifiers; + struct hlsl_ir_node *instr; + struct list *list; + struct parse_function function; + struct parse_parameter parameter; + struct parse_initializer initializer; + struct parse_variable_def *variable_def; + struct parse_if_body if_body; + enum parse_unary_op unary_op; + enum parse_assign_op assign_op; + struct reg_reservation *reg_reservation; + struct parse_colon_attribute colon_attribute; +} + +%token KW_BLENDSTATE +%token KW_BREAK +%token KW_BUFFER +%token KW_CBUFFER +%token KW_COLUMN_MAJOR +%token KW_COMPILE +%token KW_CONST +%token KW_CONTINUE +%token KW_DEPTHSTENCILSTATE +%token KW_DEPTHSTENCILVIEW +%token KW_DISCARD +%token KW_DO +%token KW_DOUBLE +%token KW_ELSE +%token KW_EXTERN +%token KW_FALSE +%token KW_FOR +%token KW_GEOMETRYSHADER +%token KW_GROUPSHARED +%token KW_IF +%token KW_IN +%token KW_INLINE +%token KW_INOUT +%token KW_MATRIX +%token KW_NAMESPACE +%token KW_NOINTERPOLATION +%token KW_OUT +%token KW_PASS +%token KW_PIXELSHADER +%token KW_PRECISE +%token KW_RASTERIZERSTATE +%token KW_RENDERTARGETVIEW +%token KW_RETURN +%token KW_REGISTER +%token KW_ROW_MAJOR +%token KW_SAMPLER +%token KW_SAMPLER1D +%token KW_SAMPLER2D +%token KW_SAMPLER3D +%token KW_SAMPLERCUBE +%token KW_SAMPLER_STATE +%token KW_SAMPLERCOMPARISONSTATE +%token KW_SHARED +%token KW_STATEBLOCK +%token KW_STATEBLOCK_STATE +%token KW_STATIC +%token KW_STRING +%token KW_STRUCT +%token KW_SWITCH +%token KW_TBUFFER +%token KW_TECHNIQUE +%token KW_TECHNIQUE10 +%token KW_TEXTURE +%token KW_TEXTURE1D +%token KW_TEXTURE1DARRAY +%token KW_TEXTURE2D +%token KW_TEXTURE2DARRAY +%token KW_TEXTURE2DMS +%token KW_TEXTURE2DMSARRAY +%token KW_TEXTURE3D +%token KW_TEXTURE3DARRAY +%token KW_TEXTURECUBE +%token KW_TRUE +%token KW_TYPEDEF +%token KW_UNIFORM +%token KW_VECTOR +%token KW_VERTEXSHADER +%token KW_VOID +%token KW_VOLATILE +%token KW_WHILE + +%token OP_INC +%token OP_DEC +%token OP_AND +%token OP_OR +%token OP_EQ +%token OP_LEFTSHIFT +%token OP_LEFTSHIFTASSIGN +%token OP_RIGHTSHIFT +%token OP_RIGHTSHIFTASSIGN +%token OP_ELLIPSIS +%token OP_LE +%token OP_GE +%token OP_NE +%token OP_ADDASSIGN +%token OP_SUBASSIGN +%token OP_MULASSIGN +%token OP_DIVASSIGN +%token OP_MODASSIGN +%token OP_ANDASSIGN +%token OP_ORASSIGN +%token OP_XORASSIGN +%token OP_UNKNOWN1 +%token OP_UNKNOWN2 +%token OP_UNKNOWN3 +%token OP_UNKNOWN4 + +%token <floatval> C_FLOAT + +%token <intval> C_INTEGER +%token <intval> PRE_LINE + +%type <list> add_expr +%type <list> assignment_expr +%type <list> bitand_expr +%type <list> bitor_expr +%type <list> bitxor_expr +%type <list> compound_statement +%type <list> conditional_expr +%type <list> declaration +%type <list> declaration_statement +%type <list> equality_expr +%type <list> expr +%type <list> expr_statement +%type <list> field +%type <list> fields_list +%type <list> initializer_expr +%type <list> jump_statement +%type <list> logicand_expr +%type <list> logicor_expr +%type <list> loop_statement +%type <list> mul_expr +%type <list> param_list +%type <list> parameters +%type <list> postfix_expr +%type <list> primary_expr +%type <list> relational_expr +%type <list> selection_statement +%type <list> shift_expr +%type <list> statement +%type <list> statement_list +%type <list> struct_declaration +%type <list> type_specs +%type <list> unary_expr +%type <list> variables_def +%type <list> variables_def_optional + +%token <name> VAR_IDENTIFIER +%token <name> NEW_IDENTIFIER +%token <name> STRING +%token <name> TYPE_IDENTIFIER + +%type <assign_op> assign_op + +%type <boolval> boolean + +%type <colon_attribute> colon_attribute + +%type <function> func_declaration +%type <function> func_prototype + +%type <initializer> complex_initializer +%type <initializer> initializer_expr_list + +%type <if_body> if_body + +%type <intval> array + +%type <modifiers> input_mod +%type <modifiers> input_mods +%type <modifiers> var_modifiers + +%type <name> any_identifier +%type <name> semantic +%type <name> var_identifier + +%type <parameter> parameter + +%type <reg_reservation> register_opt + +%type <type> base_type +%type <type> field_type +%type <type> named_struct_spec +%type <type> unnamed_struct_spec +%type <type> struct_spec +%type <type> type +%type <type> typedef_type + +%type <unary_op> unary_op + +%type <variable_def> type_spec +%type <variable_def> variable_def + +%% + +hlsl_prog: + /* empty */ + | hlsl_prog func_declaration + { + const struct hlsl_ir_function_decl *decl; + + decl = get_overloaded_func(&hlsl_ctx.functions, $2.name, $2.decl->parameters, TRUE); + if (decl && !decl->func->intrinsic) + { + if (decl->body && $2.decl->body) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "redefinition of function %s", debugstr_a($2.name)); + YYABORT; + } + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "redefining function %s with a different return type", + debugstr_a($2.name)); + hlsl_report_message(decl->loc, HLSL_LEVEL_NOTE, + "%s previously declared here", + debugstr_a($2.name)); + YYABORT; + } + } + + if (type_is_void($2.decl->return_type) && $2.decl->semantic) + { + hlsl_report_message($2.decl->loc, HLSL_LEVEL_ERROR, + "void function with a semantic"); + } + + TRACE("Adding function '%s' to the function list.\n", $2.name); + add_function_decl(&hlsl_ctx.functions, $2.name, $2.decl, FALSE); + } + | hlsl_prog declaration_statement + { + TRACE("Declaration statement parsed.\n"); + + if (!list_empty($2)) + FIXME("Uniform initializer.\n"); + free_instr_list($2); + } + | hlsl_prog preproc_directive + | hlsl_prog ';' + { + TRACE("Skipping stray semicolon.\n"); + } + +preproc_directive: + PRE_LINE STRING + { + const char **new_array = NULL; + + TRACE("Updating line information to file %s, line %u.\n", debugstr_a($2), $1); + hlsl_ctx.line_no = $1; + if (strcmp($2, hlsl_ctx.source_file)) + new_array = vkd3d_realloc(hlsl_ctx.source_files, + sizeof(*hlsl_ctx.source_files) * (hlsl_ctx.source_files_count + 1)); + + if (new_array) + { + hlsl_ctx.source_files = new_array; + hlsl_ctx.source_files[hlsl_ctx.source_files_count++] = $2; + hlsl_ctx.source_file = $2; + } + else + { + vkd3d_free($2); + } + } + +struct_declaration: + var_modifiers struct_spec variables_def_optional ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!$3) + { + if (!$2->name) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "anonymous struct declaration with no variables"); + } + if (modifiers) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "modifier not allowed on struct type declaration"); + } + } + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); + } + +struct_spec: + named_struct_spec + | unnamed_struct_spec + +named_struct_spec: + KW_STRUCT any_identifier '{' fields_list '}' + { + BOOL ret; + + TRACE("Structure %s declaration.\n", debugstr_a($2)); + $$ = new_struct_type($2, $4); + + if (get_variable(hlsl_ctx.cur_scope, $2)) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "redefinition of '%s'", $2); + YYABORT; + } + + ret = add_type_to_scope(hlsl_ctx.cur_scope, $$); + if (!ret) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "redefinition of struct '%s'", $2); + YYABORT; + } + } + +unnamed_struct_spec: + KW_STRUCT '{' fields_list '}' + { + TRACE("Anonymous structure declaration.\n"); + $$ = new_struct_type(NULL, $3); + } + +any_identifier: + VAR_IDENTIFIER + | TYPE_IDENTIFIER + | NEW_IDENTIFIER + +fields_list: + /* empty */ + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | fields_list field + { + BOOL ret; + struct hlsl_struct_field *field, *next; + + $$ = $1; + LIST_FOR_EACH_ENTRY_SAFE(field, next, $2, struct hlsl_struct_field, entry) + { + ret = add_struct_field($$, field); + if (ret == FALSE) + { + hlsl_report_message(get_location(&@2), + HLSL_LEVEL_ERROR, "redefinition of '%s'", field->name); + vkd3d_free(field); + } + } + vkd3d_free($2); + } + +field_type: + type + | unnamed_struct_spec + +field: + var_modifiers field_type variables_def ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = gen_struct_fields(type, modifiers, $3); + } + +func_declaration: + func_prototype compound_statement + { + TRACE("Function %s parsed.\n", $1.name); + $$ = $1; + $$.decl->body = $2; + pop_scope(&hlsl_ctx); + } + | func_prototype ';' + { + TRACE("Function prototype for %s.\n", $1.name); + $$ = $1; + pop_scope(&hlsl_ctx); + } + +func_prototype: + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + var_modifiers type var_identifier '(' parameters ')' colon_attribute + { + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifiers on a function"); + YYABORT; + } + if (get_variable(hlsl_ctx.globals, $3)) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); + YYABORT; + } + if (type_is_void($2) && $7.semantic) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, "void function with a semantic"); + } + + if ($7.reg_reservation) + { + FIXME("Unexpected register reservation for a function.\n"); + vkd3d_free($7.reg_reservation); + } + if (!($$.decl = new_func_decl($2, $5, $7.semantic, get_location(&@3)))) + YYABORT; + $$.name = $3; + hlsl_ctx.cur_function = $$.decl; + } + +compound_statement: + '{' '}' + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | '{' scope_start statement_list '}' + { + pop_scope(&hlsl_ctx); + $$ = $3; + } + +scope_start: + /* empty */ + { + push_scope(&hlsl_ctx); + } + +var_identifier: + VAR_IDENTIFIER + | NEW_IDENTIFIER + +colon_attribute: + /* empty */ + { + $$.semantic = NULL; + $$.reg_reservation = NULL; + } + | semantic + { + $$.semantic = $1; + $$.reg_reservation = NULL; + } + | register_opt + { + $$.semantic = NULL; + $$.reg_reservation = $1; + } + +semantic: + ':' any_identifier + { + $$ = $2; + } + +/* FIXME: Writemasks */ +register_opt: + ':' KW_REGISTER '(' any_identifier ')' + { + $$ = parse_reg_reservation($4); + vkd3d_free($4); + } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' + { + FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4)); + vkd3d_free($4); + + $$ = parse_reg_reservation($6); + vkd3d_free($6); + } + +parameters: + scope_start + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | scope_start param_list + { + $$ = $2; + } + +param_list: + parameter + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + if (!add_func_parameter($$, &$1, get_location(&@1))) + { + ERR("Error adding function parameter %s.\n", $1.name); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + YYABORT; + } + } + | param_list ',' parameter + { + $$ = $1; + if (!add_func_parameter($$, &$3, get_location(&@3))) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "duplicate parameter %s", $3.name); + YYABORT; + } + } + +parameter: + input_mods var_modifiers type any_identifier colon_attribute + { + struct hlsl_type *type; + DWORD modifiers = $2; + + if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) + YYABORT; + + $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; + $$.modifiers |= modifiers; + $$.type = type; + $$.name = $4; + $$.semantic = $5.semantic; + $$.reg_reservation = $5.reg_reservation; + } + +input_mods: + /* empty */ + { + $$ = 0; + } + | input_mods input_mod + { + if ($1 & $2) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "duplicate input-output modifiers"); + YYABORT; + } + $$ = $1 | $2; + } + +input_mod: + KW_IN + { + $$ = HLSL_STORAGE_IN; + } + | KW_OUT + { + $$ = HLSL_STORAGE_OUT; + } + | KW_INOUT + { + $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; + } + +type: + base_type + { + $$ = $1; + } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "vectors of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "vector size must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "matrices of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "matrix row count must be between 1 and 4\n"); + YYABORT; + } + if ($7 < 1 || $7 > 4) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, + "matrix column count must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + } + +base_type: + KW_VOID + { + $$ = hlsl_ctx.builtin_types.Void; + } + | KW_SAMPLER + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC]; + } + | KW_SAMPLER1D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_1D]; + } + | KW_SAMPLER2D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_2D]; + } + | KW_SAMPLER3D + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; + } + | KW_SAMPLERCUBE + { + $$ = hlsl_ctx.builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; + } + | TYPE_IDENTIFIER + { + $$ = get_type(hlsl_ctx.cur_scope, $1, TRUE); + vkd3d_free($1); + } + | KW_STRUCT TYPE_IDENTIFIER + { + $$ = get_type(hlsl_ctx.cur_scope, $2, TRUE); + if ($$->type != HLSL_CLASS_STRUCT) + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "'%s' redefined as a structure\n", $2); + vkd3d_free($2); + } + +declaration_statement: + declaration + | struct_declaration + | typedef + { + if (!($$ = vkd3d_malloc(sizeof(*$$)))) + YYABORT; + list_init($$); + } + +typedef_type: + type + | struct_spec + +typedef: + KW_TYPEDEF var_modifiers typedef_type type_specs ';' + { + if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) + { + struct parse_variable_def *v, *v_next; + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) + vkd3d_free(v); + vkd3d_free($4); + YYABORT; + } + if (!add_typedef($2, $3, $4)) + YYABORT; + } + +type_specs: + type_spec + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | type_specs ',' type_spec + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +type_spec: + any_identifier array + { + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + } + +declaration: + var_modifiers type variables_def ';' + { + struct hlsl_type *type; + DWORD modifiers = $1; + + if (!(type = apply_type_modifiers($2, &modifiers, get_location(&@1)))) + YYABORT; + $$ = declare_vars(type, modifiers, $3); + } + +variables_def_optional: + /* empty */ + { + $$ = NULL; + } + | variables_def + +variables_def: + variable_def + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | variables_def ',' variable_def + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +variable_def: + any_identifier array colon_attribute + { + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + $$->semantic = $3.semantic; + $$->reg_reservation = $3.reg_reservation; + } + | any_identifier array colon_attribute '=' complex_initializer + { + TRACE("Declaration with initializer.\n"); + $$ = vkd3d_calloc(1, sizeof(*$$)); + $$->loc = get_location(&@1); + $$->name = $1; + $$->array_size = $2; + $$->semantic = $3.semantic; + $$->reg_reservation = $3.reg_reservation; + $$->initializer = $5; + } + +array: + /* empty */ + { + $$ = 0; + } + | '[' expr ']' + { + unsigned int size = evaluate_array_dimension(node_from_list($2)); + + free_instr_list($2); + + if (!size) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size is not a positive integer constant\n"); + YYABORT; + } + TRACE("Array size %u.\n", size); + + if (size > 65536) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size must be between 1 and 65536"); + YYABORT; + } + $$ = size; + } + +var_modifiers: + /* empty */ + { + $$ = 0; + } + | KW_EXTERN var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_EXTERN, get_location(&@1)); + } + | KW_NOINTERPOLATION var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_NOINTERPOLATION, get_location(&@1)); + } + | KW_PRECISE var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_PRECISE, get_location(&@1)); + } + | KW_SHARED var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_SHARED, get_location(&@1)); + } + | KW_GROUPSHARED var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_GROUPSHARED, get_location(&@1)); + } + | KW_STATIC var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_STATIC, get_location(&@1)); + } + | KW_UNIFORM var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_UNIFORM, get_location(&@1)); + } + | KW_VOLATILE var_modifiers + { + $$ = add_modifiers($2, HLSL_STORAGE_VOLATILE, get_location(&@1)); + } + | KW_CONST var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_CONST, get_location(&@1)); + } + | KW_ROW_MAJOR var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_ROW_MAJOR, get_location(&@1)); + } + | KW_COLUMN_MAJOR var_modifiers + { + $$ = add_modifiers($2, HLSL_MODIFIER_COLUMN_MAJOR, get_location(&@1)); + } + +complex_initializer: + initializer_expr + { + $$.args_count = 1; + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = node_from_list($1); + $$.instrs = $1; + } + | '{' initializer_expr_list '}' + { + $$ = $2; + } + | '{' initializer_expr_list ',' '}' + { + $$ = $2; + } + +initializer_expr: + assignment_expr + +initializer_expr_list: + initializer_expr + { + $$.args_count = 1; + if (!($$.args = vkd3d_malloc(sizeof(*$$.args)))) + YYABORT; + $$.args[0] = node_from_list($1); + $$.instrs = $1; + } + | initializer_expr_list ',' initializer_expr + { + $$ = $1; + if (!($$.args = vkd3d_realloc($$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + YYABORT; + $$.args[$$.args_count++] = node_from_list($3); + list_move_tail($$.instrs, $3); + vkd3d_free($3); + } + +boolean: + KW_TRUE + { + $$ = TRUE; + } + | KW_FALSE + { + $$ = FALSE; + } + +statement_list: + statement + | statement_list statement + { + $$ = $1; + list_move_tail($$, $2); + vkd3d_free($2); + } + +statement: + declaration_statement + | expr_statement + | compound_statement + | jump_statement + | selection_statement + | loop_statement + +jump_statement: + KW_RETURN expr ';' + { + if (!add_return($2, node_from_list($2), get_location(&@1))) + YYABORT; + $$ = $2; + } + | KW_RETURN ';' + { + if (!($$ = vkd3d_malloc(sizeof(*$$)))) + YYABORT; + list_init($$); + if (!add_return($$, NULL, get_location(&@1))) + YYABORT; + } + +selection_statement: + KW_IF '(' expr ')' if_body + { + struct hlsl_ir_node *condition = node_from_list($3); + struct hlsl_ir_if *instr; + + if (!(instr = new_if(condition, get_location(&@1)))) + YYABORT; + list_move_tail(&instr->then_instrs, $5.then_instrs); + list_move_tail(&instr->else_instrs, $5.else_instrs); + vkd3d_free($5.then_instrs); + vkd3d_free($5.else_instrs); + if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) + hlsl_report_message(instr->node.loc, HLSL_LEVEL_ERROR, + "if condition requires a scalar"); + $$ = $3; + list_add_tail($$, &instr->node.entry); + } + +if_body: + statement + { + $$.then_instrs = $1; + $$.else_instrs = NULL; + } + | statement KW_ELSE statement + { + $$.then_instrs = $1; + $$.else_instrs = $3; + } + +loop_statement: + KW_WHILE '(' expr ')' statement + { + $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, get_location(&@1)); + } + | KW_DO statement KW_WHILE '(' expr ')' ';' + { + $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, get_location(&@1)); + } + | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement + { + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); + pop_scope(&hlsl_ctx); + } + | KW_FOR '(' scope_start declaration expr_statement expr ')' statement + { + if (!$4) + hlsl_report_message(get_location(&@4), HLSL_LEVEL_WARNING, + "no expressions in for loop initializer"); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); + pop_scope(&hlsl_ctx); + } + +expr_statement: + ';' + { + $$ = vkd3d_malloc(sizeof(*$$)); + list_init($$); + } + | expr ';' + { + $$ = $1; + } + +primary_expr: + C_FLOAT + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_FLOAT], get_location(&@1)); + c->value.f[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | C_INTEGER + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_INT], get_location(&@1)); + c->value.i[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | boolean + { + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + YYABORT; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_BOOL], get_location(&@1)); + c->value.b[0] = $1; + if (!($$ = make_list(&c->node))) + YYABORT; + } + | VAR_IDENTIFIER + { + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + + if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "variable '%s' is not declared\n", $1); + YYABORT; + } + if ((load = new_var_load(var, get_location(&@1)))) + { + if (!($$ = make_list(&load->node))) + YYABORT; + } + else + $$ = NULL; + } + | '(' expr ')' + { + $$ = $2; + } + +postfix_expr: + primary_expr + | postfix_expr OP_INC + { + struct source_location loc; + struct hlsl_ir_node *inc; + + loc = get_location(&@2); + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + inc = new_unary_expr(HLSL_IR_UNOP_POSTINC, node_from_list($1), loc); + /* Post increment/decrement expressions are considered const */ + inc->data_type = clone_hlsl_type(inc->data_type, 0); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); + } + | postfix_expr OP_DEC + { + struct source_location loc; + struct hlsl_ir_node *inc; + + loc = get_location(&@2); + if (node_from_list($1)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + inc = new_unary_expr(HLSL_IR_UNOP_POSTDEC, node_from_list($1), loc); + /* Post increment/decrement expressions are considered const */ + inc->data_type = clone_hlsl_type(inc->data_type, 0); + inc->data_type->modifiers |= HLSL_MODIFIER_CONST; + $$ = append_unop($1, inc); + } + | postfix_expr '.' any_identifier + { + struct hlsl_ir_node *node = node_from_list($1); + struct source_location loc; + + loc = get_location(&@2); + if (node->data_type->type == HLSL_CLASS_STRUCT) + { + struct hlsl_type *type = node->data_type; + struct hlsl_struct_field *field; + + $$ = NULL; + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + if (!strcmp($3, field->name)) + { + if (!add_record_load($1, node, field, loc)) + YYABORT; + $$ = $1; + break; + } + } + if (!$$) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid subscript %s", debugstr_a($3)); + YYABORT; + } + } + else if (node->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct hlsl_ir_swizzle *swizzle; + + swizzle = get_swizzle(node, $3, &loc); + if (!swizzle) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid swizzle %s", debugstr_a($3)); + YYABORT; + } + $$ = append_unop($1, &swizzle->node); + } + else + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "invalid subscript %s", debugstr_a($3)); + YYABORT; + } + } + | postfix_expr '[' expr ']' + { + struct hlsl_ir_node *array = node_from_list($1), *index = node_from_list($3); + + list_move_tail($1, $3); + vkd3d_free($3); + + if (index->data_type->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "array index is not scalar"); + free_instr_list($1); + YYABORT; + } + + if (!add_array_load($1, array, index, get_location(&@2))) + { + free_instr_list($1); + YYABORT; + } + $$ = $1; + } + + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_assignment *assignment; + unsigned int i, writemask_offset = 0; + static unsigned int counter; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + char name[23]; + + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifier on a constructor\n"); + YYABORT; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "constructors may only be used with numeric data types\n"); + YYABORT; + } + if ($2->dimx * $2->dimy != initializer_size(&$4)) + { + hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, + "expected %u components in constructor, but got %u\n", + $2->dimx * $2->dimy, initializer_size(&$4)); + YYABORT; + } + + if ($2->type == HLSL_CLASS_MATRIX) + FIXME("Matrix constructors are not supported yet.\n"); + + sprintf(name, "<constructor-%x>", counter++); + if (!(var = new_synthetic_var(name, $2, get_location(&@2)))) + YYABORT; + for (i = 0; i < $4.args_count; ++i) + { + struct hlsl_ir_node *arg = $4.args[i]; + unsigned int width; + + if (arg->data_type->type == HLSL_CLASS_OBJECT) + { + hlsl_report_message(arg->loc, HLSL_LEVEL_ERROR, "invalid constructor argument"); + continue; + } + width = components_count_type(arg->data_type); + + if (width > 4) + { + FIXME("Constructor argument with %u components.\n", width); + continue; + } + + if (!(arg = add_implicit_conversion($4.instrs, arg, + hlsl_ctx.builtin_types.vector[$2->base_type][width - 1], &arg->loc))) + continue; + + if (!(assignment = new_assignment(var, NULL, arg, + ((1 << width) - 1) << writemask_offset, arg->loc))) + YYABORT; + writemask_offset += width; + list_add_tail($4.instrs, &assignment->node.entry); + } + vkd3d_free($4.args); + if (!(load = new_var_load(var, get_location(&@2)))) + YYABORT; + $$ = append_unop($4.instrs, &load->node); + } + +unary_expr: + postfix_expr + | OP_INC unary_expr + { + struct source_location loc; + + loc = get_location(&@1); + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREINC, node_from_list($2), loc)); + } + | OP_DEC unary_expr + { + struct source_location loc; + + loc = get_location(&@1); + if (node_from_list($2)->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "modifying a const expression"); + YYABORT; + } + $$ = append_unop($2, new_unary_expr(HLSL_IR_UNOP_PREDEC, node_from_list($2), loc)); + } + | unary_op unary_expr + { + enum hlsl_ir_expr_op ops[] = {0, HLSL_IR_UNOP_NEG, + HLSL_IR_UNOP_LOGIC_NOT, HLSL_IR_UNOP_BIT_NOT}; + + if ($1 == UNARY_OP_PLUS) + $$ = $2; + else + $$ = append_unop($2, new_unary_expr(ops[$1], node_from_list($2), get_location(&@1))); + } + + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ + | '(' var_modifiers type array ')' unary_expr + { + struct hlsl_type *src_type = node_from_list($6)->data_type; + struct hlsl_type *dst_type; + struct source_location loc; + + loc = get_location(&@3); + if ($2) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "unexpected modifier in a cast"); + YYABORT; + } + + if ($4) + dst_type = new_array_type($3, $4); + else + dst_type = $3; + + if (!compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "can't cast from %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + YYABORT; + } + + $$ = append_unop($6, &new_cast(node_from_list($6), dst_type, &loc)->node); + } + +unary_op: + '+' + { + $$ = UNARY_OP_PLUS; + } + | '-' + { + $$ = UNARY_OP_MINUS; + } + | '!' + { + $$ = UNARY_OP_LOGICNOT; + } + | '~' + { + $$ = UNARY_OP_BITNOT; + } + +mul_expr: + unary_expr + | mul_expr '*' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MUL, get_location(&@2)); + } + | mul_expr '/' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_DIV, get_location(&@2)); + } + | mul_expr '%' unary_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_MOD, get_location(&@2)); + } + +add_expr: + mul_expr + | add_expr '+' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_ADD, get_location(&@2)); + } + | add_expr '-' mul_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_SUB, get_location(&@2)); + } + +shift_expr: + add_expr + | shift_expr OP_LEFTSHIFT add_expr + { + FIXME("Left shift.\n"); + } + | shift_expr OP_RIGHTSHIFT add_expr + { + FIXME("Right shift.\n"); + } + +relational_expr: + shift_expr + | relational_expr '<' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LESS, get_location(&@2)); + } + | relational_expr '>' shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GREATER, get_location(&@2)); + } + | relational_expr OP_LE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_LEQUAL, get_location(&@2)); + } + | relational_expr OP_GE shift_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_GEQUAL, get_location(&@2)); + } + +equality_expr: + relational_expr + | equality_expr OP_EQ relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_EQUAL, get_location(&@2)); + } + | equality_expr OP_NE relational_expr + { + $$ = add_binary_expr($1, $3, HLSL_IR_BINOP_NEQUAL, get_location(&@2)); + } + +bitand_expr: + equality_expr + | bitand_expr '&' equality_expr + { + FIXME("Bitwise AND.\n"); + } + +bitxor_expr: + bitand_expr + | bitxor_expr '^' bitand_expr + { + FIXME("Bitwise XOR.\n"); + } + +bitor_expr: + bitxor_expr + | bitor_expr '|' bitxor_expr + { + FIXME("Bitwise OR.\n"); + } + +logicand_expr: + bitor_expr + | logicand_expr OP_AND bitor_expr + { + FIXME("Logical AND.\n"); + } + +logicor_expr: + logicand_expr + | logicor_expr OP_OR logicand_expr + { + FIXME("Logical OR.\n"); + } + +conditional_expr: + logicor_expr + | logicor_expr '?' expr ':' assignment_expr + { + FIXME("Ternary operator.\n"); + } + +assignment_expr: + + conditional_expr + | unary_expr assign_op assignment_expr + { + struct hlsl_ir_node *lhs = node_from_list($1), *rhs = node_from_list($3); + + if (lhs->data_type->modifiers & HLSL_MODIFIER_CONST) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, "l-value is const"); + YYABORT; + } + list_move_tail($3, $1); + vkd3d_free($1); + if (!add_assignment($3, lhs, $2, rhs)) + YYABORT; + $$ = $3; + } + +assign_op: + '=' + { + $$ = ASSIGN_OP_ASSIGN; + } + | OP_ADDASSIGN + { + $$ = ASSIGN_OP_ADD; + } + | OP_SUBASSIGN + { + $$ = ASSIGN_OP_SUB; + } + | OP_MULASSIGN + { + $$ = ASSIGN_OP_MUL; + } + | OP_DIVASSIGN + { + $$ = ASSIGN_OP_DIV; + } + | OP_MODASSIGN + { + $$ = ASSIGN_OP_MOD; + } + | OP_LEFTSHIFTASSIGN + { + $$ = ASSIGN_OP_LSHIFT; + } + | OP_RIGHTSHIFTASSIGN + { + $$ = ASSIGN_OP_RSHIFT; + } + | OP_ANDASSIGN + { + $$ = ASSIGN_OP_AND; + } + | OP_ORASSIGN + { + $$ = ASSIGN_OP_OR; + } + | OP_XORASSIGN + { + $$ = ASSIGN_OP_XOR; + } + +expr: + assignment_expr + | expr ',' assignment_expr + { + $$ = $1; + list_move_tail($$, $3); + vkd3d_free($3); + } + +%% + +static struct source_location get_location(const struct YYLTYPE *l) +{ + const struct source_location loc = + { + .file = hlsl_ctx.source_file, + .line = l->first_line, + .col = l->first_column, + }; + return loc; +} + +static void dump_function_decl(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function_decl *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + + if (func->body) + debug_dump_ir_function_decl(func); +} + +static void dump_function(struct rb_entry *entry, void *context) +{ + struct hlsl_ir_function *func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + rb_for_each_entry(&func->overloads, dump_function_decl, NULL); +} + +/* Allocate a unique, ordered index to each instruction, which will be used for + * computing liveness ranges. */ +static unsigned int index_instructions(struct list *instrs, unsigned int index) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + instr->index = index++; + + if (instr->type == HLSL_IR_IF) + { + struct hlsl_ir_if *iff = if_from_node(instr); + index = index_instructions(&iff->then_instrs, index); + index = index_instructions(&iff->else_instrs, index); + } + else if (instr->type == HLSL_IR_LOOP) + { + index = index_instructions(&loop_from_node(instr)->body, index); + loop_from_node(instr)->next_index = index; + } + } + + return index; +} + +/* Compute the earliest and latest liveness for each variable. In the case that + * a variable is accessed inside of a loop, we promote its liveness to extend + * to at least the range of the entire loop. Note that we don't need to do this + * for anonymous nodes, since there's currently no way to use a node which was + * calculated in an earlier iteration of the loop. */ +static void compute_liveness_recurse(struct list *instrs, unsigned int loop_first, unsigned int loop_last) +{ + struct hlsl_ir_node *instr; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_ASSIGNMENT: + { + struct hlsl_ir_assignment *assignment = assignment_from_node(instr); + + var = assignment->lhs.var; + if (!var->first_write) + var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; + assignment->rhs.node->last_read = instr->index; + if (assignment->lhs.offset.node) + assignment->lhs.offset.node->last_read = instr->index; + break; + } + case HLSL_IR_EXPR: + { + struct hlsl_ir_expr *expr = expr_from_node(instr); + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) + expr->operands[i].node->last_read = instr->index; + break; + } + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = if_from_node(instr); + + compute_liveness_recurse(&iff->then_instrs, loop_first, loop_last); + compute_liveness_recurse(&iff->else_instrs, loop_first, loop_last); + iff->condition.node->last_read = instr->index; + break; + } + case HLSL_IR_LOAD: + { + struct hlsl_ir_load *load = load_from_node(instr); + + var = load->src.var; + var->last_read = loop_last ? max(instr->index, loop_last) : instr->index; + if (load->src.offset.node) + load->src.offset.node->last_read = instr->index; + break; + } + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = loop_from_node(instr); + + compute_liveness_recurse(&loop->body, loop_first ? loop_first : instr->index, + loop_last ? loop_last : loop->next_index); + break; + } + case HLSL_IR_SWIZZLE: + { + struct hlsl_ir_swizzle *swizzle = swizzle_from_node(instr); + + swizzle->val.node->last_read = instr->index; + break; + } + case HLSL_IR_CONSTANT: + case HLSL_IR_JUMP: + break; + } + } +} + +static void compute_liveness(struct hlsl_ir_function_decl *entry_func) +{ + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &hlsl_ctx.globals->vars, struct hlsl_ir_var, scope_entry) + { + var->first_write = 1; + } + + LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) + { + if (var->modifiers & HLSL_STORAGE_IN) + var->first_write = 1; + if (var->modifiers & HLSL_STORAGE_OUT) + var->last_read = UINT_MAX; + } + + if (entry_func->return_var) + entry_func->return_var->last_read = UINT_MAX; + + compute_liveness_recurse(entry_func->body, 0, 0); +} + +int hlsl_parser_compile(enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) +{ + struct hlsl_ir_function_decl *entry_func; + struct hlsl_scope *scope, *next_scope; + struct hlsl_type *hlsl_type, *next_type; + struct hlsl_ir_var *var, *next_var; + int ret = VKD3D_ERROR; + unsigned int i; + + hlsl_ctx.status = PARSE_SUCCESS; + hlsl_ctx.message_context = message_context; + hlsl_ctx.line_no = hlsl_ctx.column = 1; + hlsl_ctx.source_file = vkd3d_strdup(""); + hlsl_ctx.source_files = vkd3d_malloc(sizeof(*hlsl_ctx.source_files)); + if (hlsl_ctx.source_files) + hlsl_ctx.source_files[0] = hlsl_ctx.source_file; + hlsl_ctx.source_files_count = 1; + hlsl_ctx.cur_scope = NULL; + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + list_init(&hlsl_ctx.scopes); + list_init(&hlsl_ctx.types); + init_functions_tree(&hlsl_ctx.functions); + list_init(&hlsl_ctx.static_initializers); + + push_scope(&hlsl_ctx); + hlsl_ctx.globals = hlsl_ctx.cur_scope; + declare_predefined_types(hlsl_ctx.globals); + + hlsl_parse(); + + if (hlsl_ctx.status == PARSE_ERR) + goto out; + + if (!(entry_func = get_func_entry(entrypoint))) + { + hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint)); + goto out; + } + + if (!type_is_void(entry_func->return_type) + && entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic) + { + hlsl_report_message(entry_func->loc, HLSL_LEVEL_ERROR, + "entry point \"%s\" is missing a return value semantic", entry_func->func->name); + } + + list_move_head(entry_func->body, &hlsl_ctx.static_initializers); + + /* Index 0 means unused; index 1 means function entry, so start at 2. */ + index_instructions(entry_func->body, 2); + + if (TRACE_ON()) + { + TRACE("IR dump.\n"); + rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL); + } + + compute_liveness(entry_func); + + if (hlsl_ctx.status != PARSE_ERR) + ret = VKD3D_ERROR_NOT_IMPLEMENTED; + +out: + for (i = 0; i < hlsl_ctx.source_files_count; ++i) + vkd3d_free((void *)hlsl_ctx.source_files[i]); + vkd3d_free(hlsl_ctx.source_files); + + TRACE("Freeing functions IR.\n"); + rb_destroy(&hlsl_ctx.functions, free_function_rb, NULL); + + TRACE("Freeing variables.\n"); + LIST_FOR_EACH_ENTRY_SAFE(scope, next_scope, &hlsl_ctx.scopes, struct hlsl_scope, entry) + { + LIST_FOR_EACH_ENTRY_SAFE(var, next_var, &scope->vars, struct hlsl_ir_var, scope_entry) + free_declaration(var); + rb_destroy(&scope->types, NULL, NULL); + vkd3d_free(scope); + } + + TRACE("Freeing types.\n"); + LIST_FOR_EACH_ENTRY_SAFE(hlsl_type, next_type, &hlsl_ctx.types, struct hlsl_type, entry) + free_hlsl_type(hlsl_type); + + return ret; +} diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e9c462e5..cab5b80d 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1220,6 +1220,15 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type) case VKD3D_SHADER_TYPE_COMPUTE: return "cs"; + case VKD3D_SHADER_TYPE_EFFECT: + return "fx"; + + case VKD3D_SHADER_TYPE_TEXTURE: + return "tx"; + + case VKD3D_SHADER_TYPE_LIBRARY: + return "lib"; + default: FIXME("Unhandled shader type %#x.\n", type); return "unknown"; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index df3b1a57..ff917dbf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -225,7 +225,7 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v } } -static void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) { static bool enabled = true; const char *path; @@ -961,7 +961,16 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { - return VKD3D_ERROR_NOT_IMPLEMENTED; + struct vkd3d_shader_code preprocessed; + int ret; + + if ((ret = preproc_lexer_parse(compile_info, &preprocessed, message_context))) + return ret; + + ret = hlsl_compile_shader(preprocessed.code, compile_info, out, message_context); + + vkd3d_shader_free_shader_code(&preprocessed); + return ret; } int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 12edfae1..52196caf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -548,6 +548,10 @@ enum vkd3d_shader_type VKD3D_SHADER_TYPE_GRAPHICS_COUNT, VKD3D_SHADER_TYPE_COMPUTE = VKD3D_SHADER_TYPE_GRAPHICS_COUNT, + + VKD3D_SHADER_TYPE_EFFECT, + VKD3D_SHADER_TYPE_TEXTURE, + VKD3D_SHADER_TYPE_LIBRARY, VKD3D_SHADER_TYPE_COUNT, }; @@ -884,6 +888,8 @@ void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, const str void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, const struct vkd3d_shader_location *location, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) DECLSPEC_HIDDEN; + int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; @@ -909,6 +915,9 @@ void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksu int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; +int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; + static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) { -- 2.30.0

1 0

[PATCH 13/18] ntdll: Use syscall frame for YMM context in x86_64 NtGetContextThread.
by Jacek Caban 26 Jan '21

26 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)

4 16

[PATCH] msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Piotr Caban 26 Jan '21

26 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 264 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 266 insertions(+), 2 deletions(-)

2 2

[PATCH v2] msvcrt: Improve memmove performance on i386 and x86_64 architectures.
by Piotr Caban 26 Jan '21

26 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49663 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 266 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/4] widl: Support WinRT mta threading attribute parsing.
by Rémi Bernon 26 Jan '21

26 Jan '21

As an alias to free-threaded model. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Do not mark mta as WinRT-specific, to use it as a possible replacement to the threading(free) widl extension. I've kept the enum name as it was, as it matches the typelib output, which I understand should not be renamed in any case. Supersedes: 198642-198646 tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 01c6f800a08..2f5f55905c5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -385,6 +385,7 @@ static const struct keyword attr_keywords[] = {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, + {"mta" , tMTA, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 48f180cdb49..4ce84cc2440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -222,6 +222,7 @@ static typelib_t *current_typelib; %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tMTA %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE @@ -1154,6 +1155,7 @@ threading_type: | tSINGLE { $$ = THREADING_SINGLE; } | tFREE { $$ = THREADING_FREE; } | tBOTH { $$ = THREADING_BOTH; } + | tMTA { $$ = THREADING_FREE; } ; pointer_type: -- 2.30.0

2 6

[PATCH v2 1/5] d3d11: Add initial implementation of CreateDeviceContextState.
by Rémi Bernon 26 Jan '21

26 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix the mess, d3d_device_context_state are free objects that simply hold a reference to their device on creation and release it on destroy. As suggested, this is the beginning of a series implementating D3D11 state capture and restore, to fix the D2D1 regression [1] by using D3D11 interfaces in D2D1 instead of D3D10. [1] https://bugs.winehq.org/show_bug.cgi?id=49395 Activating D3D10 interface should actually disable most of the D3D11 interface methods, and the other way respectively. This is currently left implemented, as it's not really required for the purpose of the series. dlls/d3d11/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 142 ++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 74 +++++++++++++------ 3 files changed, 206 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3248285fcda..77078a07545 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -516,6 +516,18 @@ struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDD struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; +/* ID3DDeviceContextState */ +struct d3d_device_context_state +{ + ID3DDeviceContextState ID3DDeviceContextState_iface; + LONG refcount; + + struct wined3d_private_store private_store; + + GUID emulated_interface; + ID3D11Device2 *device; +}; + /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 50e8cd58fe2..e870399a83e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -29,6 +29,127 @@ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = d3d_null_wined3d_object_destroyed, }; +/* ID3DDeviceContextState methods */ + +static inline struct d3d_device_context_state *impl_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_device_context_state, ID3DDeviceContextState_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_QueryInterface(ID3DDeviceContextState *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID3DDeviceContextState) + || IsEqualGUID(iid, &IID_ID3D11DeviceChild) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3DDeviceContextState_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device2_Release(state->device); + heap_free(state); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d_device_context_state_GetDevice(ID3DDeviceContextState *iface, ID3D11Device **device) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D11Device *)state->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_GetPrivateData(ID3DDeviceContextState *iface, REFGUID guid, + UINT *data_size, void *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_SetPrivateData(ID3DDeviceContextState *iface, REFGUID guid, + UINT data_size, const void *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_SetPrivateDataInterface(ID3DDeviceContextState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static const struct ID3DDeviceContextStateVtbl d3d_device_context_state_vtbl = +{ + /* IUnknown methods */ + d3d_device_context_state_QueryInterface, + d3d_device_context_state_AddRef, + d3d_device_context_state_Release, + /* ID3D11DeviceChild methods */ + d3d_device_context_state_GetDevice, + d3d_device_context_state_GetPrivateData, + d3d_device_context_state_SetPrivateData, + d3d_device_context_state_SetPrivateDataInterface, + /* ID3DDeviceContextState methods */ +}; + +static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, + REFIID emulated_interface) +{ + state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; + state->refcount = 1; + + wined3d_private_store_init(&state->private_store); + + state->emulated_interface = *emulated_interface; + state->device = &device->ID3D11Device2_iface; + ID3D11Device2_AddRef(state->device); +} + /* ID3D11DeviceContext - immediate context methods */ static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext1(ID3D11DeviceContext1 *iface) @@ -3738,11 +3859,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version, REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state) { + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_device_context_state *state_impl; + FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p stub!\n", iface, flags, feature_levels, + "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", iface, flags, feature_levels, feature_levels_count, sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); - return E_NOTIMPL; + if (chosen_feature_level) + FIXME("Device context state feature level not implemented yet.\n"); + + if (state) + { + *state = NULL; + if (!(state_impl = heap_alloc(sizeof(*state_impl)))) + return E_OUTOFMEMORY; + d3d_device_context_state_init(state_impl, device, emulated_interface); + *state = &state_impl->ID3DDeviceContextState_iface; + } + + device->d3d11_only = FALSE; + if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); + return state ? S_OK : S_FALSE; } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9fc09a5ec83..fde7a11766d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6683,10 +6683,9 @@ static void test_device_context_state(void) ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); - feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_11_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, - &IID_ID3D10Device, NULL, &context_state); -todo_wine + &IID_ID3D11Device1, NULL, &context_state); ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); if (FAILED(hr)) { @@ -6700,6 +6699,24 @@ todo_wine context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + check_interface(device, &IID_ID3D11Device, TRUE, FALSE); + check_interface(device, &IID_ID3D11Device1, TRUE, FALSE); + + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D10Device, NULL, &context_state); + ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + refcount = get_refcount(context_state); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + cb = create_buffer((ID3D11Device *)device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), NULL); ID3D11DeviceContext1_CSSetConstantBuffers(context, 0, 1, &cb); @@ -6743,73 +6760,90 @@ todo_wine ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(previous_context_state != NULL, "Failed to get previous context state\n"); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); - ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler && tmp_sampler != (ID3D11SamplerState *)0xdeadbeef) + ID3D11SamplerState_Release(tmp_sampler); if (!enable_debug_layer) ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); - - context_type = ID3D11DeviceContext1_GetType(context); - ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); + if (!context_state) refcount = 0; + else refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3DDeviceContextState_Release(previous_context_state); + if (!previous_context_state) refcount = 0; + else refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); /* ID3DDeviceContextState retains the previous state. */ -- 2.30.0

4 15

[PATCH] wined3d: Support multiple outputs.
by Zhiyi Zhang 26 Jan '21

26 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 5 +-- dlls/d3d9/tests/device.c | 5 +-- dlls/dxgi/device.c | 16 +------- dlls/dxgi/swapchain.c | 20 +--------- dlls/dxgi/tests/dxgi.c | 26 +------------ dlls/wined3d/directx.c | 69 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_main.c | 4 +- dlls/wined3d/wined3d_private.h | 2 - 8 files changed, 62 insertions(+), 85 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ffd940067e8..4eb1ab65e72 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10455,9 +10455,8 @@ static void test_multi_adapter(void) } adapter_count = IDirect3D8_GetAdapterCount(d3d); - todo_wine_if(expected_adapter_count > 1) - ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", - adapter_count, expected_adapter_count); + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); for (i = 0; i < adapter_count; ++i) { diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ef8d9a34e25..3ef9361886d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14149,9 +14149,8 @@ static void test_multi_adapter(void) } adapter_count = IDirect3D9_GetAdapterCount(d3d); - todo_wine_if(expected_adapter_count > 1) - ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", - adapter_count, expected_adapter_count); + ok(adapter_count == expected_adapter_count, "Got unexpected adapter count %u, expected %u.\n", + adapter_count, expected_adapter_count); for (i = 0; i < adapter_count; ++i) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5f0c40f2e47..74260f9b769 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -429,7 +429,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX struct wined3d_swapchain_desc wined3d_desc; struct IDXGIOutput *containing_output; struct d3d11_swapchain *object; - struct IDXGIAdapter *adapter; HRESULT hr; TRACE("iface %p, factory %p, window %p, desc %p, fullscreen_desc %p, output %p, swapchain %p.\n", @@ -438,20 +437,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX if (FAILED(hr = dxgi_get_output_from_window(factory, window, &containing_output))) { WARN("Failed to get output from window %p, hr %#x.\n", window, hr); - - /* FIXME: As wined3d only supports one output currently, even if a window is on a - * non-primary output, the swapchain will use the primary output. Keep this behaviour - * until all outputs are correctly enumerated. Otherwise it will create a regression - * for applications that specify a device window on a non-primary output */ - if (FAILED(hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter))) - return hr; - - hr = IDXGIAdapter_EnumOutputs(adapter, 0, &containing_output); - IDXGIAdapter_Release(adapter); - if (FAILED(hr)) - return hr; - - FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + return hr; } hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, containing_output, window, desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0f335a71cb7..82e5fbf811d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -3000,9 +3000,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkSurfaceKHR vk_surface; - IUnknown *device_parent; VkInstance vk_instance; - IDXGIAdapter *adapter; IDXGIOutput *output; VkBool32 supported; VkDevice vk_device; @@ -3043,27 +3041,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } - device_parent = vkd3d_get_device_parent(device); - if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) - return hr; - if (FAILED(hr = dxgi_get_output_from_window((IDXGIFactory *)factory, window, &output))) { WARN("Failed to get output from window %p, hr %#x.\n", window, hr); - - /* FIXME: As wined3d only supports one output currently, even if a window is on a - * non-primary output, the swapchain will use the primary output. Keep this behaviour - * until all outputs are correctly enumerated. Otherwise it will create a regression - * for applications that specify a device window on a non-primary output */ - if (FAILED(hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output))) - { - IDXGIAdapter_Release(adapter); - return hr; - } - - FIXME("Using the primary output for the device window that is on a non-primary output.\n"); + return hr; } - IDXGIAdapter_Release(adapter); hr = wined3d_swapchain_desc_from_dxgi(&wined3d_desc, output, window, swapchain_desc, fullscreen_desc); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 53d768d1a36..2d8826fde8e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2178,22 +2178,6 @@ done: DestroyWindow(creation_desc.OutputWindow); } -static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *output_desc) -{ - HMONITOR primary, secondary; - MONITORINFO mi; - POINT pt = {0, 0}; - - primary = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); - pt.x = output_desc->DesktopCoordinates.right; - secondary = MonitorFromPoint(pt, MONITOR_DEFAULTTONULL); - mi.cbSize = sizeof(mi); - if (secondary && secondary != primary - && GetMonitorInfoW(primary, &mi) && (mi.dwFlags & MONITORINFOF_PRIMARY)) - return primary; - return NULL; -} - static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) { unsigned int adapter_idx, output_idx, output_count; @@ -2207,7 +2191,6 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) POINT points[4 * 16]; unsigned int i, j; HMONITOR monitor; - HMONITOR primary; BOOL fullscreen; ULONG refcount; HRESULT hr; @@ -2287,8 +2270,6 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) wine_dbgstr_rect(&output_desc.DesktopCoordinates), wine_dbgstr_rect(&monitor_info.rcMonitor)); - primary = get_primary_if_right_side_secondary(&output_desc); - for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); ++adapter_idx) { @@ -2379,8 +2360,6 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) output_idx, i); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); - /* Hack to prevent test failures with secondary on the right until multi-monitor support is improved. */ - todo_wine_if(primary && monitor != primary) ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), "Adapter %u output %u point %u: Failed to get containing output, hr %#x.\n", adapter_idx, output_idx, i, hr); @@ -5652,9 +5631,8 @@ done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS); - todo_wine_if(expected_output_count > 1) - ok(output_count == expected_output_count, "Expect output count %d, got %d\n", - expected_output_count, output_count); + ok(output_count == expected_output_count, "Expect output count %d, got %d\n", + expected_output_count, output_count); } struct message diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2764b113065..040a9f81083 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -140,6 +140,7 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, unsigned int o output->ordinal = ordinal; lstrcpyW(output->device_name, device_name); output->adapter = adapter; + output->screen_format = WINED3DFMT_UNKNOWN; output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -3105,16 +3106,46 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return adapter; } +static BOOL wined3d_adapter_create_output(struct wined3d_adapter *adapter, const WCHAR *output_name) +{ + struct wined3d_output *outputs; + HRESULT hr; + + if (!adapter->outputs && !(adapter->outputs = heap_calloc(1, sizeof(*adapter->outputs)))) + { + return FALSE; + } + else + { + if (!(outputs = heap_realloc(adapter->outputs, + sizeof(*adapter->outputs) * (adapter->output_count + 1)))) + return FALSE; + + adapter->outputs = outputs; + } + + if (FAILED(hr = wined3d_output_init(&adapter->outputs[adapter->output_count], + adapter->output_count, adapter, output_name))) + { + ERR("Failed to initialise output %s, hr %#x.\n", wine_dbgstr_w(output_name), hr); + return FALSE; + } + + ++adapter->output_count; + TRACE("Initialised output %s.\n", wine_dbgstr_w(output_name)); + return TRUE; +} + BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const LUID *luid, const struct wined3d_adapter_ops *adapter_ops) { + unsigned int output_idx = 0, primary_idx = 0; DISPLAY_DEVICEW display_device; - unsigned int output_idx; BOOL ret = FALSE; - HRESULT hr; adapter->ordinal = ordinal; adapter->output_count = 0; + adapter->outputs = NULL; if (luid) { @@ -3132,23 +3163,29 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, TRACE("adapter %p LUID %08x:%08x.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->device_name, display_device.DeviceName); - - if (!(adapter->outputs = heap_calloc(1, sizeof(*adapter->outputs)))) + while (EnumDisplayDevicesW(NULL, output_idx++, &display_device, 0)) { - ERR("Failed to allocate outputs.\n"); - return FALSE; - } + /* Detached outputs are not enumerated */ + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; - if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], 0, adapter, - display_device.DeviceName))) - { - ERR("Failed to initialise output, hr %#x.\n", hr); - goto done; + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + primary_idx = adapter->output_count; + + if (!wined3d_adapter_create_output(adapter, display_device.DeviceName)) + goto done; + } + TRACE("Initialised %d outputs for adapter %p.\n", adapter->output_count, adapter); + + /* Make the primary output first */ + if (primary_idx) + { + struct wined3d_output tmp = adapter->outputs[0]; + adapter->outputs[0] = adapter->outputs[primary_idx]; + adapter->outputs[0].ordinal = 0; + adapter->outputs[primary_idx] = tmp; + adapter->outputs[primary_idx].ordinal = primary_idx; } - adapter->output_count = 1; memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5ad390d9f56..293359714c3 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -497,9 +497,7 @@ static struct wined3d_output * wined3d_get_output_from_window(const struct wined } } - /* Because wined3d only supports one output right now. A window can be on non-primary outputs - * and thus fails to get its correct output. In this case, return the primary output for now */ - return &wined3d->adapters[0]->outputs[0]; + return NULL; } static struct wined3d_wndproc *wined3d_find_wndproc(HWND window, struct wined3d *wined3d) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3934f0d8e4..119ce3af033 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3368,8 +3368,6 @@ struct wined3d_adapter GUID device_uuid; LUID luid; - WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ - void *formats; size_t format_size; -- 2.27.0

3 2

[PATCH] kernelbase: Fix the fallback value in GetConsole*CP
by Martin Storsjo 26 Jan '21

26 Jan '21

This fixes a regression from 3576258402f5e23ad059cf446eafef7fb2c10430, where the fallback value (if no console is available, e.g. if stdin is piped from /dev/null) ends up as zero, instead of at OEM CP (as it was before 3576258402f5e23ad059cf446eafef7fb2c10430). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/kernelbase/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8d440c89296..5e9ef66c981 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -611,7 +611,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) - return 0; + return GetOEMCP(); return info.input_cp; } @@ -684,7 +684,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) - return 0; + return GetOEMCP(); return info.output_cp; } -- 2.25.1

1 1

[PATCH] po: Update Dutch translation
by Floris Renaud 26 Jan '21

26 Jan '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 3140 +++++++++++++++++++++--------------------------------- 1 file changed, 1191 insertions(+), 1949 deletions(-) diff --git a/po/nl.po b/po/nl.po index a845259c08f..a3c1a28a4a4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-22 18:30+0100\n" -"Last-Translator: Roger Koot <roger.koot(a)gmail.com>\n" +"PO-Revision-Date: 2021-01-26 12:00+0100\n" +"Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -116,11 +116,11 @@ msgstr "Contact:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "Support Informatie:" +msgstr "Ondersteuning:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "Support Telefoon:" +msgstr "Telefoonnummer:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" @@ -132,7 +132,7 @@ msgstr "Product Updates:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "Commentaar:" +msgstr "Opmerkingen:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -227,15 +227,15 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:31 msgid "Add/Remove Programs" -msgstr "Programma's Toevoegen/Verwijderen" +msgstr "Software" #: dlls/appwiz.cpl/appwiz.rc:32 msgid "" "Allows you to install new software, or remove existing software from your " "computer." msgstr "" -"Hiermee installeert u nieuwe software, of verwijdert u bestaande software " -"van uw computer." +"Hiermee installeert u nieuwe programma's, of verwijdert u bestaande " +"programma's van uw computer." #: dlls/appwiz.cpl/appwiz.rc:33 programs/taskmgr/taskmgr.rc:262 #: programs/winecfg/winecfg.rc:32 @@ -362,25 +362,23 @@ msgstr "Annuleren..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 resterend" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 resterend" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Seconden" +msgstr "seconden" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuten" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "uren" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" @@ -413,7 +411,7 @@ msgstr "Beëindigen" #: dlls/comctl32/comctl32.rc:97 msgid "Customize Toolbar" -msgstr "Gereedschappenbalk aanpassen" +msgstr "Werkbalk aanpassen" #: dlls/comctl32/comctl32.rc:100 dlls/comctl32/comctl32.rc:57 #: dlls/cryptui/cryptui.rc:356 dlls/ieframe/ieframe.rc:43 @@ -469,7 +467,7 @@ msgstr "<- &Verwijderen" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "&Knoppen:" +msgstr "Werkbalk &knoppen:" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -495,16 +493,12 @@ msgid "&Retry" msgstr "O&pnieuw" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Verberg &Tabs" +msgstr "Verberg details" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Details" +msgstr "Bekijk details" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -583,7 +577,7 @@ msgstr "Sele&ctie" #: dlls/comdlg32/comdlg32.rc:210 msgid "&Pages" -msgstr "&Pagina's" +msgstr "&Pagina" #: dlls/comdlg32/comdlg32.rc:213 dlls/comdlg32/comdlg32.rc:235 msgid "&Setup" @@ -672,7 +666,7 @@ msgstr "Teken&stijl:" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "Tekstgrootte:" +msgstr "&Grootte:" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -712,7 +706,7 @@ msgstr "&Aangepaste kleuren:" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|E&ffen" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -731,31 +725,27 @@ msgid "&Hue:" msgstr "Ti&nt:" #: dlls/comdlg32/comdlg32.rc:298 -#, fuzzy msgctxt "Saturation" msgid "&Sat:" -msgstr "&Intensiteit:" +msgstr "&Verz:" #: dlls/comdlg32/comdlg32.rc:300 -#, fuzzy msgctxt "Luminance" msgid "&Lum:" -msgstr "&Helderheid:" +msgstr "&Heldr:" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" -msgstr "&Toevoegen aan Aangepaste kleuren" +msgstr "&Toevoegen aan Aangepaste Kleuren" #: dlls/comdlg32/comdlg32.rc:311 msgid "&Define Custom Colors >>" -msgstr "&Definieer Aangepaste kleuren >>" +msgstr "&Definieer Aangepaste Kleuren >>" #: dlls/comdlg32/comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nee" +msgstr "&f" #: dlls/comdlg32/comdlg32.rc:318 programs/regedit/regedit.rc:275 #: programs/regedit/regedit.rc:285 @@ -788,7 +778,7 @@ msgstr "O&mlaag" #: dlls/comdlg32/comdlg32.rc:329 dlls/comdlg32/comdlg32.rc:347 msgid "&Find Next" -msgstr "&Volgende zoeken" +msgstr "&Zoeken" #: dlls/comdlg32/comdlg32.rc:337 msgid "Replace" @@ -836,11 +826,11 @@ msgstr "Waar:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "Opmerking:" +msgstr "Omschrijving:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" -msgstr "&Pagina's" +msgstr "&Pagina" #: dlls/comdlg32/comdlg32.rc:378 msgid "&Selection" @@ -990,7 +980,7 @@ msgstr "Het bestand bestaat niet" #: dlls/comdlg32/comdlg32.rc:41 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "De selectie bevat een item dat geen map is" #: dlls/comdlg32/comdlg32.rc:46 msgid "Up One Level" @@ -1106,7 +1096,7 @@ msgstr "" #: dlls/comdlg32/comdlg32.rc:61 msgid "The 'from' entry cannot exceed the 'to' entry." -msgstr "De VAN ingave kan niet groter zijn dan de TOT waarde." +msgstr "De 'van' ingave kan niet groter zijn dan de 'tot' waarde." #: dlls/comdlg32/comdlg32.rc:63 msgid "" @@ -1114,7 +1104,7 @@ msgid "" "Please reenter margins." msgstr "" "De marges overlappen of vallen buiten het papier.\n" -"Voer s.v.p. nieuwe marges in." +"Voer a.u.b. nieuwe marges in." #: dlls/comdlg32/comdlg32.rc:65 msgid "The 'Number of copies' field cannot be empty." @@ -1138,7 +1128,7 @@ msgstr "Er is geen standaardprinter." #: dlls/comdlg32/comdlg32.rc:70 msgid "Cannot find the printer." -msgstr "De printer werd niet gevonden." +msgstr "Kan de printer niet vinden." #: dlls/comdlg32/comdlg32.rc:71 programs/progman/progman.rc:76 msgid "Out of memory." @@ -1146,11 +1136,11 @@ msgstr "Onvoldoende geheugen beschikbaar." #: dlls/comdlg32/comdlg32.rc:72 msgid "An error occurred." -msgstr "Er ontstond een niet nader gespecificeerde fout." +msgstr "Er is een onbekende fout opgetreden." #: dlls/comdlg32/comdlg32.rc:73 msgid "Unknown printer driver." -msgstr "De printer driver is onbekend." +msgstr "Onbekend printerstuurprogramma." #: dlls/comdlg32/comdlg32.rc:76 msgid "" @@ -1182,14 +1172,12 @@ msgid "Open File" msgstr "Open bestand" #: dlls/comdlg32/comdlg32.rc:148 -#, fuzzy -#| msgid "New Folder" msgid "Select Folder" -msgstr "Nieuwe Map" +msgstr "Map Kiezen" #: dlls/comdlg32/comdlg32.rc:149 msgid "Font size has to be a number." -msgstr "" +msgstr "De lettergrootte moet een nummer zijn." #: dlls/comdlg32/comdlg32.rc:84 programs/oleview/oleview.rc:98 msgid "Ready" @@ -1233,7 +1221,7 @@ msgstr "I/O Actief; " #: dlls/comdlg32/comdlg32.rc:94 msgid "Busy; " -msgstr "Druk bezig; " +msgstr "Bezig; " #: dlls/comdlg32/comdlg32.rc:95 msgid "Printing; " @@ -1265,7 +1253,7 @@ msgstr "Aan het opwarmen; " #: dlls/comdlg32/comdlg32.rc:102 msgid "Toner low; " -msgstr "Er is nog maar weinig toner; " +msgstr "De toner is bijna op; " #: dlls/comdlg32/comdlg32.rc:103 msgid "No toner; " @@ -1285,7 +1273,7 @@ msgstr "Onvoldoende geheugen beschikbaar; " #: dlls/comdlg32/comdlg32.rc:107 msgid "The printer door is open; " -msgstr "De printer staat is open; " +msgstr "De printer staat open; " #: dlls/comdlg32/comdlg32.rc:108 msgid "Print server unknown; " @@ -1293,7 +1281,7 @@ msgstr "Print server onbekend; " #: dlls/comdlg32/comdlg32.rc:109 msgid "Power save mode; " -msgstr "Power save modus; " +msgstr "Energiebesparende stand; " #: dlls/comdlg32/comdlg32.rc:78 msgid "Default Printer; " @@ -2249,11 +2237,11 @@ msgstr "&Kopieer naar bestand..." #: dlls/cryptui/cryptui.rc:215 msgid "Certification Path" -msgstr "Certificatie pad" +msgstr "Certificatie Pad" #: dlls/cryptui/cryptui.rc:219 msgid "Certification path" -msgstr "Certificatie &pad" +msgstr "Certificatie pad" #: dlls/cryptui/cryptui.rc:222 dlls/cryptui/cryptui.rc:464 msgid "&View Certificate" @@ -2375,11 +2363,11 @@ msgstr "" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)" +msgstr "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (*.p7b)" #: dlls/cryptui/cryptui.rc:306 msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Persoonlijke informatie uitwisseling/PKCS #12 (.pfx, .p12)" +msgstr "Persoonlijke informatie uitwisseling/PKCS #12 (*.pfx, *.p12)" #: dlls/cryptui/cryptui.rc:308 dlls/cryptui/cryptui.rc:81 #: dlls/cryptui/cryptui.rc:162 @@ -2447,7 +2435,7 @@ msgstr "Certificaat doeleinden" #: programs/taskmgr/taskmgr.rc:52 programs/winefile/winefile.rc:48 #: programs/wordpad/wordpad.rc:69 msgid "&View" -msgstr "Bee&ld" +msgstr "&Bekijk" #: dlls/cryptui/cryptui.rc:360 msgid "Advanced Options" @@ -2540,20 +2528,16 @@ msgid "Ba&se64-encoded X.509 (*.cer):" msgstr "Ba&se64-geëncodeerde X.509 (.cer):" #: dlls/cryptui/cryptui.rc:417 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)" +msgstr "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (*.p7b)" #: dlls/cryptui/cryptui.rc:419 msgid "&Include all certificates in the certification path if possible" msgstr "Neem &alle certificaten in het certificatiepad op indien mogelijk" #: dlls/cryptui/cryptui.rc:421 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "&Persoonlijke informatie uitwisseling/PKCS #12 (.pfx)" +msgstr "&Persoonlijke informatie uitwisseling/PKCS #12 (*.pfx)" #: dlls/cryptui/cryptui.rc:423 msgid "Incl&ude all certificates in the certification path if possible" @@ -2576,16 +2560,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "U heeft de Certificaat exporteerhulp succesvol afgerond." #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Selecteer certificatenopslag" +msgstr "Selecteer Certificaat" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Selecteer de certificatenopslag die u wilt gebruiken:" +msgstr "Selecteer het certificaat dat u wilt gebruiken" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -2596,28 +2576,24 @@ msgid "Certificate Information" msgstr "Certificaat informatie" #: dlls/cryptui/cryptui.rc:32 -#, fuzzy msgid "" "This certificate has an invalid signature. The certificate may have been " "altered or corrupted." msgstr "" "Dit certificaat heeft een foutieve handtekening. Het certificaat kan " -"gewijzigd of corrupt zijn." +"gewijzigd of gemanipuleerd zijn." #: dlls/cryptui/cryptui.rc:33 -#, fuzzy msgid "" "This root certificate is not trusted. To trust it, add it to your system's " "trusted root certificate store." msgstr "" "Dit basis certificaat wordt niet vertrouwd. Om het te vertrouwen, voeg het " -"toe aan uw systeem's vertrouwde basis certificatenopslag." +"toe aan het vertrouwde basiscertificaatarchief van uw systeem." #: dlls/cryptui/cryptui.rc:34 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "" -"Dit certificaat kon niet worden getraceerd naar een vertrouwd basis " -"certificaat." +msgstr "Dit certificaat heeft geen vertrouwd basis certificaat." #: dlls/cryptui/cryptui.rc:35 msgid "This certificate's issuer could not be found." @@ -2641,7 +2617,7 @@ msgstr "Uitgegeven door: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " -msgstr "geldig vanaf " +msgstr "Geldig vanaf " #: dlls/cryptui/cryptui.rc:41 msgid " to " @@ -2760,13 +2736,12 @@ msgid "Please select a certificate store." msgstr "Selecteer aub. een certificatenopslag." #: dlls/cryptui/cryptui.rc:72 -#, fuzzy msgid "" "The file contains objects that do not match the given criteria. Please " "select another file." msgstr "" "Het bestand bevat objecten die niet voldoen aan de opgegeven criteria. " -"Selecteer aub. een ander bestand." +"Selecteer a.u.b. een ander bestand." #: dlls/cryptui/cryptui.rc:73 msgid "File to Import" @@ -2815,7 +2790,7 @@ msgstr "Selecteer een bestand." #: dlls/cryptui/cryptui.rc:85 msgid "The file format is not recognized. Please select another file." msgstr "" -"Het bestandsformaat wordt niet herkend. Selecteer aub een ander bestand." +"Het bestandsformaat wordt niet herkend. Selecteer a.u.b. een ander bestand." #: dlls/cryptui/cryptui.rc:86 msgid "Could not open " @@ -2999,11 +2974,11 @@ msgstr "Weet u zeker dat u deze certificaten wilt verwijderen?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" -msgstr "Bewijst de identiteit van een remote computer" +msgstr "Bewijst de identiteit van een andere computer" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" -msgstr "Bewijst uw identiteit aan een remote computer" +msgstr "Bewijst uw identiteit aan een andere computer" #: dlls/cryptui/cryptui.rc:126 msgid "" @@ -3123,27 +3098,21 @@ msgstr "" "Noot: De persoonlijke sleutel voor dit certificaat kon niet geopend worden." #: dlls/cryptui/cryptui.rc:176 -#, fuzzy msgid "Note: The private key for this certificate is not exportable." msgstr "" -"Noot: De persoonlijke sleutel voor dit certificaat kan niet geëxporteerd " -"worden." +"Noot: De privé sleutel voor dit certificaat kan niet geëxporteerd worden." #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Doeleinden:" +msgstr "Beoogd doel" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:152 msgid "Location" msgstr "Locatie" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Selecteer certificatenopslag" +msgstr "Selecteer een certificaat" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3350,10 +3319,8 @@ msgid "&View Source" msgstr "&Bronweergave" #: dlls/hhctrl.ocx/hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Eigenschappen" +msgstr "&Eigenschappen" #: dlls/hhctrl.ocx/hhctrl.rc:87 dlls/shdoclc/shdoclc.rc:79 #: dlls/shdoclc/shdoclc.rc:93 dlls/shdoclc/shdoclc.rc:117 @@ -3584,7 +3551,7 @@ msgstr "" #: dlls/inetcpl.cpl/inetcpl.rc:59 msgid "Delete &files..." -msgstr "Bestanden &verwijderen..." +msgstr "Bestanden &wissen..." #: dlls/inetcpl.cpl/inetcpl.rc:60 msgid "&Settings..." @@ -3609,8 +3576,8 @@ msgid "" "preferences and login information." msgstr "" "Cookies\n" -"Bestanden opgeslagen op je computer door websites, waarin zaken als " -"gebruikersvoorkeuren en logininformatie worden bewaard." +"Bestanden opgeslagen op je computer door websites, waarin dingen zoals " +"voorkeuren en logininformatie worden bewaard." #: dlls/inetcpl.cpl/inetcpl.rc:75 msgid "" @@ -3618,7 +3585,7 @@ msgid "" "List of websites you have accessed." msgstr "" "Geschiedenis\n" -"Lijst van websites waar je bent geweest." +"Lijst van websites waar u bent geweest." #: dlls/inetcpl.cpl/inetcpl.rc:77 msgid "" @@ -3626,7 +3593,7 @@ msgid "" "Usernames and other information you have entered into forms." msgstr "" "Formuliergegevens\n" -"Gebruikersnamen en andere informatie die je in formulieren hebt ingevuld." +"Gebruikersnamen en andere informatie die u in formulieren heeft ingevuld." #: dlls/inetcpl.cpl/inetcpl.rc:79 msgid "" @@ -3634,7 +3601,7 @@ msgid "" "Saved passwords you have entered into forms." msgstr "" "Wachtwoorden\n" -"Opgeslagen wachtwoorden die je in formulieren ingevuld." +"Opgeslagen wachtwoorden die u in formulieren heeft ingevuld." #: dlls/inetcpl.cpl/inetcpl.rc:82 programs/progman/progman.rc:67 msgid "Delete" @@ -3661,46 +3628,36 @@ msgid "Publishers..." msgstr "Uitgevers..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN Verbinding" +msgstr "Verbinding" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine configuratie" +msgstr "Automatische configuratie" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Gebruik Web Proxy Auto-Discovery (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Gebruik Proxy Auto-Config (PAC)" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adres" +msgstr "Adres:" #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokale server" +msgstr "Proxy server" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Gebruik een proxy server" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Geen poorten" +msgstr "Poort:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3712,7 +3669,7 @@ msgstr "Configureer Wine Internet Browser en gerelateerde instellingen" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "Veiligheidsinstellingen voor zone: " +msgstr "Veiligheidsniveau voor: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3764,7 +3721,7 @@ msgid "" "updated here until you restart this applet." msgstr "" "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks " -"niet vernieuwd worden totdat U deze applet herstart." +"niet vernieuwd worden totdat u deze applet herstart." #: dlls/joy.cpl/joy.rc:51 msgid "Test Joystick" @@ -3796,7 +3753,7 @@ msgstr "Spelbesturing" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Spelbesturing testen en aanpassen." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3811,10 +3768,8 @@ msgid "Subscript out of range" msgstr "Index buiten bereik" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Papier is op; " +msgstr "Geen stapelruimte" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3853,16 +3808,12 @@ msgid "Expected ')'" msgstr "')' verwacht" #: dlls/jscript/jscript.rc:41 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Onderwerp's Sleutel Identificatie nummer" +msgstr "Verwachte ID" #: dlls/jscript/jscript.rc:42 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';' verwacht" +msgstr "Verwacht '='" #: dlls/jscript/jscript.rc:43 msgid "Invalid character" @@ -3893,34 +3844,28 @@ msgid "Label not found" msgstr "Label niet gevonden" #: dlls/jscript/jscript.rc:50 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';' verwacht" +msgstr "Verwacht '@end'" #: dlls/jscript/jscript.rc:51 msgid "Conditional compilation is turned off" msgstr "Conditionele compilatie is uitgeschakeld" #: dlls/jscript/jscript.rc:52 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';' verwacht" +msgstr "Verwacht '@'" #: dlls/jscript/jscript.rc:78 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript compilatie fout" #: dlls/jscript/jscript.rc:79 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript runtime-fout" #: dlls/jscript/jscript.rc:80 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Onbekende fout" +msgstr "Onbekende runtime-fout" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3963,16 +3908,12 @@ msgid "JScript object expected" msgstr "JScript object verwacht" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Array object verwacht" +msgstr "Enumerator-object verwacht" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Boolean object verwacht" +msgstr "Reguliere Expressie-object verwacht" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3980,7 +3921,7 @@ msgstr "Syntax fout in reguliere expressie" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Uitzondering geactiveerd maar niet afgehandeld" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -4011,22 +3952,24 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"'writable' kenmerk van de eigenschapsdescriptor kan niet op 'true' worden " +"ingesteld voor dit object" #: dlls/jscript/jscript.rc:74 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Kan onconfigureerbare eigenschap '|' niet herdefiniëren" #: dlls/jscript/jscript.rc:75 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Kan onschrijfbare eigenschap '|' niet veranderen" #: dlls/jscript/jscript.rc:76 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Eigenschap kan niet zowel accessors als een waarde hebben" #: include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine kernel DLL" #: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32 #: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137 @@ -4067,7 +4010,7 @@ msgstr "Geheugenprobleem.\n" #: dlls/kernel32/winerror.mc:68 msgid "Not enough memory.\n" -msgstr "Onvoldoende beschikbaar geheugen.\n" +msgstr "Onvoldoende geheugen.\n" #: dlls/kernel32/winerror.mc:73 msgid "Invalid block.\n" @@ -4095,7 +4038,7 @@ msgstr "Geen geheugen meer beschikbaar.\n" #: dlls/kernel32/winerror.mc:103 msgid "Invalid drive.\n" -msgstr "Verkeerde drive.\n" +msgstr "Verkeerde schijf.\n" #: dlls/kernel32/winerror.mc:108 msgid "Can't delete current directory.\n" @@ -4347,7 +4290,7 @@ msgstr "Stop schijf in speler %1.\n" #: dlls/kernel32/winerror.mc:418 msgid "Drive locked.\n" -msgstr "Speler vergrendeld.\n" +msgstr "Schijf vergrendeld.\n" #: dlls/kernel32/winerror.mc:423 msgid "Broken pipe.\n" @@ -4479,7 +4422,7 @@ msgstr "Geen top-level directory.\n" #: dlls/kernel32/winerror.mc:593 msgid "Directory is not empty.\n" -msgstr "Directory is niet leeg.\n" +msgstr "Map is niet leeg.\n" #: dlls/kernel32/winerror.mc:598 msgid "Path is in use as a SUBST.\n" @@ -4735,7 +4678,7 @@ msgstr "Kan de Copy API niet gebruiken.\n" #: dlls/kernel32/winerror.mc:913 msgid "Directory name invalid.\n" -msgstr "Directorynaam ongeldig.\n" +msgstr "Mapnaam ongeldig.\n" #: dlls/kernel32/winerror.mc:918 msgid "Extended attributes didn't fit.\n" @@ -4847,7 +4790,7 @@ msgstr "Bestand ongeldig.\n" #: dlls/kernel32/winerror.mc:1053 msgid "Cannot run full-screen.\n" -msgstr "Kan geen full-screen runnen.\n" +msgstr "Kan niet op volledig scherm worden uitgevoerd.\n" #: dlls/kernel32/winerror.mc:1058 msgid "Nonexistent token.\n" @@ -5011,7 +4954,7 @@ msgstr "Service-afhankelijkheid verwijderd.\n" #: dlls/kernel32/winerror.mc:1258 msgid "Boot already accepted as last-good config.\n" -msgstr "Boot al geaccepteerd als laatste goede configuratie.\n" +msgstr "Opstart al geaccepteerd als laatste goede configuratie.\n" #: dlls/kernel32/winerror.mc:1263 msgid "Service not started since last boot.\n" @@ -5098,10 +5041,8 @@ msgid "No Unicode translation.\n" msgstr "Geen Unicode-vertaling.\n" #: dlls/kernel32/winerror.mc:1368 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "DLL init mislukt.\n" +msgstr "DLL initialisatie mislukt.\n" #: dlls/kernel32/winerror.mc:1373 msgid "Shutdown in progress.\n" @@ -5321,7 +5262,7 @@ msgstr "Verbinding niet beschikbaar.\n" #: dlls/kernel32/winerror.mc:1643 msgid "Device already remembered.\n" -msgstr "Device al onthouden.\n" +msgstr "Apparaat al onthouden.\n" #: dlls/kernel32/winerror.mc:1648 msgid "No network or bad path.\n" @@ -5389,7 +5330,7 @@ msgstr "Sessie kwalificatie conflict.\n" #: dlls/kernel32/winerror.mc:1733 msgid "Remote session limit exceeded.\n" -msgstr "Limiet sessies op afstand overschreden.\n" +msgstr "Limiet sessies op afstand overschreden.\n" #: dlls/kernel32/winerror.mc:1738 msgid "Duplicate domain or workgroup name.\n" @@ -6032,9 +5973,8 @@ msgid "Hook procedure needs module handle.\n" msgstr "Hook procedure heeft modulehandle nodig.\n" #: dlls/kernel32/winerror.mc:2543 -#, fuzzy msgid "Global-only hook procedure.\n" -msgstr "'Global-only' haak procedure.\n" +msgstr "Alleen globale haakprocedure.\n" #: dlls/kernel32/winerror.mc:2548 msgid "Journal hook already set.\n" @@ -6058,8 +5998,7 @@ msgstr "Geen tabstops op deze keuzelijst.\n" #: dlls/kernel32/winerror.mc:2573 msgid "Can't destroy object owned by another thread.\n" -msgstr "" -"Kan geen object vernietigen waarvan een andere thread de eigenaar is.\n" +msgstr "Kan geen object vernietigen waarvan een andere thread de eigenaar is.\n" #: dlls/kernel32/winerror.mc:2578 msgid "Child window menus not allowed.\n" @@ -6299,7 +6238,7 @@ msgstr "Datatype komt niet overeen.\n" #: dlls/kernel32/winerror.mc:2873 dlls/kernel32/winerror.mc:3083 msgid "Unsupported type.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Type wordt niet ondersteund.\n" #: dlls/kernel32/winerror.mc:2878 msgid "Creation failed.\n" @@ -6327,7 +6266,7 @@ msgstr "Ongeldig patchbestand.\n" #: dlls/kernel32/winerror.mc:2908 msgid "Unsupported patch package.\n" -msgstr "Niet-ondersteund patchbestand.\n" +msgstr "Patchbestand wordt niet ondersteund.\n" #: dlls/kernel32/winerror.mc:2913 msgid "Another version is installed.\n" @@ -6463,7 +6402,7 @@ msgstr "RPC-protocol fout.\n" #: dlls/kernel32/winerror.mc:3078 msgid "Unsupported transfer syntax.\n" -msgstr "Niet-ondersteunde transfer-syntax.\n" +msgstr "Transfer-syntax wordt niet ondersteund.\n" #: dlls/kernel32/winerror.mc:3088 msgid "Invalid tag.\n" @@ -6483,7 +6422,7 @@ msgstr "Ongeldige naam-syntax.\n" #: dlls/kernel32/winerror.mc:3108 msgid "Unsupported name syntax.\n" -msgstr "Niet-ondersteunde naam-syntax.\n" +msgstr "Naam-syntax wordt niet ondersteund.\n" #: dlls/kernel32/winerror.mc:3113 msgid "No network address.\n" @@ -6811,7 +6750,7 @@ msgstr "RPC comm fout.\n" #: dlls/kernel32/winerror.mc:3518 msgid "Unsupported authorization level.\n" -msgstr "Niet-ondersteund autorisatieniveau.\n" +msgstr "Autorisatieniveau wordt niet ondersteund.\n" #: dlls/kernel32/winerror.mc:3523 msgid "No principal name registered.\n" @@ -6990,46 +6929,32 @@ msgid "The username could not be found.\n" msgstr "De gebruikersnaam kon niet worden gevonden.\n" #: dlls/kernel32/winerror.mc:3743 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "De plek bestaat niet.\n" +msgstr "Deze netwerkverbinding bestaat niet.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Verbinding geweigerd.\n" +msgstr "Verbinding opnieuw ingesteld door gelijkwaardige computer.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Niet geïmplementeerd" +msgstr "Niet geïmplementeerd.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-call mislukt.\n" +msgstr "Oproep mislukt.\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Bericht 0x%1 niet gevonden in bestand %2.\n" +msgstr "Geen handtekening gevonden in bestand.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ongeldig niveau.\n" +msgstr "Ongeldige oproep.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "Help is niet beschikbaar." +msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7084,553 +7009,395 @@ msgstr "Verstuur Mail" #: dlls/mferror/mferror.mc:249 dlls/mferror/mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Startverzoek is al gedaan.\n" #: dlls/mferror/mferror.mc:599 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Sink has not been finalized.\n" -msgstr "Object UUID niet gevonden.\n" +msgstr "De sink is niet voltooid.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock was stopped\n" -msgstr "Klasse bestaat al.\n" +msgstr "Klok is gestopt.\n" #: dlls/mferror/mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Installatieplatform niet ondersteund.\n" +msgstr "Media Foundation platform is niet geïnitialiseerd.\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Byte-aantal te klein.\n" +msgstr "Buffer is te klein.\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Ongeldige vraagsyntax.\n" +msgstr "Ongeldige aanvraag.\n" #: dlls/mferror/mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Ongeldig segmentnummer.\n" +msgstr "Ongeldig stream-nummer.\n" #: dlls/mferror/mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Ongeldig datatype.\n" +msgstr "Ongeldig media-type.\n" #: dlls/mferror/mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "Geen entries meer.\n" +msgstr "Verdere invoer niet geaccepteerd.\n" #: dlls/mferror/mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "Object UUID niet gevonden.\n" +msgstr "Object is niet geïnitialiseerd.\n" #: dlls/mferror/mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Operatie niet ondersteund.\n" +msgstr "Weergave niet ondersteund.\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Geen verdere types in de lijst van voorgestelde media types.\n" #: dlls/mferror/mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Dienst wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Onverwachte netwerk fout.\n" +msgstr "Onverwachte fout.\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Ongeldige tijd.\n" +msgstr "Ongeldig type.\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Ongeldig pixelformaat.\n" +msgstr "Ongeldig bestandsformaat.\n" #: dlls/mferror/mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Ongeldige tijd.\n" +msgstr "Ongeldig tijdstempel.\n" #: dlls/mferror/mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Schema wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Bytestream-type wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Tijdformaat wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "Tijdstempel is niet ingesteld voor het fragment.\n" #: dlls/mferror/mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "Lengte niet ingesteld voor het fragment.\n" #: dlls/mferror/mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Ongeldige data.\n" +msgstr "Ongeldige stream data.\n" #: dlls/mferror/mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Help is niet beschikbaar." +msgstr "Realtime hulp is niet beschikbaar.\n" #: dlls/mferror/mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Tempo wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Beeldreductie wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "Verzoek niet ondersteund.\n" +msgstr "Achterwaarts afspelen wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "Niet-ondersteund autorisatieniveau.\n" +msgstr "Tempo verandering wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "Tempo verandering is vervallen.\n" #: dlls/mferror/mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Object UUID niet gevonden.\n" +msgstr "Object of waarde niet gevonden.\n" #: dlls/mferror/mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Help is niet beschikbaar." +msgstr "Waarde is niet beschikbaar.\n" #: dlls/mferror/mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Help is niet beschikbaar." +msgstr "Klok is niet beschikbaar.\n" #: dlls/mferror/mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "Uitgebreide attributen niet ondersteund.\n" +msgstr "Meerdere abonnees worden niet ondersteund.\n" #: dlls/mferror/mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "De driver is niet geactiveerd." +msgstr "De timer is achtergelaten.\n" #: dlls/mferror/mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "Openen van karaktervertalingstabel mislukt.\n" +msgstr "Statusverandering is bezig.\n" #: dlls/mferror/mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "Niet-ondersteund autorisatieniveau.\n" +msgstr "Statusverandering wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:291 -#, fuzzy -#| msgid "A printer error occurred." msgid "Unrecoverable error occurred.\n" -msgstr "Er heeft zich een fout voorgedaan met de printer." +msgstr "Onherstelbare fout opgetreden.\n" #: dlls/mferror/mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "Fragment heeft te veel buffers.\n" #: dlls/mferror/mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "Tijdelijke map niet beschrijfbaar.\n" +msgstr "Fragment is niet beschrijfbaar.\n" #: dlls/mferror/mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Pad is ongeldig.\n" +msgstr "Sleutel is ongeldig.\n" #: dlls/mferror/mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "Verkeerde stub-versie.\n" +msgstr "Slechte opstart versie.\n" #: dlls/mferror/mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Bijschrift wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Ongeldig werkstation.\n" +msgstr "Ongeldige positie.\n" #: dlls/mferror/mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Bestand niet gevonden.\n" +msgstr "Kenmerk is niet gevonden.\n" #: dlls/mferror/mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Haaktype niet toegestaan.\n" +msgstr "Eigenschapstype is niet toegestaan.\n" #: dlls/mferror/mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "Operatie niet ondersteund.\n" +msgstr "Eigenschapstype wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Directory is niet leeg.\n" +msgstr "Eigenschap is leeg.\n" #: dlls/mferror/mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Directory is niet leeg.\n" +msgstr "Eigenschap is niet leeg.\n" #: dlls/mferror/mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "Haaktype niet toegestaan.\n" +msgstr "Vectoreigenschap is niet toegestaan.\n" #: dlls/mferror/mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Vectoreigenschap is verplicht.\n" #: dlls/mferror/mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Operatie geannuleerd door gebruiker.\n" +msgstr "Bewerking werd geannuleerd.\n" #: dlls/mferror/mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "Server niet uitgeschakeld.\n" +msgstr "Bytestream is niet doorzoekbaar.\n" #: dlls/mferror/mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Platform is uitgeschakeld in veilige modus.\n" #: dlls/mferror/mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "Kan service thread niet aanmaken.\n" +msgstr "Kan bytestream niet parseren.\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "Conflicterende vlaggen doorgeven aan de bronoplossing.\n" #: dlls/mferror/mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "Onbekende interface.\n" +msgstr "Onbekende bytestream lengte.\n" #: dlls/mferror/mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "Ongeldige index.\n" +msgstr "Ongeldige werkwachtrij index.\n" #: dlls/mferror/mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "Geen inlogservers beschikbaar.\n" +msgstr "Geen gebeurtenissen beschikbaar.\n" #: dlls/mferror/mferror.mc:445 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Invalid media source state transition.\n" -msgstr "Niet-ondersteund autorisatieniveau.\n" +msgstr "Ongeldige statusovergang van de mediabron.\n" #: dlls/mferror/mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Register is hersteld.\n" +msgstr "Het einde van de mediastream is bereikt.\n" #: dlls/mferror/mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() is aangeroepen.\n" #: dlls/mferror/mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Register is hersteld.\n" +msgstr "Er is geen duur ingesteld voor de mediastream.\n" #: dlls/mferror/mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Mediaformaat werd herkend, maar is ongeldig.\n" #: dlls/mferror/mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Verzameling eigenschappen niet gevonden.\n" +msgstr "Eigenschap werd niet gevonden.\n" #: dlls/mferror/mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Directory is niet leeg.\n" +msgstr "Eigenschap is alleen-lezen.\n" #: dlls/mferror/mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Haaktype niet toegestaan.\n" +msgstr "Eigenschap is niet toegestaan.\n" #: dlls/mferror/mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Resource in gebruik.\n" +msgstr "Mediabron is niet gestart.\n" #: dlls/mferror/mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Mediaformaat wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Resource in gebruik.\n" +msgstr "Mediabron heeft een verkeerde status.\n" #: dlls/mferror/mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Geen data gevonden.\n" +msgstr "Geen mediastreams geselecteerd.\n" #: dlls/mferror/mferror.mc:529 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "Mediabron kenmerken worden niet ondersteund.\n" #: dlls/mferror/mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Streamsink is verwijderd.\n" #: dlls/mferror/mferror.mc:543 msgid "Stream sinks are out of sync.\n" -msgstr "" +msgstr "Streamsinks lopen niet synchroon.\n" #: dlls/mferror/mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Register is hersteld.\n" +msgstr "Mediasink streamsinks staan vast.\n" #: dlls/mferror/mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Domein bestaat al.\n" +msgstr "Streamsink bestaat al.\n" #: dlls/mferror/mferror.mc:564 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Sample allocation was canceled.\n" -msgstr "Operatie geannuleerd door gebruiker.\n" +msgstr "Toegewezen fragment werd geannuleerd.\n" #: dlls/mferror/mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Directory is niet leeg.\n" +msgstr "De fragmentverdeler is leeg.\n" #: dlls/mferror/mferror.mc:578 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Sink was already stopped.\n" -msgstr "Klasse bestaat al.\n" +msgstr "De sink was al gestopt.\n" #: dlls/mferror/mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" -msgstr "" +msgstr "Onbekende bitsnelheid voor ASF-bestandssink.\n" #: dlls/mferror/mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Geen data gevonden.\n" +msgstr "Geen streams geselecteerd voor de sink.\n" #: dlls/mferror/mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Bestandsnaam is te lang.\n" +msgstr "Metagegevens waren te lang.\n" #: dlls/mferror/mferror.mc:613 msgid "No samples were processed by the sink.\n" -msgstr "" +msgstr "Geen fragmenten verwerkt door de sink.\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "" +msgstr "Sink was niet met de benodigde kopteksten geleverd.\n" #: dlls/mferror/mferror.mc:627 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "Verbinding ongeldig.\n" +msgstr "Optioneel knooppunt is ongeldig.\n" #: dlls/mferror/mferror.mc:634 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "De printer werd niet gevonden." +msgstr "Ontsleutelingsmodule niet gevonden.\n" #: dlls/mferror/mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Module niet gevonden.\n" +msgstr "Codec niet gevonden.\n" #: dlls/mferror/mferror.mc:648 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "Kan call handle niet verkrijgen.\n" +msgstr "Topologieknooppunten kunnen niet verbonden worden.\n" #: dlls/mferror/mferror.mc:655 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "Verzoek niet ondersteund.\n" +msgstr "Topologieverzoek wordt niet ondersteund.\n" #: dlls/mferror/mferror.mc:662 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "Ongeldige groepsattributen.\n" +msgstr "Ongeldig topologie tijdskenmerk.\n" #: dlls/mferror/mferror.mc:669 msgid "Found loops in topology.\n" -msgstr "" +msgstr "Lussen gevonden in topologie.\n" #: dlls/mferror/mferror.mc:676 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "De installatiebron ontbreekt.\n" +msgstr "Presentatiebeschrijving ontbreekt.\n" #: dlls/mferror/mferror.mc:683 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Index ontbreekt.\n" +msgstr "Streambeschrijving ontbreekt.\n" #: dlls/mferror/mferror.mc:690 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "Het apparaat is niet verbonden.\n" +msgstr "Streambeschrijving is niet geselecteerd.\n" #: dlls/mferror/mferror.mc:697 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Index ontbreekt.\n" +msgstr "Bron ontbreekt.\n" #: dlls/mferror/mferror.mc:704 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "Topologie lader ondersteund geen sinkactiviteiten.\n" #: dlls/mferror/mferror.mc:711 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "Klok heeft geen toegewezen tijdbron.\n" #: dlls/mferror/mferror.mc:718 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "Klasse bestaat al.\n" +msgstr "Klokstatus was al ingesteld.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not simple\n" -msgstr "Help is niet beschikbaar." +msgstr "Klok is niet eenvoudig\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -7638,7 +7405,7 @@ msgstr "Voer het Netwerk Wachtwoord in" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "Voer a.u.b uw gebruikersnaam en wachtwoord in:" +msgstr "Voer a.u.b. uw gebruikersnaam en wachtwoord in:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7674,7 +7441,7 @@ msgstr "&Formaat:" #: dlls/msacm32/msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributen:" +msgstr "&Kenmerken:" #: dlls/mshtml/mshtml.rc:39 msgid "Hyperlink" @@ -7709,7 +7476,7 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"Het opgegeven installatiepakket kon niet worden geopend. Verifieer het " +"Het opgegeven installatiepakket kon niet worden geopend. Controleer het " "bestandspad en probeer opnieuw." #: dlls/msi/msi.rc:32 @@ -7721,37 +7488,6 @@ msgid "insert disk %s" msgstr "plaats disk %s" #: dlls/msi/msi.rc:34 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n" @@ -7802,12 +7538,12 @@ msgstr "" "Pas een patch toe:\n" "\t/p patchpakket [eigenschap]\n" "\t/p patchpakket /a pakket [eigenschap]\n" -"Log en UI Modifiers voor bovenstaande commando's:\n" +"Log en UI Modifiers voor de bovenstaande commando's:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"Registreer MSI service:\n" +"Registreer de MSI service:\n" "\t/y\n" -"Maak registratie MSI service ongedaan:\n" +"Registratie van de MSI service ongedaan maken:\n" "\t/z\n" "Laat dit helpvenster zien:\n" "\t/help\n" @@ -7815,343 +7551,279 @@ msgstr "" #: dlls/msi/msi.rc:61 msgid "enter which folder contains %s" -msgstr "Voer de map in die %s bevat" +msgstr "voer de map in die %s bevat" #: dlls/msi/msi.rc:62 msgid "install source for feature missing" -msgstr "De installatiebron van de feature ontbreekt" +msgstr "installatiebron voor het onderdeel ontbreekt" #: dlls/msi/msi.rc:63 msgid "network drive for feature missing" -msgstr "De netwerkschijf met de feature ontbreekt" +msgstr "netwerkschijf voor het onderdeel ontbreekt" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "Feature van:" +msgstr "onderdeel van:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" -msgstr "Kies de map die %s bevat" +msgstr "kies de map die %s bevat" #: dlls/msi/msi.rc:66 dlls/shell32/shell32.rc:238 msgid "New Folder" msgstr "Nieuwe Map" #: dlls/msi/msi.rc:91 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "Geen register log ruimte.\n" +msgstr "Registerruimte wordt toegewezen" #: dlls/msi/msi.rc:92 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Single-instance applicatie.\n" +msgstr "Zoeken naar geïnstalleerde programma's" #: dlls/msi/msi.rc:93 msgid "Binding executables" -msgstr "" +msgstr "Uitvoerbare bestanden koppelen" #: dlls/msi/msi.rc:94 dlls/msi/msi.rc:137 -#, fuzzy -#| msgid "Searching for %s" msgid "Searching for qualifying products" -msgstr "Zoeken naar %s" +msgstr "Naar in aanmerking komende producten zoeken" #: dlls/msi/msi.rc:95 dlls/msi/msi.rc:96 dlls/msi/msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "Vereiste ruimte berekenen" #: dlls/msi/msi.rc:97 -#, fuzzy -#| msgid "New Folder" msgid "Creating folders" -msgstr "Nieuwe Map" +msgstr "Mappen aanmaken" #: dlls/msi/msi.rc:98 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "&Snelkoppeling aanmaken" +msgstr "Snelkoppelingen aanmaken" #: dlls/msi/msi.rc:99 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Uitzondering in service.\n" +msgstr "Services verwijderen" #: dlls/msi/msi.rc:100 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Aanmaakdatum" +msgstr "Kopieën aanmaken" #: dlls/msi/msi.rc:102 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Geen geassocieerde applicatie.\n" +msgstr "Zoeken naar verwante toepassingen" #: dlls/msi/msi.rc:103 msgid "Copying network install files" -msgstr "" +msgstr "Netwerkinstallatiebestanden kopiëren" #: dlls/msi/msi.rc:104 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "Bestanden worden gekopieerd..." +msgstr "Nieuwe bestanden kopiëren" #: dlls/msi/msi.rc:105 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "Installatie van onderdeel mislukt: %08x" +msgstr "ODBC-onderdelen installeren" #: dlls/msi/msi.rc:106 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "Installatieservice gefaald.\n" +msgstr "Nieuwe services installeren" #: dlls/msi/msi.rc:107 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Installing system catalog" -msgstr "Installeren/Verwijderen" +msgstr "Systeemcatalogus installeren" #: dlls/msi/msi.rc:108 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Programma verwijderen" +msgstr "Installatie controleren" #: dlls/msi/msi.rc:109 msgid "Evaluating launch conditions" -msgstr "" +msgstr "Startvoorwaarden controleren" #: dlls/msi/msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Functiestatussen van verwante toepassingen worden gemigreerd" #: dlls/msi/msi.rc:111 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Pictogrambestanden" +msgstr "Bestanden verplaatsen" #: dlls/msi/msi.rc:112 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Versie-informatie" +msgstr "Assemblyinformatie publiceren" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Publicatie van assemblygegevens ongedaan maken" #: dlls/msi/msi.rc:114 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Pictogrambestanden" +msgstr "Bestanden bijwerken" #: dlls/msi/msi.rc:115 msgid "Updating component registration" -msgstr "" +msgstr "De registratie van onderdelen wordt bijgewerkt" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" -msgstr "" +msgstr "In aanmerking komende onderdelen publiceren" #: dlls/msi/msi.rc:117 msgid "Publishing Product Features" -msgstr "" +msgstr "Productfuncties publiceren" #: dlls/msi/msi.rc:118 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Cliënt Informatie" +msgstr "Productinformatie publiceren" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" -msgstr "" +msgstr "Class-servers registreren" #: dlls/msi/msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "" +msgstr "COM+ toepassingen en onderdelen registreren" #: dlls/msi/msi.rc:121 msgid "Registering extension servers" -msgstr "" +msgstr "Uitbreidingsservers registreren" #: dlls/msi/msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "Lettertypen registreren" #: dlls/msi/msi.rc:123 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Register-editor" +msgstr "MIME-informatie registreren" #: dlls/msi/msi.rc:124 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "Register is corrupt.\n" +msgstr "Product registreren" #: dlls/msi/msi.rc:125 msgid "Registering program identifiers" -msgstr "" +msgstr "Programma-id's registreren" #: dlls/msi/msi.rc:126 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Type bibliotheken" +msgstr "Typebibliotheken registreren" #: dlls/msi/msi.rc:127 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "Resource in gebruik.\n" +msgstr "Gebruiker registreren" #: dlls/msi/msi.rc:128 -#, fuzzy -#| msgid "&Remove doubles" msgid "Removing duplicated files" -msgstr "&Verwijder dubbelen" +msgstr "Dubbele bestanden verwijderen" #: dlls/msi/msi.rc:129 dlls/msi/msi.rc:153 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Lettertype wordt toegepast" +msgstr "Omgevingstekenreeksen bijwerken" #: dlls/msi/msi.rc:130 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "Toepassing verwijderen" +msgstr "Toepassingen verwijderen" #: dlls/msi/msi.rc:131 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Pictogrambestanden" +msgstr "Bestanden verwijderen" #: dlls/msi/msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "Mappen verwijderen" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" -msgstr "" +msgstr "INI-bestandsvermeldingen verwijderen" #: dlls/msi/msi.rc:134 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Domein Component" +msgstr "ODBC-onderdelen verwijderen" #: dlls/msi/msi.rc:135 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Removing system registry values" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Systeemregisterwaarden verwijderen" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" -msgstr "" +msgstr "Snelkoppelingen verwijderen" #: dlls/msi/msi.rc:138 msgid "Registering modules" -msgstr "" +msgstr "Modules registreren" #: dlls/msi/msi.rc:139 msgid "Unregistering modules" -msgstr "" +msgstr "Registratie van modules ongedaan maken" #: dlls/msi/msi.rc:140 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "Aan het opstarten; " +msgstr "ODBC-mappen initialiseren" #: dlls/msi/msi.rc:141 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "Starten van Wordpad mislukt" +msgstr "Services opstarten" #: dlls/msi/msi.rc:142 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "Stoppen van afhankelijke service: %1\n" +msgstr "Services stoppen" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "" +msgstr "Publicatie van in aanmerking komende onderdelen intrekken" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Publicatie van productonderdelen intrekken" #: dlls/msi/msi.rc:145 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Cliënt Informatie" +msgstr "Publicatie van productinformatie intrekken" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" -msgstr "" +msgstr "Registratie van Class-servers ongedaan maken" #: dlls/msi/msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "" +msgstr "Registratie van COM+ toepassingen en onderdelen ongedaan maken" #: dlls/msi/msi.rc:148 msgid "Unregistering extension servers" -msgstr "" +msgstr "Registratie van uitbreidingsservers ongedaan maken" #: dlls/msi/msi.rc:149 msgid "Unregistering fonts" -msgstr "" +msgstr "Registratie van lettertypen ongedaan maken" #: dlls/msi/msi.rc:150 msgid "Unregistering MIME info" -msgstr "" +msgstr "Registratie van MIME-info ongedaan maken" #: dlls/msi/msi.rc:151 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Registratie van programma-id's ongedaan maken" #: dlls/msi/msi.rc:152 msgid "Unregistering type libraries" -msgstr "" +msgstr "Registratie van typebibliotheken ongedaan maken" #: dlls/msi/msi.rc:154 msgid "Writing INI files values" -msgstr "" +msgstr "INI-bestandswaarden schrijven" #: dlls/msi/msi.rc:155 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Waarschuwing: systeembibliotheek" +msgstr "Systeemregisterwaarden schrijven" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "Vrije ruimte: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Eigenschap: [1], Handtekening: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" @@ -8163,73 +7835,63 @@ msgstr "Map: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "Snelkoppeling: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "A&pparaat:" +msgstr "Dienst: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Bestand: [1], Map: [9], Grootte: [6]" #: dlls/msi/msi.rc:168 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "programma" +msgstr "Gevonden programma: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Bestand: [1], Map: [9], Grootte: [6]" #: dlls/msi/msi.rc:171 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "A&pparaat:" +msgstr "Dienst: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "" +msgstr "Bestand: [1], Afhankelijkheden: [2]" #: dlls/msi/msi.rc:173 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Toepassingen" +msgstr "Programma: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Toepassingscontext:[1], Assemblynaam:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "" +msgstr "Bestand: [1], Map: [2], Grootte: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Onderdeel-ID: [1], Kwalificatie: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "" +msgstr "Functie: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse-ID: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Gebruikers: [3], RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Alleen extensies" +msgstr "Extensie: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" @@ -8237,63 +7899,63 @@ msgstr "Lettertype: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME-inhoudtype: [1], Extensie: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgID: [1]" #: dlls/msi/msi.rc:186 dlls/msi/msi.rc:207 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Bestand: [1], Map: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Naam: [1], Waarde: [2], Actie [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Programma: [1], Opdrachtregel: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Sleutel: [1], Naam: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Bestand: [1], Map: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppID: [1]{{, AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Sleutel: [1], Naam: [2], Waarde: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Onherstelbare fout: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Fout [1]. }}" #: dlls/msi/msi.rc:74 msgid "Warning [1]." -msgstr "" +msgstr "Waarschuwing [1]." #: dlls/msi/msi.rc:75 msgid "Info [1]." -msgstr "" +msgstr "Informatie [1]." #: dlls/msi/msi.rc:76 msgid "" @@ -8301,6 +7963,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Er is een onverwachte fout opgetreden tijdens de installatie van dit pakket. " +"Dit kan duiden op een probleem met het pakket. De foutcode is [1]. " +"{{Parameters: [2], [3], [4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" @@ -8308,33 +7973,35 @@ msgstr "{{Schijf vol: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Actie [Tijd]: [1]. [2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Berichttype: [1], Argument: [2]{, [3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logboekfunctie gestart: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Actie begonnen [Time]: [1]." #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Actie gestopt [Time]: [1]. Resultaatwaarde [2]." #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Plaats de schijf: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Bronbestand niet gevonden{{(cabinet)}}: [2]. Controleer of het bestand bestaat " +"en of u toegang tot het bestand hebt." #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8442,7 +8109,7 @@ msgstr "menu-item" #: dlls/oleacc/oleacc.rc:44 msgid "tool tip" -msgstr "tooltip" +msgstr "knopinfo" #: dlls/oleacc/oleacc.rc:45 msgid "application" @@ -8454,7 +8121,7 @@ msgstr "document" #: dlls/oleacc/oleacc.rc:47 msgid "pane" -msgstr "sectie" +msgstr "deelvenster" #: dlls/oleacc/oleacc.rc:48 msgid "chart" @@ -8586,7 +8253,7 @@ msgstr "voortgangsbalk" #: dlls/oleacc/oleacc.rc:80 msgid "dial" -msgstr "bellen" +msgstr "kiezen" #: dlls/oleacc/oleacc.rc:81 msgid "hot key field" @@ -8622,7 +8289,7 @@ msgstr "menuknop" #: dlls/oleacc/oleacc.rc:89 msgid "grid drop down button" -msgstr "grid dropdownknop" +msgstr "raster vervolgkeuzepijl" #: dlls/oleacc/oleacc.rc:90 msgid "white space" @@ -8649,206 +8316,164 @@ msgid "outline button" msgstr "omtrekknop" #: dlls/oleacc/oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Standaard" +msgstr "standaard" #: dlls/oleacc/oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Niet beschikbaar" +msgstr "niet beschikbaar" #: dlls/oleacc/oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Selecteren" +msgstr "geselecteerd" #: dlls/oleacc/oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Onderbroken" +msgstr "prioriteit" #: dlls/oleacc/oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "Ge&comprimeerd" +msgstr "ingedrukt" #: dlls/oleacc/oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "geselecteerd" #: dlls/oleacc/oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Gemixt" +msgstr "gemengd" #: dlls/oleacc/oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "A&lleen-lezen" +msgstr "alleen-lezen" #: dlls/oleacc/oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Hot-Tracked Onderdeel" +msgstr "gevolgd" #: dlls/oleacc/oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Standaardinstellingen" +msgstr "standaard" #: dlls/oleacc/oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "uitgevouwen" #: dlls/oleacc/oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "samengevouwen" #: dlls/oleacc/oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "bezig" #: dlls/oleacc/oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "zwevend" #: dlls/oleacc/oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "gemarkeerd" #: dlls/oleacc/oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "animatie" +msgstr "geanimeerd" #: dlls/oleacc/oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "onzichtbaar" #: dlls/oleacc/oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "buiten beeld" #: dlls/oleacc/oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&aan" +msgstr "schaalbaar" #: dlls/oleacc/oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&aan" +msgstr "beweegbaar" #: dlls/oleacc/oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "met eigen stem" #: dlls/oleacc/oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Onderbroken" +msgstr "te focussen" #: dlls/oleacc/oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "tabel" +msgstr "selecteerbaar" #: dlls/oleacc/oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "link" +msgstr "gelinkt" #: dlls/oleacc/oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "doorkruist" #: dlls/oleacc/oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "tabel" +msgstr "meerdere selecteerbaar" #: dlls/oleacc/oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Selecteer een bestand." +msgstr "uitgebreid selecteerbaar" #: dlls/oleacc/oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "waarschuwing" +msgstr "lage prioriteit" #: dlls/oleacc/oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "waarschuwing" +msgstr "midden-prioriteit" #: dlls/oleacc/oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "waarschuwing" +msgstr "hoge prioriteit" #: dlls/oleacc/oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Schrijf-beveiligd.\n" +msgstr "beveiligd" #: dlls/oleacc/oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "met pop-up" #: dlls/oleaut32/oleaut32.rc:30 programs/oleview/oleview.rc:146 msgid "True" @@ -8867,206 +8492,160 @@ msgid "Off" msgstr "Uit" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Leverancier" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Selecteer het formaat dat u wilt gebruiken:" +msgstr "Selecteer met welke gegevens u verbinging wilt maken:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "LAN Connection" msgid "Connection" -msgstr "LAN Verbinding" +msgstr "Verbinding" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Selecteer het formaat dat u wilt gebruiken:" +msgstr "Voer het volgende in om verbinding te maken met ODBC-gegevens:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Geef de bron van de gegevens op:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Voer uw naam in" +msgstr "Naam van &gegevensbron gebruiken" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Opnieuw verbinden" +msgstr "Ver&bindingsreeks gebruiken" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "LAN Connection" msgid "&Connection string:" -msgstr "LAN Verbinding" +msgstr "&Verbindingsreeks:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "&Add..." msgid "B&uild..." -msgstr "&Toevoegen..." +msgstr "&Maken..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Toegangsgegevens om in te loggen op de server" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "&Gebruikersnaam:" +msgstr "Gebruikers&naam:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Lege pagina" +msgstr "&Geen wachtwoord" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Verkeerd wachtwoord.\n" +msgstr "Wachtwoord op&slaan toestaan" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Gebruik de volgende &oorspronkelijke catalogus:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Opnieuw verbinden" +msgstr "Verbinding &Testen" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Gevorderde" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Netwerkverbinding" +msgstr "Netwerkinstellingen" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Slecht imitatieniveau.\n" +msgstr "&Imitatieniveau:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "&Beschermingsniveau:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Verbonden" +msgstr "Verbind:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "&Seconds" msgid "seconds." -msgstr "&Seconden" +msgstr "seconden." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Succes" +msgstr "&Toegang:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Alles" +msgstr "Alles" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Dit zijn de initialisatie-eigenschappen voor dit type gegevens. Om een waarde " +"te wijzigen, selecteer een eigenschap en kies \"Bewerken\"." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." msgstr "&Bewerken..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "Eigenschappen" +msgstr "Gegevenskoppelingsfout" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Selecteer een bestand." +msgstr "Selecteer een aanbieder." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"De aanbieder is niet meer beschikbaar. Zorg ervoor dat de aanbieder correct is " +"geïnstalleerd." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Eigenschappen" +msgstr "Gegevenskoppelingseigenschappen" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB Aanbieder(s)" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Gereed" +msgstr "Lezen" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Lees mij:" +msgstr "Lezen Schrijven" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "Delen Weiger Niets" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Delen Weiger Lezen" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Delen Weiger Schrijven" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Exclusief Delen" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O (Schrijven)" +msgstr "Schrijven" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9167,22 +8746,16 @@ msgid "Add Control" msgstr "Toevoegen" #: dlls/oledlg/oledlg.rc:35 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Lettertype..." +msgstr "&Converteren..." #: dlls/oledlg/oledlg.rc:36 -#, fuzzy -#| msgid "&Object" msgid "%1 %2 &Object" -msgstr "&Object" +msgstr "%1 %2 &Object" #: dlls/oledlg/oledlg.rc:34 -#, fuzzy -#| msgid "&Object" msgid "%1 &Object" -msgstr "&Object" +msgstr "%1 &Object" #: dlls/oledlg/oledlg.rc:33 programs/oleview/oleview.rc:40 msgid "&Object" @@ -9197,54 +8770,50 @@ msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." msgstr "" -"Voegt de inhoud van het klembord in uw document in zodat u het kan activeren " +"Voegt de inhoud van het klembord in uw document in, zodat u het kan activeren " "met %s." #: dlls/oledlg/oledlg.rc:43 -#, fuzzy msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"Voegt de inhoud van het klembord in uw document in zodat u het kan activeren " -"met %s. Het zal getoond worden als een icoon." +"Voegt de inhoud van het klembord in uw document in, zodat u het kan activeren " +"met %s. Het zal als een pictogram weergegeven worden." #: dlls/oledlg/oledlg.rc:44 -#, fuzzy msgid "" "Inserts the contents of the clipboard into your document as %s. The data is " "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"Voegt de inhoud van het klembord in uw document in als %s. De data is " -"verbonden met het bron bestand zodat wijzigingen in dat bestand worden " -"getoond in uw document." +"De inhoud van het klembord in uw document invoegen als %s. De gegevens zijn " +"verbonden met het bestand, zodat wijzigingen in dat bestand worden getoond in " +"uw document." #: dlls/oledlg/oledlg.rc:45 -#, fuzzy msgid "" "Inserts a picture of the clipboard contents into your document. The picture " "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"Voegt een afbeelding vanuit het klembord in uw document in. De afbeelding is " -"verbonden met het bronbestand, zodat wijzigingen in dat bestand worden " -"getoond in uw document." +"Een afbeelding vanuit het klembord invoegen in uw document. De afbeelding is " +"verbonden met het bestand, zodat wijzigingen in dat bestand worden getoond in " +"uw document." #: dlls/oledlg/oledlg.rc:46 -#, fuzzy msgid "" "Inserts a shortcut which points to the location of the clipboard contents. " "The shortcut is linked to the source file so that changes to the file will " "be reflected in your document." msgstr "" -"Voegt een verwijzing in die wijst naar de locatie van de inhoud van het " -"klembord. De verwijzing is verbonden met het bronbestand, zodat wijzigingen " -"in dat bestand worden getoond in uw document." +"Een verwijzing die wijst naar de locatie van de inhoud van het klembord " +"invoegen. De verwijzing is verbonden met het bestand, zodat wijzigingen in dat " +"bestand worden getoond in uw document." #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "Voegt de inhoud van het klembord in uw document." +msgstr "De inhoud van het klembord in uw document toevoegen." #: dlls/oledlg/oledlg.rc:48 programs/regedit/regedit.rc:430 msgid "Unknown Type" @@ -9264,7 +8833,7 @@ msgstr "Scannen" #: dlls/sane.ds/sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "SCANNEN... Even geduld a.u.b." +msgstr "SCANNEN... Even geduld" #: dlls/sane.ds/sane.rc:31 msgctxt "unit: pixels" @@ -9326,15 +8895,15 @@ msgstr "Bestemming:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" -msgstr "Bestanden benodigd" +msgstr "Benodigde bestanden" #: dlls/setupapi/setupapi.rc:55 msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" -"Voer de installatiedisk van de fabrikant in, en zorg\n" -"dan dat de correcte schijf hieronder geselecteerd is" +"Voer de installatiedisk van de fabrikant in. Selecteer\n" +"daarna de correcte schijf hieronder" #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" @@ -9443,7 +9012,7 @@ msgstr "Als achtergrond instellen" #: dlls/shdoclc/shdoclc.rc:77 dlls/shdoclc/shdoclc.rc:157 #: dlls/shdoclc/shdoclc.rc:181 msgid "Set as &Desktop Item..." -msgstr "Als desktopelement instellen..." +msgstr "Als bureaubladitem instellen..." #: dlls/shdoclc/shdoclc.rc:81 dlls/shdoclc/shdoclc.rc:134 #: dlls/shdoclc/shdoclc.rc:161 dlls/shdoclc/shdoclc.rc:185 @@ -9502,7 +9071,7 @@ msgstr "K&nippen" #: dlls/shdoclc/shdoclc.rc:155 msgid "&Save Video As..." -msgstr "Af&beelding opslaan als..." +msgstr "Video opslaan als..." #: dlls/shdoclc/shdoclc.rc:166 dlls/shdoclc/shdoclc.rc:190 msgid "Play" @@ -9758,7 +9327,7 @@ msgstr "Nieuwe &map maken" #: dlls/shell32/shell32.rc:306 msgid "Message" -msgstr "Message" +msgstr "Bericht" #: dlls/shell32/shell32.rc:310 msgid "Yes to &all" @@ -9781,10 +9350,8 @@ msgid "Wine was brought to you by:" msgstr "Wine is geschreven door:" #: dlls/shell32/shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Starten..." +msgstr "Uitvoeren" #: dlls/shell32/shell32.rc:338 msgid "" @@ -9805,10 +9372,8 @@ msgid "&Browse..." msgstr "&Bladeren..." #: dlls/shell32/shell32.rc:355 dlls/shell32/shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Bestandstype" +msgstr "Bestandstype:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:32 @@ -9821,16 +9386,12 @@ msgid "Size:" msgstr "Grootte:" #: dlls/shell32/shell32.rc:365 dlls/shell32/shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Aanmaakdatum" +msgstr "Aanmaakdatum:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributen:" +msgstr "Kenmerken:" #: dlls/shell32/shell32.rc:371 dlls/shell32/shell32.rc:408 #: programs/winefile/winefile.rc:173 @@ -9843,28 +9404,20 @@ msgid "&Archive" msgstr "&Archiveren" #: dlls/shell32/shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Open:" +msgstr "Open met:" #: dlls/shell32/shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Wijzig p&ictogram..." +msgstr "&Wijzig..." #: dlls/shell32/shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Gewijzigd" +msgstr "Laatste wijziging:" #: dlls/shell32/shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Laatste wijziging:" +msgstr "Laatst geopend:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10022,7 +9575,7 @@ msgstr "Afbeeldingen" #: dlls/shell32/shell32.rc:223 msgid "Videos" -msgstr "Videos" +msgstr "Video's" #: dlls/shell32/shell32.rc:216 msgid "Program Files (x86)" @@ -10086,7 +9639,7 @@ msgstr "Downloads" #: dlls/shell32/shell32.rc:169 msgid "Unable to create new Folder: Permission denied." -msgstr "Niet mogelijk om nieuwe map te maken: geen permissies." +msgstr "Niet mogelijk om nieuwe map te maken: toegang geweigerd." #: dlls/shell32/shell32.rc:170 msgid "Error during creation of a new folder" @@ -10140,12 +9693,12 @@ msgstr "Weet u zeker dat u '%1' naar de Prullenbak wilt verplaatsen?" #: dlls/shell32/shell32.rc:178 msgid "Are you sure that you want to send these %1 items to the Trash?" msgstr "" -"Weet u zeker dat u deze %1 bestanden naar de Vuilnisbak wilt verplaatsen?" +"Weet u zeker dat u deze %1 bestanden naar de Prullenbak wilt verplaatsen?" #: dlls/shell32/shell32.rc:179 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" msgstr "" -"Bestand '%1' kan niet naar de Vuilnisbak worden verplaatst. Wilt u het " +"Bestand '%1' kan niet naar de Prullenbak worden verplaatst. Wilt u het " "bestand permanent verwijderen?" #: dlls/shell32/shell32.rc:186 @@ -10168,14 +9721,12 @@ msgid "Wine Control Panel" msgstr "Wine Configuratiescherm" #: dlls/shell32/shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Fout tijdens tonen venster 'Uitvoeren Bestand' (interne fout)" +msgstr "Het venster 'Uitvoeren' kon niet worden weergegeven (interne fout)" #: dlls/shell32/shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" -msgstr "Fout tijdens tonen van Bladeren venster (interne fout)" +msgstr "Het venster 'Bladeren' kon niet worden weergegeven (interne fout)" #: dlls/shell32/shell32.rc:198 msgid "Executable files (*.exe)" @@ -10223,7 +9774,6 @@ msgid "Confirm overwrite" msgstr "Bevestig overschrijven" #: dlls/shell32/shell32.rc:268 -#, fuzzy msgid "" "Wine 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 " @@ -10243,6 +9793,15 @@ msgstr "" "binnen de voorwaarden van de GNU Lesser General Public License zoals " "gepubliceerd door de Free Software Foundation; versie 2.1 van de licentie, " "of (naar keuze) een latere versie." +"\n" +"Wine is gemaakt in de hoop dat het nuttig is, maar komt met GEEN ENKELE " +"GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of " +"GESCHIKTHEID VOOR EEN BEPAALD DOEL. Lees de GNU Lesser General Public License " +"voor meer informatie.\n" +"\n" +"U zou een kopie van de GNU Lesser General Public License bij Wine moeten " +"hebben gekregen; Als dit niet zo is, schrijf een brief naar: the Free Software " +"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: dlls/shell32/shell32.rc:256 msgid "Wine License" @@ -10282,974 +9841,900 @@ msgid " sec" msgstr " sec" #: dlls/twain_32/twain.rc:29 -#, fuzzy -#| msgid "New Folder" msgid "Select Source" -msgstr "Nieuwe Map" +msgstr "Selecteer Bron" #: dlls/tzres/tzres.rc:90 msgid "China Standard Time" -msgstr "" +msgstr "China Standaard Tijd" #: dlls/tzres/tzres.rc:91 msgid "China Daylight Time" -msgstr "" +msgstr "China Zomertijd" #: dlls/tzres/tzres.rc:180 msgid "North Asia Standard Time" -msgstr "" +msgstr "Noord-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:181 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Noord-Azië Zomertijd" #: dlls/tzres/tzres.rc:116 msgid "Georgian Standard Time" -msgstr "" +msgstr "Georgië Standaard Tijd" #: dlls/tzres/tzres.rc:117 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Georgië Zomertijd" #: dlls/tzres/tzres.rc:172 msgid "Nepal Standard Time" -msgstr "" +msgstr "Nepal Standaard Tijd" #: dlls/tzres/tzres.rc:173 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Nepal Zomertijd" #: dlls/tzres/tzres.rc:66 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Kaapverdië Standaard Tijd" #: dlls/tzres/tzres.rc:67 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Kaapverdië Zomertijd" #: dlls/tzres/tzres.rc:126 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "Datum en tijd" +msgstr "Haïti Standaard Tijd" #: dlls/tzres/tzres.rc:127 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Daylight Time" -msgstr "Datum en tijd" +msgstr "Haïti Zomertijd" #: dlls/tzres/tzres.rc:80 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Centraal europees" +msgstr "Midden-Europese Tijd" #: dlls/tzres/tzres.rc:81 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Centraal europees" +msgstr "Midden-Europese Zomertijd" #: dlls/tzres/tzres.rc:160 msgid "Morocco Standard Time" -msgstr "" +msgstr "Marokko Standaard Tijd" #: dlls/tzres/tzres.rc:161 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Marokko Zomertijd" #: dlls/tzres/tzres.rc:78 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Centraal europees" +msgstr "Centraal Europa Standaard Tijd" #: dlls/tzres/tzres.rc:79 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Centraal europees" +msgstr "Centraal Europa Zomertijd" #: dlls/tzres/tzres.rc:132 msgid "Iran Standard Time" -msgstr "" +msgstr "Iran Standaard Tijd" #: dlls/tzres/tzres.rc:133 msgid "Iran Daylight Time" -msgstr "" +msgstr "Iran Zomertijd" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Standard Time" -msgstr "Datum en tijd" +msgstr "Saint-Pierre Standaard Tijd" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Daylight Time" -msgstr "Datum en tijd" +msgstr "Saint-Pierre Zomertijd" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" -msgstr "" +msgstr "Namibië Standaard Tijd" #: dlls/tzres/tzres.rc:171 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Namibië Zomertijd" #: dlls/tzres/tzres.rc:226 msgid "Tonga Standard Time" -msgstr "" +msgstr "Tonga Standaard Tijd" #: dlls/tzres/tzres.rc:227 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Tonga Zomertijd" #: dlls/tzres/tzres.rc:164 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Mountain Standaard Tijd (Mexico)" #: dlls/tzres/tzres.rc:165 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Mountain Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:118 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Standaardbalk" +msgstr "GMT (Standaard Tijd)" #: dlls/tzres/tzres.rc:119 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT Zomertijd" #: dlls/tzres/tzres.rc:74 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Centraal Azië Standaard Tijd" #: dlls/tzres/tzres.rc:75 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Centraal Azië Zomertijd" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "&Standard bar" msgid "Lord Howe Standard Time" -msgstr "&Standaardbalk" +msgstr "Lord Howe Standaard Tijd" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Date and time" msgid "Lord Howe Daylight Time" -msgstr "Datum en tijd" +msgstr "Lord Howe Zomertijd" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" -msgstr "" +msgstr "Arabisch Schiereiland Standaard Tijd" #: dlls/tzres/tzres.rc:41 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Arabisch Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:148 msgid "Magadan Standard Time" -msgstr "" +msgstr "Magadan Standaard Tijd" #: dlls/tzres/tzres.rc:149 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Magadan Zomertijd" #: dlls/tzres/tzres.rc:176 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Newfoundland Standaard Tijd" #: dlls/tzres/tzres.rc:177 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Newfoundland Zomertijd" #: dlls/tzres/tzres.rc:250 msgid "West Pacific Standard Time" -msgstr "" +msgstr "West Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:251 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "West Pacific Zomertijd" #: dlls/tzres/tzres.rc:186 msgid "Pacific Standard Time" -msgstr "" +msgstr "Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:187 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Pacific Zomertijd" #: dlls/tzres/tzres.rc:52 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Azerbeidzjan Standaard Tijd" #: dlls/tzres/tzres.rc:53 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Azerbeidzjan Zomertijd" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Standard Time" -msgstr "Datum en tijd" +msgstr "Magallanes Standaard Tijd" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Date and time" msgid "Magallanes Daylight Time" -msgstr "Datum en tijd" +msgstr "Magallanes Zomertijd" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" -msgstr "" +msgstr "Samoa Standaard Tijd" #: dlls/tzres/tzres.rc:207 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Samoa Zomertijd" #: dlls/tzres/tzres.rc:138 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Kaliningrad Standaard Tijd" #: dlls/tzres/tzres.rc:139 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Kaliningrad Zomertijd" #: dlls/tzres/tzres.rc:188 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Pacific Standaard Tijd (Mexico)" #: dlls/tzres/tzres.rc:189 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Pacific Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:156 msgid "Middle East Standard Time" -msgstr "" +msgstr "Midden-Oosten Standaard Tijd" #: dlls/tzres/tzres.rc:157 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Midden-Oosten Zomertijd" #: dlls/tzres/tzres.rc:224 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Tokio Standaard Tijd" #: dlls/tzres/tzres.rc:225 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Tokio Zomertijd" #: dlls/tzres/tzres.rc:144 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Line-eilanden Standaard Tijd" #: dlls/tzres/tzres.rc:145 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Line-eilanden Zomertijd" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "Datum en tijd" +msgstr "Cuba Standaard Tijd" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Daylight Time" -msgstr "Datum en tijd" +msgstr "Cuba Zomertijd" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" -msgstr "" +msgstr "Jordanië Standaard Tijd" #: dlls/tzres/tzres.rc:137 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Jordanië Zomertijd" #: dlls/tzres/tzres.rc:84 msgid "Central Standard Time" -msgstr "" +msgstr "CST (Standaard Tijd)" #: dlls/tzres/tzres.rc:85 msgid "Central Daylight Time" -msgstr "" +msgstr "CST Zomertijd" #: dlls/tzres/tzres.rc:54 msgid "Azores Standard Time" -msgstr "" +msgstr "Azoren Standaard Tijd" #: dlls/tzres/tzres.rc:55 msgid "Azores Daylight Time" -msgstr "" +msgstr "Azoren Zomertijd" #: dlls/tzres/tzres.rc:178 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Noord-Oost Azië Standaard Tijd" #: dlls/tzres/tzres.rc:179 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Noord-Oost Azië Zomertijd" #: dlls/tzres/tzres.rc:42 msgid "Argentina Standard Time" -msgstr "" +msgstr "Argentinië Standaard Tijd" #: dlls/tzres/tzres.rc:43 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Argentinië Zomertijd" #: dlls/tzres/tzres.rc:152 -#, fuzzy -#| msgid "&Standard bar" msgid "Marquesas Standard Time" -msgstr "&Standaardbalk" +msgstr "Marquesas Standaard Tijd" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Date and time" msgid "Marquesas Daylight Time" -msgstr "Datum en tijd" +msgstr "Marquesas Zomertijd" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Myanmar Standaard Tijd" #: dlls/tzres/tzres.rc:167 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Myanmar Zomertijd" #: dlls/tzres/tzres.rc:236 dlls/tzres/tzres.rc:237 msgid "Coordinated Universal Time" -msgstr "" +msgstr "UTC" #: dlls/tzres/tzres.rc:130 msgid "India Standard Time" -msgstr "" +msgstr "India Standaard Tijd" #: dlls/tzres/tzres.rc:131 msgid "India Daylight Time" -msgstr "" +msgstr "India Zomertijd" #: dlls/tzres/tzres.rc:124 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Standaardbalk" +msgstr "GTB Standaard Tijd" #: dlls/tzres/tzres.rc:125 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB Zomertijd" #: dlls/tzres/tzres.rc:228 msgid "Turkey Standard Time" -msgstr "" +msgstr "Turkije Standaard Tijd" #: dlls/tzres/tzres.rc:229 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Turkije Zomertijd" #: dlls/tzres/tzres.rc:112 msgid "Fiji Standard Time" -msgstr "" +msgstr "Fiji Standaard Tijd" #: dlls/tzres/tzres.rc:113 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Fiji Zomertijd" #: dlls/tzres/tzres.rc:64 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Centraal Canada Standaard Tijd" #: dlls/tzres/tzres.rc:65 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Centraal Canada Zomertijd" #: dlls/tzres/tzres.rc:218 msgid "Taipei Standard Time" -msgstr "" +msgstr "Taiwan Standaard Tijd" #: dlls/tzres/tzres.rc:219 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Taiwan Zomertijd" #: dlls/tzres/tzres.rc:246 msgid "W. Europe Standard Time" -msgstr "" +msgstr "West-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:247 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "West-Europa Zomertijd" #: dlls/tzres/tzres.rc:158 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Montevideo Standaard Tijd" #: dlls/tzres/tzres.rc:159 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Montevideo Zomertijd" #: dlls/tzres/tzres.rc:190 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Pakistan Standaard Tijd" #: dlls/tzres/tzres.rc:191 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Pakistan Zomertijd" #: dlls/tzres/tzres.rc:68 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Kaukasus Standaard Tijd" #: dlls/tzres/tzres.rc:69 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Kaukasus Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Oost-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:51 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:168 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Noordcentraal-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:169 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Noordcentraal-Azië Zomertijd" #: dlls/tzres/tzres.rc:104 msgid "Eastern Standard Time" -msgstr "" +msgstr "Oostkust Standaard Tijd" #: dlls/tzres/tzres.rc:105 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Oostkust Zomertijd" #: dlls/tzres/tzres.rc:86 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "CST (Mexico)" #: dlls/tzres/tzres.rc:87 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "CST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:44 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Atlantische Standaard Tijd" #: dlls/tzres/tzres.rc:45 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Atlantische tijd Zomertijd" #: dlls/tzres/tzres.rc:162 msgid "Mountain Standard Time" -msgstr "" +msgstr "Mountain Standaard tijd" #: dlls/tzres/tzres.rc:163 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Mountain Zomertijd" #: dlls/tzres/tzres.rc:232 msgid "US Eastern Standard Time" -msgstr "" +msgstr "VS Oost Standaard Tijd" #: dlls/tzres/tzres.rc:233 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "VS Oost Zomertijd" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "&Standard bar" msgid "North Korea Standard Time" -msgstr "&Standaardbalk" +msgstr "Noord Korea Standaard Tijd" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Date and time" msgid "North Korea Daylight Time" -msgstr "Datum en tijd" +msgstr "Noord Korea Zomertijd" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Tasmanië Standaard Tijd" #: dlls/tzres/tzres.rc:221 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Tasmanië Zomertijd" #: dlls/tzres/tzres.rc:72 msgid "Central America Standard Time" -msgstr "" +msgstr "Centraal-Amerika Standaard Tijd" #: dlls/tzres/tzres.rc:73 msgid "Central America Daylight Time" -msgstr "" +msgstr "Centraal-Amerika Zomertijd" #: dlls/tzres/tzres.rc:234 msgid "US Mountain Standard Time" -msgstr "" +msgstr "VS Mountain Standaard Tijd" #: dlls/tzres/tzres.rc:235 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "VS Mountain Zomertijd" #: dlls/tzres/tzres.rc:212 msgid "South Africa Standard Time" -msgstr "" +msgstr "Zuid-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:213 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Zuid-Afrika Zomertijd" #: dlls/tzres/tzres.rc:70 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Centraal Australië Standaard Tijd" #: dlls/tzres/tzres.rc:71 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:214 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Sri Lanka Standaard Tijd" #: dlls/tzres/tzres.rc:215 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Sri Lanka Zomertijd" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Afghanistan Standaard Tijd" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Afghanistan Zomertijd" #: dlls/tzres/tzres.rc:252 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Yakutsk Standaard Tijd" #: dlls/tzres/tzres.rc:253 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Yakutsk Zomertijd" #: dlls/tzres/tzres.rc:198 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "Zuid-Amerika Oost Standaard Tijd" #: dlls/tzres/tzres.rc:199 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "Zuid-Amerika Oost Zomertijd" #: dlls/tzres/tzres.rc:36 msgid "Arab Standard Time" -msgstr "" +msgstr "Arabische Standaard Tijd" #: dlls/tzres/tzres.rc:37 msgid "Arab Daylight Time" -msgstr "" +msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:38 msgid "Arabian Standard Time" -msgstr "" +msgstr "Arabische Standaard Tijd" #: dlls/tzres/tzres.rc:39 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Arabische Zomertijd" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Standard Time" -msgstr "Datum en tijd" +msgstr "Tocantins Standaard Tijd" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Date and time" msgid "Tocantins Daylight Time" -msgstr "Datum en tijd" +msgstr "Tocantins Zomertijd" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" -msgstr "" +msgstr "Rusland Standaard Tijd" #: dlls/tzres/tzres.rc:197 msgid "Russian Daylight Time" -msgstr "" +msgstr "Rusland Zomertijd" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Standard Time" -msgstr "Centraal europees" +msgstr "W-Centraal Australië Standaard Tijd" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "Central European" msgid "Aus Central W. Daylight Time" -msgstr "Centraal europees" +msgstr "W-Centraal Australië Zomertijd" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" -msgstr "" +msgstr "Rome Standaard Tijd" #: dlls/tzres/tzres.rc:195 msgid "Romance Daylight Time" -msgstr "" +msgstr "Rome Zomertijd" #: dlls/tzres/tzres.rc:110 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Ekaterinburg Standaard Tijd" #: dlls/tzres/tzres.rc:111 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Ekaterinburg Zomertijd" #: dlls/tzres/tzres.rc:216 msgid "Syria Standard Time" -msgstr "" +msgstr "Syrië Standaard Tijd" #: dlls/tzres/tzres.rc:217 msgid "Syria Daylight Time" -msgstr "" +msgstr "Syrië Zomertijd" #: dlls/tzres/tzres.rc:46 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Centraal-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:47 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Centraal-Australië Zomertijd" #: dlls/tzres/tzres.rc:122 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Greenwich Standaard Tijd" #: dlls/tzres/tzres.rc:123 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Greenwich Zomertijd" #: dlls/tzres/tzres.rc:230 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Ulaanbaatar Standaard Tijd" #: dlls/tzres/tzres.rc:231 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Ulaanbaatar Zomertijd" #: dlls/tzres/tzres.rc:134 msgid "Israel Standard Time" -msgstr "" +msgstr "Israël Standaard Tijd" #: dlls/tzres/tzres.rc:135 msgid "Israel Daylight Time" -msgstr "" +msgstr "Israël Zomertijd" #: dlls/tzres/tzres.rc:58 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Bangladesh Standaard Tijd" #: dlls/tzres/tzres.rc:59 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Bangladesh Zomertijd" #: dlls/tzres/tzres.rc:200 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "Zuid-Amerika West Standaard Tijd" #: dlls/tzres/tzres.rc:201 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:248 msgid "West Asia Standard Time" -msgstr "" +msgstr "West-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:249 msgid "West Asia Daylight Time" -msgstr "" +msgstr "West-Azië Zomertijd" #: dlls/tzres/tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Alaska Standaard Tijd" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Alaska Zomertijd" #: dlls/tzres/tzres.rc:192 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Paraguay Standaard Tijd" #: dlls/tzres/tzres.rc:193 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Paraguay Zomertijd" #: dlls/tzres/tzres.rc:94 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Datum en tijd" +msgstr "Datumgrens Standaard Tijd" #: dlls/tzres/tzres.rc:95 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Datumgrens Zomertijd" #: dlls/tzres/tzres.rc:142 msgid "Libya Standard Time" -msgstr "" +msgstr "Libië Standaard Tijd" #: dlls/tzres/tzres.rc:143 msgid "Libya Daylight Time" -msgstr "" +msgstr "Libië Zomertijd" #: dlls/tzres/tzres.rc:56 msgid "Bahia Standard Time" -msgstr "" +msgstr "Bahia Standaard Tijd" #: dlls/tzres/tzres.rc:57 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Bahia Zomertijd" #: dlls/tzres/tzres.rc:238 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Venezuela Standaard Tijd" #: dlls/tzres/tzres.rc:239 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Venezuela Zomertijd" #: dlls/tzres/tzres.rc:62 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Standard Time" -msgstr "Datum en tijd" +msgstr "Bougainville Standaard Tijd" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Date and time" msgid "Bougainville Daylight Time" -msgstr "Datum en tijd" +msgstr "Bougainville Zomertijd" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Hawaï Standaard Tijd" #: dlls/tzres/tzres.rc:129 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Hawaï Zomertijd" #: dlls/tzres/tzres.rc:208 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Zuid-Oost-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:209 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Zuid-Oost-Azië Zomertijd" #: dlls/tzres/tzres.rc:174 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Nieuw-Zeeland Standaard Tijd" #: dlls/tzres/tzres.rc:175 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Nieuw-Zeeland Zomertijd" #: dlls/tzres/tzres.rc:34 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Standard Time" -msgstr "Datum en tijd" +msgstr "Aleoeten Standaard Tijd" #: dlls/tzres/tzres.rc:35 -#, fuzzy -#| msgid "Date and time" msgid "Aleutian Daylight Time" -msgstr "Datum en tijd" +msgstr "Aleoeten Zomertijd" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Centraal Brazilië Standaard Tijd" #: dlls/tzres/tzres.rc:77 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Centraal Brazilië Zomertijd" #: dlls/tzres/tzres.rc:60 msgid "Belarus Standard Time" -msgstr "" +msgstr "Wit-Rusland Standaard Tijd" #: dlls/tzres/tzres.rc:61 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Wit-Rusland Zomertijd" #: dlls/tzres/tzres.rc:202 msgid "SA Western Standard Time" -msgstr "" +msgstr "Zuid-Amerika West Standaard Tijd" #: dlls/tzres/tzres.rc:203 msgid "SA Western Daylight Time" -msgstr "" +msgstr "Zuid-Amerika West Zomertijd" #: dlls/tzres/tzres.rc:120 msgid "Greenland Standard Time" -msgstr "" +msgstr "Groenland Standaard Tijd" #: dlls/tzres/tzres.rc:121 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Groenland Zomertijd" #: dlls/tzres/tzres.rc:102 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Datum en tijd" +msgstr "Paaseiland Standaard Tijd" #: dlls/tzres/tzres.rc:103 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Datum en tijd" +msgstr "Paaseiland Zomertijd" #: dlls/tzres/tzres.rc:108 msgid "Egypt Standard Time" -msgstr "" +msgstr "Egypte Standaard Tijd" #: dlls/tzres/tzres.rc:109 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Egypte Zomertijd" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Standard Time (Mexico)" -msgstr "Datum en tijd" +msgstr "EST (Mexico)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Date and time" msgid "Eastern Daylight Time (Mexico)" -msgstr "Datum en tijd" +msgstr "EST Zomertijd (Mexico)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Mauritius Standaard Tijd" #: dlls/tzres/tzres.rc:155 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Mauritius Zomertijd" #: dlls/tzres/tzres.rc:240 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Wladiwostok Standaard Tijd" #: dlls/tzres/tzres.rc:241 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Wladiwostok Zomertijd" #: dlls/tzres/tzres.rc:210 msgid "Singapore Standard Time" -msgstr "" +msgstr "Singapore Standaard Tijd" #: dlls/tzres/tzres.rc:211 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Singapore Zomertijd" #: dlls/tzres/tzres.rc:140 msgid "Korea Standard Time" -msgstr "" +msgstr "Korea Standaard Tijd" #: dlls/tzres/tzres.rc:141 msgid "Korea Daylight Time" -msgstr "" +msgstr "Korea Zomertijd" #: dlls/tzres/tzres.rc:88 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Standard Time" -msgstr "Datum en tijd" +msgstr "Chathameilanden Standaard Tijd" #: dlls/tzres/tzres.rc:89 -#, fuzzy -#| msgid "Date and time" msgid "Chatham Islands Daylight Time" -msgstr "Datum en tijd" +msgstr "Chathameilanden Zomertijd" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" -msgstr "" +msgstr "Oost-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:97 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "Oost-Afrika Zomertijd" #: dlls/tzres/tzres.rc:114 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Standaardbalk" +msgstr "Oost-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:115 msgid "FLE Daylight Time" -msgstr "" +msgstr "Oost-Europa Zomertijd" #: dlls/tzres/tzres.rc:100 msgid "E. South America Standard Time" -msgstr "" +msgstr "Oost Zuid-Amerika Standaard Tijd" #: dlls/tzres/tzres.rc:101 msgid "E. South America Daylight Time" -msgstr "" +msgstr "Oost Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:82 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Central Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:83 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Central Pacific Zomertijd" #: dlls/tzres/tzres.rc:244 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "West Centraal-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:245 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "West Centraal-Afrika Zomertijd" #: dlls/tzres/tzres.rc:184 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Pacific Zuid-Amerika Stand. Tijd" #: dlls/tzres/tzres.rc:185 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Pacific Zuid-Amerika Zomertijd" #: dlls/tzres/tzres.rc:98 msgid "E. Australia Standard Time" -msgstr "" +msgstr "Oost-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:99 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "Oost-Australië Zomertijd" #: dlls/tzres/tzres.rc:242 msgid "W. Australia Standard Time" -msgstr "" +msgstr "West-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:243 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "West-Australië Zomertijd" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -11257,7 +10742,7 @@ msgstr "Veiligheidswaarschuwing" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "Wilt U deze software installeren?" +msgstr "Wilt u deze software installeren?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -11351,203 +10836,159 @@ msgstr "Ov&erige vensters..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Overloop" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Onvoldoende geheugen beschikbaar." +msgstr "Onvoldoende geheugen beschikbaar" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Deze matrix ligt vast of is tijdelijk vergrendeld" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Datatype komt niet overeen.\n" +msgstr "Type komt niet overeen" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "I/O device-fout.\n" +msgstr "I/O apparaatfout" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Bestand bestaat al.\n" +msgstr "Bestand bestaat al" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Schijf vol.\n" +msgstr "Schijf vol" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Te veel open bestanden.\n" +msgstr "Te veel bestanden" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Toegang geweigerd.\n" +msgstr "Toegang geweigerd" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Fout bij toegang tot pad/bestand" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Locatie niet gevonden.\n" +msgstr "Locatie niet gevonden" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(Geen waarde ingesteld)" +msgstr "De objectvariabele is niet ingesteld" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Ongeldige gebruiker-buffer.\n" +msgstr "Ongeldig gebruik van Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Kan het tijdelijke bestand niet maken" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Automatiseringsserver kan het object niet creëren" +msgstr "ActiveX-onderdeel kan geen object maken" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Dit object ondersteunt deze actie niet" +msgstr "Automatisering wordt niet ondersteund door deze klasse" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" +"Kan een bestandsnaam of klassenaam niet vinden tijdens een " +"automatiseringsbewerking" -#: dlls/vbscript/vbscript.rc:51 -#, fuzzy #| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Dit object ondersteunt deze actie niet" +msgstr "Benoemde argumenten worden niet ondersteund door het object" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Dit object ondersteunt deze actie niet" +msgstr "De huidige landinstellingen worden niet ondersteund door het object" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Element niet gevonden.\n" +msgstr "Kan benoemd argument niet vinden" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Onjuist aantal argumenten of ongeldige eigenschappentoewijzing" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Schending objectklassedefinitie" +msgstr "Dit object is geen collectie" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Opgegeven besturingselement niet gevonden in bericht" +msgstr "Kan opgegeven DLL-functie niet vinden" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"Variabele maakt gebruik van een automatiseringstype dat niet in VBScript wordt " +"ondersteund" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "De externe servercomputer bestaat niet of is niet beschikbaar" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Ongeldige of niet-gekwalificeerde verwijzing" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Compilatiefout Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Runtimefout Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 -#, fuzzy -#| msgid "Hide" msgid "Hide %@" -msgstr "Verbergen" +msgstr "Verbergen %@" #: dlls/winemac.drv/winemac.rc:35 -#, fuzzy -#| msgid "Other" msgid "Hide Others" -msgstr "Anders" +msgstr "Verberg Anderen" #: dlls/winemac.drv/winemac.rc:36 -#, fuzzy -#| msgid "Show" msgid "Show All" -msgstr "Weergeven" +msgstr "Alles Weergeven" #: dlls/winemac.drv/winemac.rc:37 msgid "Quit %@" -msgstr "" +msgstr "Afsluiten %@" #: dlls/winemac.drv/winemac.rc:38 msgid "Quit" -msgstr "" +msgstr "Afsluiten" #: dlls/winemac.drv/winemac.rc:40 -#, fuzzy -#| msgid "&Window" msgid "Window" -msgstr "&Venster" +msgstr "Venster" #: dlls/winemac.drv/winemac.rc:41 -#, fuzzy -#| msgid "&Minimize" msgid "Minimize" -msgstr "&Minimaliseren" +msgstr "Minimaliseren" #: dlls/winemac.drv/winemac.rc:42 -#, fuzzy -#| msgid "Zoom in" msgid "Zoom" -msgstr "Inzoomen" +msgstr "In-/uitzoomen" #: dlls/winemac.drv/winemac.rc:43 msgid "Enter Full Screen" -msgstr "" +msgstr "Volledig scherm openen" #: dlls/winemac.drv/winemac.rc:44 -#, fuzzy -#| msgid "&Bring To Front" msgid "Bring All to Front" -msgstr "Naar de &voorgrond halen" +msgstr "Alles naar de voorgrond halen" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" @@ -11558,10 +10999,8 @@ msgid "Duplex:" msgstr "Dubbelzijdig:" #: dlls/wineps.drv/wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Eigenschappen" +msgstr "Eigenschappen" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -11590,7 +11029,7 @@ msgstr "LAN Verbinding" #: dlls/wininet/wininet.rc:29 msgid "The certificate is issued by an unknown or untrusted publisher." msgstr "" -"Het certificaat is uitgegeven door een onbekende on onbetrouwbare uitgever." +"Het certificaat is uitgegeven door een onbekende of onbetrouwbare uitgever." #: dlls/wininet/wininet.rc:30 msgid "The date on the certificate is invalid." @@ -11608,99 +11047,83 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Ingangsdatum" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Beveiliging" +msgstr "Beveiligingsprotocol" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Handtekening" +msgstr "Type Handtekening" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Versleutelen Bestand Systeem" +msgstr "Type Versleuteling" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Privacygraad" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bits" #: dlls/wininet/winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Service aanvraag timeout.\n" +msgstr "Er is een time-out voor deze opdracht opgetreden.\n" #: dlls/wininet/winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Er heeft zich een fout voorgedaan met de printer." +msgstr "Er is een interne fout opgetreden.\n" #: dlls/wininet/winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Pad is ongeldig.\n" +msgstr "De URL is ongeldig.\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "Het URL-schema wordt niet herkent of ondersteund.\n" #: dlls/wininet/winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "De gebruikersnaam kon niet worden gevonden.\n" +msgstr "De servernaam kan niet worden omgezet.\n" #: dlls/wininet/winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Het gebruikersprofiel is ongeldig.\n" +msgstr "De gevraagde bewerking is ongeldig.\n" #: dlls/wininet/winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"De bewerking is geannuleerd, meestal omdat de ingang waarop de aanvraag actief " +"was, werd gesloten voordat de bewerking was voltooid.\n" #: dlls/wininet/winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Het profiel kon niet worden toegevoegd.\n" +msgstr "Kan het gevraagde item niet vinden.\n" #: dlls/wininet/winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kan geen verbinding maken met LDAP-server" +msgstr "De poging om met de server te verbinden is mislukt.\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "De verbinding met de server is verbroken.\n" #: dlls/wininet/winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"De datum op het SSL certificaat van de server is fout. Het certificaat is " +"verlopen.\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "De naam van het SSL-certificaat (host name) is onjuist.\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -11717,7 +11140,7 @@ msgstr "" #: dlls/winmm/winmm.rc:35 msgid "The driver was not enabled." -msgstr "De driver is niet geactiveerd." +msgstr "Het stuurprogramma is niet geactiveerd." #: dlls/winmm/winmm.rc:36 msgid "" @@ -11733,7 +11156,7 @@ msgstr "De gespecificeerde apparaatverwijzing is ongeldig." #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "Er is geen driver geïnstalleerd op uw systeem!" +msgstr "Er is geen stuurprogramma geïnstalleerd op uw systeem!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" @@ -11741,15 +11164,16 @@ msgid "" "increase available memory, and then try again." msgstr "" "Er is niet genoeg geheugen beschikbaar voor deze taak. Sluit enkele " -"programma's af om meer geheugen vrij te krijgen en doe dan nog een poging." +"programma's af om meer geheugen vrij te krijgen en probeer opnieuw." #: dlls/winmm/winmm.rc:40 msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." msgstr "" -"Deze functie wordt niet ondersteund. Gebruik de 'Capabilities' functie om " -"uit te zoeken welke toepassingen en boodschappen de driver ondersteund." +"Deze functie wordt niet ondersteund. Gebruik de functie 'Mogelijkheden' om " +"uit te zoeken welke toepassingen en boodschappen het stuurprogramma " +"ondersteund." #: dlls/winmm/winmm.rc:41 msgid "An error number was specified that is not defined in the system." @@ -11757,11 +11181,11 @@ msgstr "Een niet binnen het systeem bekend foutnummer werd gebruikt." #: dlls/winmm/winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "Een ongeldige vlag werd aan een systeemfunctie gevoerd." +msgstr "Er is een ongeldige vlag doorgegeven aan een systeemfunctie." #: dlls/winmm/winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "Een systeemfunctie kreeg een ongeldige parameter te eten." +msgstr "Er is een ongeldige parameter aan een systeemfunctie doorgegeven." #: dlls/winmm/winmm.rc:46 msgid "" @@ -11769,7 +11193,7 @@ msgid "" "Capabilities function to determine the supported formats." msgstr "" "Het aangegeven formaat wordt niet ondersteund of geconverteerd. Gebruik de " -"Eigenschappen functie om de ondersteunde formaten te vinden." +"'Mogelijkheden' functie om de ondersteunde formaten te vinden." #: dlls/winmm/winmm.rc:47 dlls/winmm/winmm.rc:53 msgid "" @@ -11784,8 +11208,8 @@ msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"De Wave Header was niet aanwezig. Gebruik de 'Prepare' functie om de Header " -"te genereren en probeer het dan opnieuw." +"De waveheader is niet voorbereid. Gebruik de functie 'Voorbereiden' om de " +"header voor te bereiden en probeer het opnieuw." #: dlls/winmm/winmm.rc:49 msgid "" @@ -11793,51 +11217,47 @@ msgid "" "and then try again." msgstr "" "Kan het apparaat niet openen zonder de WAVE_ALLOWSYNC vlag. Zet de vlag en " -"probeer opnieuw." +"probeer het opnieuw." #: dlls/winmm/winmm.rc:52 msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"De MIDI Header was niet aanwezig. Gebruik de 'Prepare' functie om de Header " -"te genereren en probeer het dan opnieuw." +"De MIDI-header was niet voorbereid. Gebruik de functie 'Voorbereiden' om de " +"header voor te bereiden en probeer het opnieuw." #: dlls/winmm/winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"Er is geen MIDI Map gevonden. Er zou een driver probleem kunnen zijn of de " -"MIDIMAP.CFG file is verminkt of afwezig." +"Er is geen MIDI Map gevonden. Er zou een stuurprogramma probleem kunnen zijn " +"of het MIDIMAP.CFG bestand is verminkt of afwezig." #: dlls/winmm/winmm.rc:55 msgid "" "The port is transmitting data to the device. Wait until the data has been " "transmitted, and then try again." msgstr "" -"De poort is bezig data ter versturen naar het apparaat. Wacht totdat alle " -"data is verstuurd en probeer het dan opnieuw." +"De poort is bezig informatie te versturen naar het apparaat. Wacht totdat " +"alle data is verstuurd en probeer het dan opnieuw." #: dlls/winmm/winmm.rc:56 dlls/winmm/winmm.rc:129 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "De huidige MIDI Mapper setup verwijst naar een MIDI-apparaat dat niet op het " -"systeem aanwezig is. Gebruik MIDI Mapper om de instellingen aan te passen." +"systeem aanwezig is." #: dlls/winmm/winmm.rc:57 msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"De huidige MIDI setup is beschadigd. Kopieer de originele MIDIMAP.CFG file " -"naar de Windows SYSTEM directory en probeer het daarna weer." +"De huidige MIDI setup is beschadigd. Kopieer het originele MIDIMAP.CFG bestand " +"naar de Windows SYSTEM map en probeer het dan opnieuw." #: dlls/winmm/winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." @@ -11858,7 +11278,7 @@ msgid "" "There is a problem with your media device. Make sure it is working correctly " "or contact the device manufacturer." msgstr "" -"Er is een probleem met uw media-apparaat. Controleer of hij correct werkt of " +"Er is een probleem met uw media-apparaat. Controleer of het correct werkt of " "neem contact op met de leverancier." #: dlls/winmm/winmm.rc:64 @@ -11870,14 +11290,15 @@ msgid "" "The device name is already being used as an alias by this application. Use a " "unique alias." msgstr "" -"Een apparaat met die naam is al als alias in gebruik door deze applicatie. " +"Het apparaat met die naam is al als alias in gebruik door deze applicatie. " "Gebruik een unieke alias." #: dlls/winmm/winmm.rc:67 msgid "" "There is an undetectable problem in loading the specified device driver." msgstr "" -"Er is een onbekende fout ontstaan tijdens het laden van de apparaatdriver." +"Er is een onherkenbaar probleem opgetreden tijdens het laden van het " +"opgegeven apparaatstuurprogramma." #: dlls/winmm/winmm.rc:68 msgid "No command was specified." @@ -11888,36 +11309,36 @@ msgid "" "The output string was too large to fit in the return buffer. Increase the " "size of the buffer." msgstr "" -"De output string was te groot om in de antwoordbuffer te passen. Vergroot de " -"buffer." +"De uitvoerreeks was te groot om in de antwoordbuffer te passen. Vergroot de " +"omvang van de buffer." #: dlls/winmm/winmm.rc:70 msgid "" "The specified command requires a character-string parameter. Please provide " "one." msgstr "" -"De gegeven opdracht vereist een character-stringparameter. Lever er s.v.p. " -"één aan." +"Voor de opgegeven opdracht moet een parameter worden ingevoerd die uit een " +"tekenreeks bestaat. Voer een tekenreeks in." #: dlls/winmm/winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "De gegeven integer is niet geldig bij dit commando." +msgstr "De opgegeven integer is niet geldig voor deze opdracht." #: dlls/winmm/winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"De apparaat driver retourneerde een ongeldige waarde. Vraag de fabrikant om " -"een andere driver." +"Het stuurprogramma van het apparaat gaf een ongeldige waarde terug. Vraag de " +"fabrikant om een ander stuurprogramma." #: dlls/winmm/winmm.rc:73 msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"Er is een probleem met de apparaat driver. Vraag de fabrikant om een andere " -"driver." +"Er is een probleem met het stuurprogramma van het apparaat. Vraag de " +"fabrikant om een ander stuurprogramma." #: dlls/winmm/winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." @@ -11932,11 +11353,11 @@ msgid "" "Cannot find the specified file. Make sure the path and filename are correct." msgstr "" "Kan het opgegeven bestand niet vinden. Zorg ervoor dat het pad en de " -"bestandsnaam correct zijn." +"bestandsnaam goed zijn." #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." -msgstr "De apparaatdriver is niet gereed." +msgstr "Het stuurprogramma is niet gereed." #: dlls/winmm/winmm.rc:78 msgid "A problem occurred in initializing MCI. Try restarting Windows." @@ -11949,19 +11370,19 @@ msgid "" "There is a problem with the device driver. The driver has closed. Cannot " "access error." msgstr "" -"Er is een probleem met de apparaatdriver. Daarom is de driver afgesloten. " -"Derhalve een toegangsfout." +"Er is een probleem met het stuurprogramma. Het stuurprogramma is afgesloten. " +"Kan geen toegang krijgen tot de fout." #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "Kan 'all' niet gebruiken als apparaatnaam bij het opgegeven commando." +msgstr "Kan 'all' niet gebruiken als apparaatnaam bij de opgegeven opdracht." #: dlls/winmm/winmm.rc:81 msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"In meer dan één apparaat zijn fouten opgetreden. Geef elk commando en " +"In meer dan één apparaat zijn fouten opgetreden. Geef elke opdracht en " "apparaat apart op om te achterhalen welke apparaten de fout veroorzaakten." #: dlls/winmm/winmm.rc:82 @@ -11971,7 +11392,7 @@ msgstr "" #: dlls/winmm/winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "De gegeven parameter is buiten het bereik van het opgegeven commando." +msgstr "De gegeven parameter is buiten het bereik van het opgegeven opdracht." #: dlls/winmm/winmm.rc:84 msgid "The specified parameters cannot be used together." @@ -11982,19 +11403,15 @@ msgid "" "Cannot save the specified file. Make sure you have enough disk space or are " "still connected to the network." msgstr "" -"Kan de opgegeven file niet opslaan. Zorg ervoor dat er voldoende " +"Kan het opgegeven bestand niet opslaan. Zorg ervoor dat er voldoende " "schijfruimte is of dat u nog steeds met het netwerk verbonden bent." #: dlls/winmm/winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"Kan het opgegeven apparaat niet vinden. Verzeker u ervan dat het correct " +"Kan het opgegeven apparaat niet vinden. Verzeker u ervan dat het " "geïnstalleerd is en dat de apparaatnaam correct is opgegeven." #: dlls/winmm/winmm.rc:87 @@ -12002,7 +11419,7 @@ msgid "" "The specified device is now being closed. Wait a few seconds, and then try " "again." msgstr "" -"Het opgegeven apparaat wordt nu gesloten. Wacht s.v.p. enkele seconden en " +"Het opgegeven apparaat wordt nu gesloten. Wacht enkele seconden en " "probeer het dan opnieuw." #: dlls/winmm/winmm.rc:88 @@ -12015,23 +11432,23 @@ msgstr "" #: dlls/winmm/winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "De opgegeven parameter is ongeldig voor dit commando." +msgstr "De opgegeven parameter is ongeldig voor deze opdracht." #: dlls/winmm/winmm.rc:90 msgid "" "The device driver is already in use. To share it, use the 'shareable' " "parameter with each 'open' command." msgstr "" -"De apparaatdriver is al in gebruik. Om het te delen, gebruik de 'deelbaar' " -"parameter met elk 'open' commando." +"Het stuurprogramma is al in gebruik. Om het te delen, moet u de parameter " +"'deelbaar' bij elke opdracht 'openen' gebruiken." #: dlls/winmm/winmm.rc:91 msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"Het gegeven commando vereist een alias, bestand, driver of apparaatnaam. " -"Geeft u er svp een in." +"De opgegeven opdracht vereist een alias, bestand, stuurprogramma of " +"apparaatnaam. Voer er één in." #: dlls/winmm/winmm.rc:92 msgid "" @@ -12046,13 +11463,13 @@ msgid "" "A closing double-quotation mark is missing from the parameter value. Please " "supply one." msgstr "" -"Een afsluitende dubbele apostrof ontbreekt van de parameter waarde. Geeft u " -"er s.v.p. één op." +"Een dubbele aanhalingsteken sluiten ontbreekt bij de parameter waarde. Voer " +"dit aanhalingsteken in." #: dlls/winmm/winmm.rc:94 msgid "A parameter or value was specified twice. Only specify it once." msgstr "" -"Een parameter of waarde werd dubbel opgegeven. Doe dat s.v.p. maar één keer." +"Een parameter of waarde werd dubbel opgegeven. Geef deze slechts één keer op." #: dlls/winmm/winmm.rc:95 msgid "" @@ -12068,7 +11485,7 @@ msgstr "Een leeg parameterblok werd doorgegeven aan MCI." #: dlls/winmm/winmm.rc:97 msgid "Cannot save an unnamed file. Supply a filename." -msgstr "Kan een bestand zonder naam niet opslaan. Geef een bestandsnaam s.v.p." +msgstr "Kan een bestand zonder naam niet opslaan. Geef een bestandsnaam op." #: dlls/winmm/winmm.rc:98 msgid "You must specify an alias when using the 'new' parameter." @@ -12088,77 +11505,75 @@ msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"Kan de opgegeven commando's niet in deze volgorde uitvoeren. Corrigeer de " -"commandoreeks en probeer opnieuw." +"Kan de opgegeven opdrachten niet in deze volgorde uitvoeren. Corrigeer de " +"opdrachten reeks en probeer het opnieuw." #: dlls/winmm/winmm.rc:102 msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"Kan het opgegeven commando niet uitvoeren op een automatisch geopend " -"apparaat. Wacht totdat het apparaat is afgesloten en probeer het dan opnieuw." +"Kan de opgegeven opdracht niet uitvoeren op een automatisch geopend apparaat " +"Wacht totdat het apparaat is afgesloten en probeer het dan opnieuw." #: dlls/winmm/winmm.rc:103 msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"De bestandsnaam is ongeldig. Zorg ervoor dat de bestandsnaam aan het 8.3 " -"formaat voldoet." +"De bestandsnaam is ongeldig. Zorg ervoor dat de bestandsnaam niet langer is " +"dan 8 tekens, gevolgd door een punt en een extensie." #: dlls/winmm/winmm.rc:104 msgid "" "Cannot specify extra characters after a string enclosed in quotation marks." -msgstr "" -"Het is niet mogelijk om extra lettertekens toe te voegen na een string in " -"aanhalingstekens." +msgstr "Kan geen extra tekens opgeven na een reeks tussen aanhalingstekens." #: dlls/winmm/winmm.rc:105 msgid "" "The specified device is not installed on the system. Use the Drivers option " "in Control Panel to install the device." msgstr "" -"Het opgegeven apparaat is niet geïnstalleerd op het systeem. Gebruik de " -"'Drivers'-optie in het Configuratiescherm om het apparaat te installeren." +"Dit apparaat is niet geïnstalleerd op het systeem. Ga naar het onderdeel " +"Hardware van het Configuratiescherm om het apparaat te installeren." #: dlls/winmm/winmm.rc:106 msgid "" "Cannot access the specified file or MCI device. Try changing directories or " "restarting your computer." msgstr "" -"Kan het opgegeven bestand of MCI-apparaat niet openen. Probeer de directory " -"te wijzigen of de computer opnieuw te starten." +"Kan het opgegeven bestand of MCI-apparaat niet openen. Probeer de map te " +"wijzigen of de computer opnieuw te starten." #: dlls/winmm/winmm.rc:107 msgid "" "Cannot access the specified file or MCI device because the application " "cannot change directories." msgstr "" -"Kan het opgegeven bestand of MCI-apparaat niet openen omdat de applicatie de " -"directory niet kan wijzigen." +"Kan het opgegeven bestand of MCI-apparaat niet openen, omdat het programma " +"niet van map kan veranderen." #: dlls/winmm/winmm.rc:108 msgid "" "Cannot access specified file or MCI device because the application cannot " "change drives." msgstr "" -"Kan het opgegeven bestand of MCI-apparaat niet openen omdat de applicatie de " -"directory niet kan wijzigen." +"Kan het opgegeven bestand of MCI-apparaat niet openen, omdat het programma " +"niet van schijf kan veranderen." #: dlls/winmm/winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." -msgstr "Geef een apparaat of driver naam op met minder dan 79 lettertekens." +msgstr "Geef een apparaat of stuurprogramma op met minder dan 79 tekens." #: dlls/winmm/winmm.rc:110 msgid "Specify a device or driver name that is less than 69 characters." -msgstr "Geef een apparaat of driver naam op met minder dan 79 lettertekens." +msgstr "Geef een apparaat of stuurprogramma op met minder dan 69 tekens." #: dlls/winmm/winmm.rc:111 msgid "" "The specified command requires an integer parameter. Please provide one." msgstr "" -"Het gegeven commando vereist een integer parameter. Geef er s.v.p. één." +"De opgegeven opdracht vereist een geheel getal als parameter. Voer er één in." #: dlls/winmm/winmm.rc:112 msgid "" @@ -12208,8 +11623,8 @@ msgid "" "the Drivers option to install the wave device." msgstr "" "Er is momenteel geen WAVE-apparaat geïnstalleerd dat bestanden in het " -"huidige formaat kan afspelen. Gebruik de 'Drivers' optie om zo'n WAVE-" -"apparaat te installeren." +"huidige formaat kan afspelen. Gebruik het onderdeel Hardware om het " +"WAVE-apparaat te installeren." #: dlls/winmm/winmm.rc:119 msgid "" @@ -12225,8 +11640,8 @@ msgid "" "the Drivers option to install the wave device." msgstr "" "Er is momenteel geen WAVE-apparaat geïnstalleerd dat bestanden in het " -"huidige formaat kan opnemen. Gebruik de 'Drivers' optie om zo'n WAVE-" -"apparaat te installeren." +"huidige formaat kan opnemen. Gebruik het onderdeel Hardware om het " +"WAVE-apparaat te installeren." #: dlls/winmm/winmm.rc:121 msgid "" @@ -12241,14 +11656,10 @@ msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"Van tijdsformaten van 'song pointer' en SMPTE kan er maar een in gebruik " +"Van de tijdsformaten \"song pointer\" en SMPTE kan er maar één in gebruik " "zijn. U kunt ze niet beide tegelijkertijd gebruiken." #: dlls/winmm/winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -12261,25 +11672,20 @@ msgid "" "The specified MIDI device is not installed on the system. Use the Drivers " "option from the Control Panel to install a MIDI device." msgstr "" -"Het opgegeven MIDI Mapper apparaat is niet op het systeem geïnstalleerd. " -"Gebruik de 'MIDI mapper'-optie in het Configuratiescherm om het te " -"installeren." +"Het opgegeven MIDI-apparaat is niet op het systeem geïnstalleerd. Gebruik " +"het onderdeel Hardware in het Configuratiescherm om het te installeren." #: dlls/winmm/winmm.rc:130 msgid "An error occurred with the specified port." msgstr "Er is een fout opgetreden bij de opgegeven poort." #: dlls/winmm/winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." msgstr "" -"Alle multimedia timers zijn in gebruik door andere applicaties. Sluit een " -"van deze applicaties, probeer het dan opnieuw." +"Alle multimedia timers zijn in gebruik door andere programma's. Sluit één van " +"deze programma's en probeer het dan opnieuw." #: dlls/winmm/winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." @@ -12290,8 +11696,8 @@ msgid "" "The system has no installed MIDI devices. Use the Drivers option from the " "Control Panel to install a MIDI driver." msgstr "" -"Het systeem heeft geen MIDI apparaten geïnstalleerd. Gebruik de 'Drivers'-" -"optie in het Configuratiescherm om een MIDI-apparaat te installeren." +"Op het systeem zijn geen MIDI apparaten geïnstalleerd. Gebruik het onderdeel " +"Hardware in het Configuratiescherm om een MIDI-apparaat te installeren." #: dlls/winmm/winmm.rc:122 msgid "There is no display window." @@ -12307,7 +11713,7 @@ msgid "" "check your disk or network connection." msgstr "" "Kan het opgegeven bestand niet lezen. Controleer of het bestand nog steeds " -"bestaat, en controleer de verbinding naar de disk of het netwerk." +"bestaat. Of controleer de schijf of de verbinding met het netwerk." #: dlls/winmm/winmm.rc:125 msgid "" @@ -12315,27 +11721,23 @@ msgid "" "are still connected to the network." msgstr "" "Kan het opgegeven bestand niet schrijven. Controleer of er voldoende " -"schijfruimte is, en controleer de verbinding met het netwerk." +"schijfruimte is of controleer de verbinding met het netwerk." #: dlls/winmm/winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Wine-Mono-Installatie" +msgstr "Wine-Geluidstoewijzing" #: dlls/winmm/winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "kolom" +msgstr "Volume" #: dlls/winmm/winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Hoofdvolume" #: dlls/winmm/winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Dempen" #: dlls/winspool.drv/winspool.rc:37 msgid "Print to File" @@ -12367,7 +11769,7 @@ msgstr "Protocolfout" #: dlls/wldap32/wldap32.rc:35 msgid "Time Limit Exceeded" -msgstr "Tijdlimiet overschreden" +msgstr "Tijdslimiet overschreden" #: dlls/wldap32/wldap32.rc:36 msgid "Size Limit Exceeded" @@ -12410,10 +11812,8 @@ msgid "Confidentiality Required" msgstr "Vertrouwelijkheid vereist" #: dlls/wldap32/wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Bezig af te sluiten.\n" +msgstr "SASL-binding wordt uitgevoerd" #: dlls/wldap32/wldap32.rc:48 msgid "No Such Attribute" @@ -12529,7 +11929,7 @@ msgstr "Betreft meerdere DSA's" #: dlls/wldap32/wldap32.rc:113 msgid "Server Down" -msgstr "Server plat" +msgstr "Server buiten bedrijf" #: dlls/wldap32/wldap32.rc:114 msgid "Local Error" @@ -12699,18 +12099,14 @@ msgid "" msgstr "" "CALL <batchbestandsnaam> wordt gebruikt binnen een batchbestand om\n" "opdrachten uit een ander batchbestand aan te roepen. Als het batchbestand\n" -"bestaat keert de controle terug naar het bestand dat het aanriep. De CALL\n" +"bestaat, keert de controle terug naar het bestand dat het aanriep. De CALL\n" "opdracht kan parameters meegeven aan de aan te roepen procedure.\n" "\n" -"Veranderingen m.b.t , map, omgevingsvariabelen, etc die tot stand komen\n" +"Veranderingen m.b.t map, omgevingsvariabelen, enz. die tot stand komen\n" "binnen een aangeroepen procedure worden geërfd door de aanroepende\n" "procedure.\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -12718,8 +12114,6 @@ msgstr "" "CD <mapnaam> is de korte versie van CHDIR. Het wijzigt de huidige map.\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <mapnaam> wijzigt de huidige map.\n" @@ -12741,8 +12135,7 @@ msgstr "DATE toont of wijzigt de systeemdatum.\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "" -"DEL <bestandsnaam> verwijdert een bestand of een verzameling bestanden.\n" +msgstr "DEL <bestandsnaam> verwijdert één of meerdere bestanden.\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" @@ -12771,15 +12164,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "" -"ERASE <bestandsnaam> verwijdert een bestand of een verzameling bestanden.\n" +msgstr "ERASE <bestandsnaam> verwijdert één of meerdere bestanden.\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -12791,6 +12178,9 @@ msgstr "" "een verzameling bestanden.\n" "\n" "Syntax: FOR %variabele IN (verzameling) DO opdracht\n" +"\n" +"Het % teken moet verdubbeld worden als FOR in een batch bestand wordt\n" +"gebruikt.\n" #: programs/cmd/cmd.rc:97 msgid "" @@ -12968,13 +12358,12 @@ msgstr "" "'PROMPT tekenreeks'.\n" #: programs/cmd/cmd.rc:173 -#, fuzzy msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" "Een opdrachtregel die begint met REM (gevold door een spatie) wordt niet\n" -"uitgevoerd, en kan daarom worden gebruikt als een commentaar-regel in een\n" +"uitgevoerd en kan daarom worden gebruikt als een commentaar-regel in een\n" "batchbestand.\n" #: programs/cmd/cmd.rc:176 @@ -12987,19 +12376,14 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <bestandsnaam> hernoemt een bestand.\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <mapnaam> is de korte versie van RMDIR. Het verwijdert een map.\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <mapnaam> verwijdert een map.\n" #: programs/cmd/cmd.rc:229 -#, fuzzy msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13096,12 +12480,11 @@ msgstr "" "/abovenormal Start het programma in \"abovenormal\" prioriteit op.\n" "/belownormal Start het programma in \"belownormal\" prioriteit op.\n" "/node n Start het programma op de gespecificeerde NUMA node.\n" -"/affinity mask Start het program met het gespecificeerde affiniteitsmasker\n" -" mask.\n" +"/affinity mask Start het program met het gespecificeerde affiniteitsmasker.\n" "/wait Wacht tot het gestarte programma beeindigd is, dan afsluiten\n" " met de exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" -" windows explorer.\n" +" Windows Verkenner.\n" "/ProgIDOpen Open een document met het specificeerde progID.\n" "/? Toon deze hulp en eindig.\n" @@ -13110,9 +12493,8 @@ msgid "TIME sets or shows the current system time.\n" msgstr "TIME wijzigt of toont de systeemtijd.\n" #: programs/cmd/cmd.rc:240 -#, fuzzy msgid "TITLE <string> sets the window title for the cmd window.\n" -msgstr "Wijzigt de naam van het cmd-venster, syntax: TITLE [tekenreeks]\n" +msgstr "TITLE <tekenreeks> wijzigt cd naam van het cmd-venster.\n" #: programs/cmd/cmd.rc:244 msgid "" @@ -13123,7 +12505,6 @@ msgstr "" "wordt niet gecontroleerd of het bestand leesbare tekst bevat.\n" #: programs/cmd/cmd.rc:253 -#, fuzzy msgid "" "VERIFY is used to set, clear or test the verify flag. Valid forms are:\n" "\n" @@ -13175,26 +12556,19 @@ msgstr "" "omgevingsvariabelen worden teruggezet.\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <mapnaam> bewaart de huidige map op een stapel, en verandert dan de\n" +"PUSHD <mapnaam> bewaart de huidige map op een stapel en verandert dan de\n" "huidige map naar de opgegeven naam.\n" #: programs/cmd/cmd.rc:278 -#, fuzzy msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "" -"POPD verandert de huidige map naar de meest recente die op de stapel werd\n" -"gezet met PUSHD.\n" +"POPD verandert de huidige map naar de laatste die is opgeslagen met PUSHD.\n" #: programs/cmd/cmd.rc:288 -#, fuzzy msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13205,7 +12579,7 @@ msgid "" "Specifying no file type after the equal sign removes the current\n" "association, if any.\n" msgstr "" -"ASSOC toont of wijzigt associaties met bestandsextensies\n" +"ASSOC toont of wijzigt bestandsextensies associaties.\n" "\n" "Gebruik: ASSOC [.ext[=[bestandsType]]]\n" "\n" @@ -13215,7 +12589,6 @@ msgstr "" "verwijderd, als deze bestaat.\n" #: programs/cmd/cmd.rc:300 -#, fuzzy msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13228,8 +12601,8 @@ msgid "" "Specifying no open command after the equal sign removes the command string\n" "associated to the specified file type.\n" msgstr "" -"FTYPE toont of wijzigt 'open' opdrachten die met bestandstype zijn " -"geassocieerd\n" +"FTYPE toont of wijzigt 'open' opdrachten die geassocieerd zijn met\n" +"bestandstypen.\n" "\n" "Gebruik: FTYPE [bestandsType[=[openOpdracht]]]\n" "\n" @@ -13269,6 +12642,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Maak een symbolische bestandskoppeling.\n" +"\n" +"Gebruik: MKLINK [opties] koppelnaam doel\n" +"\n" +"Opties:\n" +"/d Een symbolische mapkoppeling maken.\n" +"/h Een harde koppeling maken.\n" +"/j Een mapsplitsing maken.\n" +"\"koppelnaam\" is de naam van de nieuwe symbolische koppeling.\n" +"\"doel\" is het pad waarnaar de \"koppelnaam\" naar verwijst.\n" #: programs/cmd/cmd.rc:312 msgid "" @@ -13279,7 +12662,7 @@ msgstr "" "of de schil van waaruit cmd werd gestart.\n" #: programs/cmd/cmd.rc:364 -#, fuzzy + msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13331,7 +12714,7 @@ msgstr "" "COPY\t\tKopieer een bestand\n" "CTTY\t\tWijzig het invoer-/uitvoerapparaat\n" "DATE\t\tToon of wijzig de systeemdatum\n" -"DEL (ERASE)\tVerwijder een bestand of een verzameling van bestanden\n" +"DEL (ERASE)\tVerwijder één of meerdere bestanden\n" "DIR\t\tToon de inhoud van een map\n" "ECHO\t\tKopieer tekst direct naar het uitvoerapparaat\n" "ENDLOCAL\tBeëindig localisatie van omgevingswijzigingen in een batchbestand\n" @@ -13339,10 +12722,10 @@ msgstr "" "\t\tgeassocieerd\n" "HELP\t\tToon een korte uitleg over een onderwerp\n" "MD (MKDIR)\tMaak een map\n" -"MORE\t\tDisplay output in pages\n" -"MOVE\t\tVerplaats een bestand, een verzameling bestanden of een map\n" +"MORE\t\tLaat de uitvoer in verschillende pagina's zien\n" +"MOVE\t\tVerplaats bestand(en) of een map\n" "PATH\t\tWijzig of toon het zoekpad\n" -"PAUSE\t\tOnderbreek uitvoering van een batchbestand\n" +"PAUSE\t\tOnderbreek de uitvoering van een batchbestand\n" "POPD\t\tWijzig de huidige map in de laatste met PUSHD opgeslagen map\n" "PROMPT\t\tWijzig de prompt\n" "PUSHD\t\tWijzig de huidige map in een nieuwe en sla de huidige map op\n" @@ -13350,7 +12733,9 @@ msgstr "" "RD (RMDIR)\tVerwijder een map\n" "SET\t\tWijzig of toon de omgevingsvariabelen\n" "SETLOCAL\tBegin localisatie van omgevingswijzigingen in een batchbestand\n" -"TIME\t\tWijzig of toon de systeemtijd\n" +"START\t\tStart een programma of open een document met het geassocieerde\n" +"\t\tprogramma\n" +"TIME\t\tToon of wijzig de systeemtijd\n" "TITLE\t\tWijzig de vensternaam van de CMD-sessie\n" "TYPE\t\tToon de inhoud van een tekstbestand\n" "VER\t\tToon de versie van CMD\n" @@ -13362,7 +12747,7 @@ msgstr "" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "Bent u zeker?" +msgstr "Weet u het zeker?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:50 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13380,7 +12765,7 @@ msgstr "Bestandsassociatie ontbreekt voor extensie %1\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "Geen open commando verbonden met bestandstype '%1'\n" +msgstr "Geen open opdracht verbonden met bestandstype '%1'\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" @@ -13400,7 +12785,7 @@ msgstr "Argument ontbreekt\n" #: programs/cmd/cmd.rc:375 msgid "Syntax error\n" -msgstr "Fout in de syntax\n" +msgstr "Syntaxisfout\n" #: programs/cmd/cmd.rc:377 msgid "No help available for %1\n" @@ -13424,7 +12809,7 @@ msgstr "Voer de nieuwe datum in: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "voer de nieuwe tijd in: " +msgstr "Voer de nieuwe tijd in: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -13474,7 +12859,7 @@ msgstr "" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Volume naam (11 karakters, ENTER voor geen)?" +msgstr "Volume naam (11 tekens, ENTER voor geen)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -13490,7 +12875,7 @@ msgstr "Wine Command Prompt" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " @@ -13520,7 +12905,7 @@ msgstr " (Ja|Nee|Alles)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"'%1' niet herkend als intern of extern commando dan wel batchbestand.\n" +"'%1' niet herkend als interne of externe opdracht dan wel als batchbestand.\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -13536,15 +12921,15 @@ msgstr "Verwacht een operator.\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "Ongepaarde haakjes.\n" +msgstr "Haakjes komen niet overeen.\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"Misvormd nummer - moet of decimaal(12),\n" -" hexadecimaal(0x34) of octaal(056) zijn.\n" +"Misvormd nummer - moet of decimaal (12),\n" +" hexadecimaal (0x34) of octaal (056) zijn.\n" #: programs/conhost/conhost.rc:54 msgid "Cursor size" @@ -13567,14 +12952,10 @@ msgid "Command history" msgstr "Geschiedenis" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Bufferzone" +msgstr "&Buffergrootte:" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" msgstr "&Verwijder dubbelen" @@ -13591,22 +12972,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Console afsluiten" +msgstr "Console" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" msgstr "Snel bewerken" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Expertmodus" +msgstr "&Invoegmodus" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -13707,16 +13082,15 @@ msgid "Configuration error" msgstr "Configuratiefout" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "De schermbuffer moet groter dan of gelijk zijn aan de vensterbuffer" +msgstr "" +"De grootte van de schermbuffer moet groter dan of gelijk zijn aan het venster." #: programs/conhost/conhost.rc:41 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" -msgstr "Elk karakter is %1!u! pixels breed en %2!u! pixels hoog" +msgstr "Elk teken is %1!u! pixels breed en %2!u! pixels hoog" #: programs/conhost/conhost.rc:42 msgid "This is a test" @@ -13736,8 +13110,6 @@ msgid "Wine Explorer" msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" msgstr "Opstarten" @@ -13751,6 +13123,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Ondersteunde Opdrachten -\n" +"\n" +"hardlink beheer van harde koppelingen\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13758,10 +13133,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - Ondersteunde opdrachten -\n" +"\n" +"create maak een harde koppeling\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Syntax: fsutil hardlink create <nieuw> <bestaand>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -13772,10 +13150,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Fout: Ongeldige optie '%c'.\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Fout: Kon proces \"%1\" niet vinden.\n" +msgstr "Fout: Hostname niet gevonden: %u.\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -13853,10 +13229,8 @@ msgid "IPv6 address" msgstr "IPv6-adres" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Systeemconfiguratie" +msgstr "Systeeminformatie" #: programs/net/net.rc:30 msgid "" @@ -13870,11 +13244,11 @@ msgid "" msgstr "" "Gebruik van dit commando is:\n" "\n" -"NET commando [argumenten]\n" +"NET opdracht [argumenten]\n" " -of-\n" -"NET commando /HELP\n" +"NET opdracht /HELP\n" "\n" -"Beschikbare commando's zijn HELP, START, STOP en USE.\n" +"Beschikbare 'opdrachten' zijn HELP, START, STOP en USE.\n" #: programs/net/net.rc:31 msgid "" @@ -14292,7 +13666,7 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"Het bestand '%s' bestaat niet.\n" +"Bestand '%s' bestaat niet.\n" "\n" "Wilt u een nieuw bestand maken?" @@ -14302,7 +13676,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Het bestand '%s' is gewijzigd.\n" +"Bestand '%s' is gewijzigd.\n" "\n" "Wilt u de wijzigingen opslaan?" @@ -14335,7 +13709,7 @@ msgstr "" "Dit bestand bevat Unicode tekens die verloren zullen gaan\n" "als dit bestand wordt opgeslagen in de %2 codering.\n" "Klik op Annuleren om deze tekens te behouden, en selecteer\n" -"daarna een van de Unicode-opties in de coderingskeuzelijst.\n" +"daarna één van de Unicode-opties in de coderingskeuzelijst.\n" "Wilt u doorgaan?" #: programs/oleview/oleview.rc:32 @@ -14352,7 +13726,7 @@ msgstr "&Systeemconfiguratie" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Run de register-editor" +msgstr "De Wine Register Bewerker uitvoeren" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -14529,11 +13903,11 @@ msgstr "Wijzig de algemene machine Distributed COM instellingen" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Run de Wine register-editor" +msgstr "Wine register bewerker uitvoeren" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "Verlaat de applicatie. Vraagt om wijzigingen op te slaan" +msgstr "Verlaat het programma. Vraagt om wijzigingen op te slaan" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -14911,6 +14285,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Gebruik:\n" +" REG [opdracht] [parameters]\n" +"\n" +"Ondersteunde opdrachten:\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"\n" +"Voor hulp bij een opdracht, type:\n" +" REG [opdracht] /?\n" +"\n" #: programs/reg/reg.rc:36 msgid "" @@ -14933,122 +14316,102 @@ msgid "The operation completed successfully\n" msgstr "De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:40 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve sleutelnaam\n" #: programs/reg/reg.rc:41 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Fout: Foutieve commandoregel-parameters\n" +msgstr "reg: Foutieve opdrachtregel-parameters\n" #: programs/reg/reg.rc:42 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "reg: Kan de computer op afstand niet benaderen\n" #: programs/reg/reg.rc:43 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" #: programs/reg/reg.rc:44 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Niet-ondersteund type.\n" +msgstr "reg: Register data type wordt niet ondersteund [%1]\n" #: programs/reg/reg.rc:45 msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" +msgstr "reg: De optie [/d] moet gevolgd worden door een geheel getal\n" #: programs/reg/reg.rc:46 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: De optie [/d] moet gevolgd worden door een hexadecimale waarde\n" #: programs/reg/reg.rc:47 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Onverwerkte registergegevenstypen [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:48 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Het gespecifeerde bestand bestaat reeds. Wilt u het vervangen?" +msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?" #: programs/reg/reg.rc:52 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "De register bewerking is afgebroken\n" #: programs/reg/reg.rc:53 programs/regedit/regedit.rc:239 msgid "(Default)" msgstr "(Standaard)" #: programs/reg/reg.rc:54 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Weet u zeker dat u deze waarden wilt verwijderen?" +msgstr "Weet u zeker dat u de registerwaarde '%1' wilt verwijderen?" #: programs/reg/reg.rc:55 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Weet u zeker dat u de waarde '%s' wilt verwijderen?" +msgstr "Weet u zeker dat u alle registerwaardes in '%1' wilt verwijderen?" #: programs/reg/reg.rc:56 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Weet u zeker dat u '%1' wilt verwijderen?" +msgstr "Weet u zeker dat u registersleutel '%1' wilt verwijderen?" #: programs/reg/reg.rc:57 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: De optie [/d] moet gevolgd worden door tekenreeks\n" #: programs/reg/reg.rc:58 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Onmogelijk om alle registerwaardes in '%1' te verwijderen. Er is een " +"onverwachte fout opgetreden.\n" #: programs/reg/reg.rc:59 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: Onmogelijk om de gevraagde opdracht uit te voeren. Er is een onverwachte " +"fout opgetreden.\n" #: programs/reg/reg.rc:60 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Zoeken voltooid. Aantal gevonden resultaten: %1!d!\n" #: programs/reg/reg.rc:61 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve syntax. " #: programs/reg/reg.rc:62 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "Fout: Ongeldige optie '%c'.\n" +msgstr "reg: Ongeldige optie [%1]. " #: programs/reg/reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Type \"REG /?\" voor hulp.\n" #: programs/reg/reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Type \"REG %1 /?\" voor hulp.\n" #: programs/reg/reg.rc:65 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15056,41 +14419,31 @@ msgstr "(Geen waarde ingesteld)" #: programs/reg/reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT bestand.reg\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "Er was geen opdracht opgegeven." +msgstr "reg: Het bestand '%1' is niet gevonden.\n" #: programs/reg/reg.rc:68 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "reg: Onmogelijk om de registersleutel '%1' te openen.\n" #: programs/reg/reg.rc:69 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: Escape-tekenreeks niet herkend [\\%1!c!]\n" #: programs/reg/reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" +msgstr "REG EXPORT sleutelnaam bestand.reg [/y]\n" #: programs/reg/reg.rc:71 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key [%1]\n" -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve systeemsleutel [%1]\n" #: programs/reg/reg.rc:72 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Het gespecifeerde bestand bestaat reeds. Wilt u het vervangen?" +msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15171,13 +14524,11 @@ msgstr "&Info" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "Uitvouwen" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Binaire data wijzigen..." +msgstr "&Binaire data wijzigen..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15278,14 +14629,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Opdrachten voor toegang tot vaak gebruikte sleutels" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Opdrachten voor het weergeven van Help en informatie over de Register-editor" +"Opdrachten voor het weergeven van Help en informatie over de Register Bewerker" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -15297,7 +14644,7 @@ msgstr "Gegevens" #: programs/regedit/regedit.rc:154 msgid "Registry Editor" -msgstr "Register-editor" +msgstr "Register Bewerker" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" @@ -15324,66 +14671,54 @@ msgid "(unknown %d)" msgstr "(onbekend %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om de geselecteerde registerwaarde te wijzigen." #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om een nieuwe registersleutel te maken." #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om een nieuwe registerwaarde te maken." #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Onmogelijk om de sleutel '%1' te hernoemen.\n" +"De opgeven sleutelnaam bestaat al." #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Onmogelijk om de waarde '%1' te hernoemen.\n" +"De opgeven naam van de waarde bestaat al." #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om de geselecteerde registersleutel te verwijderen." #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om de geselecteerde registersleutel te hernoemen." #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Onmogelijk om de geselecteerde registerwaarde te hernoemen." #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"De sleutel en de waardes van %1 zijn succesvol aan het register toegevoegd." #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "Onmogelijk om %1 te importeren. Dit bestand is geen registerbestand." #: programs/regedit/regedit.rc:408 msgid "" @@ -15415,135 +14750,128 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"Gebruik:\n" +" regedit [opties] [bestand] [sleutel]\n" +"\n" +"Opties:\n" +" [geen optie] Start de grafische versie van dit programma.\n" +" /L:system.dat De plek van het system.dat bestand om te veranderen.\n" +" Compatibel met elke andere optie. Genegeerd.\n" +" /R:user.dat De plek van het user.dat bestand om te veranderen.\n" +" Compatibel met elke andere optie. Genegeerd.\n" +" /C Importeer de inhoud van een registerbestand.\n" +" /D Verwijder een registersleutel.\n" +" /E Exporteer een registersleutel naar een bestand.\n" +" Zonder sleutel wordt het hele register gexporteed.\n" +" /S Stille modus. Er worden geen berichten getoond.\n" +" /V Start de GUI in geavanceerde modus. Genegeerd.\n" +" /? Laat deze informatie zien en stop het programma.\n" +" [bestand] De plek van het bestand met register informatie welke\n" +" geïmporteerd zal worden. Samen met [/E] geeft dit de\n" +" plek aan waar het register informatie wordt geëxporteerd.\n" +" [sleutel] De te wijzigen registersleutel.\n" +"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: Ongeldige of onbekende optie [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "Type \"regedit /?\" voor hulp.\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Er was geen opdracht opgegeven." +msgstr "regedit: Geen bestand opgegeven.\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Geen registersleutel gegeven om te verwijderen.\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: Het bestand '%1' is niet gevonden.\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "regedit: Onmogelijk om bestand '%1' te openen.\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Foutieve handle handeling.\n" +msgstr "regedit Onverwerkte actie.\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Onvoldoende geheugen! (%1!S!, lijn %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "regedit: Ongeldige hexadecimale waarde.\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Onmogelijk om de hexadecimale gegevens om te zetten. Er " +"is een ongeldige waarde aangetroffen op '%1'.\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: Escape-tekenreeks niet herkend [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "Niet-ondersteund type.\n" +msgstr "regedit: Register gegevenstype niet ondersteund [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "regedit: Onverwachte regeleinde op regel '%1'.\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "Er was geen opdracht opgegeven." +msgstr "regedit: De regel '%1' wordt niet herkend.\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "regedit: Kan registerwaarde '%1' tot '%2' niet toevoegen.\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "regedit: Kan de registersleutel '%1' niet openen.\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "Niet-ondersteund type.\n" +msgstr "" +"regedit: Register gegevenstype [0x%1!x!] aangetroffen in '%2' wordt niet \n" +"ondersteund.\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: De registerwaarde '%1' wordt geëxporteerd als binaire data.\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "regedit: Ongeldige systeemsleutel [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" msgstr "" -"Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +"regedit: Kan '%1' niet exporteren. De registersleutel werd niet gevonden.\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "regedit: Kan de registersleutel '%1' niet verwijderen.\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "Er was geen opdracht opgegeven." +msgstr "regedit: De regel bevat een ongeldige opdracht.\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "De Register-editor afsluiten" +msgstr "De Register Bewerker afsluiten" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -15558,10 +14886,8 @@ msgid "Shows or hides the status bar" msgstr "De statusbalk weergeven of verbergen" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "De positie van de splitsing tussen twee deelvensters wijzigen" +msgstr "De scheiding tussen twee deelvensters wijzigen" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -15604,10 +14930,8 @@ msgid "Adds a new binary value" msgstr "Een nieuwe binaire waarde toevoegen" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Een nieuwe binaire waarde toevoegen" +msgstr "Een nieuwe 32-bit waarde toevoegen" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -15622,48 +14946,36 @@ msgid "Prints all or part of the registry" msgstr "Het register of een gedeelte ervan afdrukken" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Register-editor" +msgstr "Register Bewerker Help" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" msgstr "Programmagegevens, versienummer en copyrightgegevens weergeven" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Kan de registerwaarde '%1' niet opvragen." #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Kan dit type sleutel (%u) niet bewerken" +msgstr "Kan dit type registersleutel (%1!u!) niet bewerken." #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Waarde te groot (%u)" +msgstr "De waarde te groot (%1!u!)." #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" msgstr "Waarde verwijderen bevestigen" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Weet u zeker dat u deze waarden wilt verwijderen?" +msgstr "Weet u zeker dat u deze registerwaarden wilt verwijderen?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Tekenreeks '%s' niet gevonden" +msgstr "Zoeken voltooid. Tekenreeks '%1' is niet gevonden." #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -15678,57 +14990,42 @@ msgid "New Value #%d" msgstr "Nieuwe waarde #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" +msgstr "Kan de registersleutel '%1' niet opvragen." #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "De gegevens van de waarde wijzigen" +msgstr "De gegevens van de waarde binair wijzigen" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Een nieuwe multi-tekenreekswaarde toevoegen" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "" -"Exporteert de geselecteerde subsleutel van het register naar een tekst " -"bestand" +"Exporteert de geselecteerde subsleutel van het register naar een tekst bestand" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Een nieuwe tekenreekswaarde toevoegen" +msgstr "Een nieuwe uitbreidbare tekenreekswaarde toevoegen" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Waarde verwijderen bevestigen" +msgstr "Sleutel verwijderen bevestigen" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Weet u zeker dat u '%1' wilt verwijderen?" +msgstr "Deze registersleutel met alle subsleutels verwijderen?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Vouwt het geselecteerde knooppunt uit of samen" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "&Sorteren" +msgstr "Invouwen" #: programs/regsvr32/regsvr32.rc:32 msgid "" @@ -15737,6 +15034,9 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL Registratie Hulpprogramma\n" +"\n" +"Biedt DLL-registratiediensten\n" #: programs/regsvr32/regsvr32.rc:40 msgid "" @@ -15751,54 +15051,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Gebruik:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdlijn]] DllNaam\n" +"\n" +"Opties:\n" +" [/u] Een server deregistreren.\n" +" [/s] Stille modus (er worden geen berichten getoond).\n" +" [/i] Gebruik DllInstall met een optionele [cmdlijn].\n" +"\tSamen met [/u] wordt DllInstall gebruikt in verwijderingsmodus.\n" +" [/n] Gebruik DllRegisterServer niet.\n" +"\tDeze optie moet samen met [/i] gebruikt worden.\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Ongeldige of onbekende optie [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Openen van '%1' is mislukt\n" +msgstr "regsvr32: Laden van DLL '%1' is mislukt\n" #: programs/regsvr32/regsvr32.rc:43 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' niet geïmplementeerd in DLL '%2'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registreren van DLL '%1' mislukt\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registreren van DLL '%1' gelukt\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Uitschrijven van DLL '%1' mislukt\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Uitschrijven van DLL '%1' gelukt\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Installeren van DLL '%1' mislukt\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Installeren van DLL '%1' gelukt\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Verwijderen van DLL '%1' mislukt\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:58 msgid "" @@ -15821,11 +15132,11 @@ msgstr "Gebruik: taskkill [/?] [/f] [/im ProcesNaam | /pid ProcesID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "Fout: Onbekende of ongeldige commandoregeloptie gespecificeerd.\n" +msgstr "Fout: Onbekende of ongeldige opdrachtregeloptie gespecificeerd.\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "Fout: Ongeldige commandoregelparameter gespecificeerd.\n" +msgstr "Fout: Ongeldige opdrachtregelparameter gespecificeerd.\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" @@ -15833,7 +15144,7 @@ msgstr "Fout: Eén van de opties /im of /pid moet zijn gespecificeerd.\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Fout: Optie %1 verwacht een commandoregelparameter.\n" +msgstr "Fout: Optie %1 verwacht een opdrachtregelparameter.\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" @@ -16043,9 +15354,8 @@ msgid "Totals" msgstr "Totaal" #: programs/taskmgr/taskmgr.rc:375 -#, fuzzy msgid "Commit charge (K)" -msgstr "Commit Charge (K)" +msgstr "Toegewezen geheugen (K)" #: programs/taskmgr/taskmgr.rc:376 msgid "Physical memory (K)" @@ -16057,11 +15367,11 @@ msgstr "Kernelgeheugen (K)" #: programs/taskmgr/taskmgr.rc:378 programs/taskmgr/taskmgr.rc:290 msgid "Handles" -msgstr "Aantal handles" +msgstr "Ingangen" #: programs/taskmgr/taskmgr.rc:379 programs/taskmgr/taskmgr.rc:291 msgid "Threads" -msgstr "Aantal threads" +msgstr "Threads" #: programs/taskmgr/taskmgr.rc:380 programs/taskmgr/taskmgr.rc:263 msgid "Processes" @@ -16329,7 +15639,7 @@ msgstr "Basisp&rioriteit" #: programs/taskmgr/taskmgr.rc:557 msgid "&Handle Count" -msgstr "Aantal &handles" +msgstr "Aantal &ingangen" #: programs/taskmgr/taskmgr.rc:559 msgid "&Thread Count" @@ -16400,11 +15710,11 @@ msgstr "Ververs de weergave tweemaal per seconde" #: programs/taskmgr/taskmgr.rc:197 msgid "Updates the display every two seconds" -msgstr "Ververs de weergave elke 2 seconden" +msgstr "Ververs de weergave elke twee seconden" #: programs/taskmgr/taskmgr.rc:198 msgid "Updates the display every four seconds" -msgstr "Ververs de weergave elke 4 seconden" +msgstr "Ververs de weergave elke vier seconden" #: programs/taskmgr/taskmgr.rc:203 msgid "Does not automatically update" @@ -16412,11 +15722,11 @@ msgstr "Niet automatisch verversen" #: programs/taskmgr/taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" -msgstr "Plaats de vensters boven elkaar op de desktop" +msgstr "Vensters naast elkaar schikken" #: programs/taskmgr/taskmgr.rc:206 msgid "Tiles the windows vertically on the desktop" -msgstr "Plaats de vensters naast elkaar op de desktop" +msgstr "Vensters onder elkaar schikken" #: programs/taskmgr/taskmgr.rc:207 msgid "Minimizes the windows" @@ -16428,7 +15738,7 @@ msgstr "Maximaliseer de vensters" #: programs/taskmgr/taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" -msgstr "Plaats de vensters achter elkaar op de desktop" +msgstr "Vensters diagonaal over het bureaublad schikken" #: programs/taskmgr/taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" @@ -16656,7 +15966,7 @@ msgstr "Proces kan niet worden gedebugged" #: programs/taskmgr/taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "Het proces moet aan tenminste 1 processor worden gekoppeld" +msgstr "Het proces moet aan tenminste één processor worden gekoppeld" #: programs/taskmgr/taskmgr.rc:316 msgid "Invalid Option" @@ -16684,7 +15994,7 @@ msgstr "Taak" #: programs/uninstaller/uninstaller.rc:29 msgid "Wine Application Uninstaller" -msgstr "Programma verwijderen" +msgstr "Wine Programma's Verwijderen" #: programs/uninstaller/uninstaller.rc:30 msgid "" @@ -16698,18 +16008,17 @@ msgstr "" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: Het programma met GUID '%1' is niet gevonden\n" #: programs/uninstaller/uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: Optie '--remove' moet worden gevolgd door een programma GUID\n" #: programs/uninstaller/uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Fout: Ongeldige optie '%c'.\n" +msgstr "uninstaller: Ongeldige optie [%1]\n" #: programs/uninstaller/uninstaller.rc:35 msgid "" @@ -16718,6 +16027,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine Programma's Verwijderen\n" +"\n" +"Verwijder programma's van de huidige Wine prefix.\n" +"\n" #: programs/uninstaller/uninstaller.rc:43 msgid "" @@ -16732,6 +16045,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"Gebruik:\n" +" uninstaller [opties]\n" +"\n" +"Opties:\n" +" --help\t Toon deze informatie.\n" +" --list\t Toon alle geïnstalleerde programma's in deze Wine prefix.\n" +" --remove {GUID} Verwijder het programma.\n" +"\t\t Gebruik '--list' om de GUID te bepalen.\n" +" [geen optie] Start de grafische versie van dit programma.\n" +"\n" #: programs/view/view.rc:36 msgid "&Pan" @@ -16755,11 +16078,11 @@ msgstr "Algemene Metafile weergave" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metabestanden (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" -msgstr "Wachtend op Programma" +msgstr "Wachten op Programma" #: programs/wineboot/wineboot.rc:35 msgid "Terminate Process" @@ -16811,30 +16134,27 @@ msgid "Application settings" msgstr "Toepassingsinstellingen" #: programs/winecfg/winecfg.rc:154 -#, fuzzy msgid "" "Wine can mimic different Windows versions for each application. This tab is " "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windowsversie in te stellen. " -"Deze tab is gekoppeld aan de \"Bibliotheken\" en \"Grafisch\" tabs om zowel " -"systeemwijde als applicatiespecifieke instellingen in deze tabs mogelijk te " -"maken." +"Wine geeft de mogelijkheid om per toepassing de Windows versie in te stellen. " +"Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch' om " +"zowel systeembreed als programmaspecifiek instellingen in deze tabbladen " +"mogelijk te maken." #: programs/winecfg/winecfg.rc:158 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." -msgstr "Toepassing toevoegen..." +msgstr "Toepassing &toevoegen..." #: programs/winecfg/winecfg.rc:159 msgid "&Remove application" -msgstr "Toepassing verwijderen" +msgstr "Toepassing &verwijderen" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "Windowsversie:" +msgstr "&Windows versie:" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -16846,15 +16166,15 @@ msgstr "Indien volledig scherm, vang de &muis automatisch af" #: programs/winecfg/winecfg.rc:170 msgid "Allow the window manager to &decorate the windows" -msgstr "Laat de window manager de vensters &decoreren" +msgstr "Laat de vensterbeheerder de vensters &decoreren" #: programs/winecfg/winecfg.rc:171 msgid "Allow the &window manager to control the windows" -msgstr "Laat de window manager de vensters beheren" +msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "Emuleer een virtueel bureaublad" +msgstr "&Emuleer een virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16869,9 +16189,8 @@ msgid "This is a sample text using 10 point Tahoma" msgstr "Dit is een tekstvoorbeeld in Tahoma met puntgrootte 10" #: programs/winecfg/winecfg.rc:190 -#, fuzzy msgid "DLL overrides" -msgstr "DLL Overrides " +msgstr "DLL aanpassingen" #: programs/winecfg/winecfg.rc:191 msgid "" @@ -16879,21 +16198,21 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"Het is mogelijk om per uitvoerbaar bestand in te stellen of deze \"builtin\" " -"dan wel \"native\" moet zijn. De instelling voor \"*\" geldt voor alle niet " -"expliciet genoemde bestanden." +"Elke DLL (Dynamic Link Library) kan apart worden ingesteld op 'ingebouwd' (de " +"versie van Wine) of 'windows' (afkomstig van Windows of meegeleverd met een " +"programma." #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "Nieuwe override voor dll:" +msgstr "&Nieuwe DLL aanpassing:" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" -msgstr "" +msgstr "&Toevoegen" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "Bestaande overrides:" +msgstr "Bestaande &aanpassingen:" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -16901,11 +16220,11 @@ msgstr "&Bewerken..." #: programs/winecfg/winecfg.rc:204 msgid "Edit Override" -msgstr "Override bewerken" +msgstr "DLL Bewerken" #: programs/winecfg/winecfg.rc:207 msgid "Load order" -msgstr "Laadvolgorde" +msgstr "Laad volgorde" #: programs/winecfg/winecfg.rc:208 msgid "&Builtin (Wine)" @@ -16913,43 +16232,33 @@ msgstr "Inge&bouwd (Wine)" #: programs/winecfg/winecfg.rc:209 msgid "&Native (Windows)" -msgstr "Wi&ndows (MSWindows)" +msgstr "Wi&ndows" #: programs/winecfg/winecfg.rc:210 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" -msgstr "Bui&ltin dan Native" +msgstr "&Ingebouwd dan Windows" #: programs/winecfg/winecfg.rc:211 msgid "Nati&ve then Builtin" -msgstr "Nati&ve dan Builtin" +msgstr "Windo&ws dan Ingebouwd" #: programs/winecfg/winecfg.rc:219 msgid "Select Drive Letter" -msgstr "Selecteer Stationsletter" +msgstr "Selecteer Schijfletter" #: programs/winecfg/winecfg.rc:231 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine configuratie" +msgstr "Schijf configuratie" #: programs/winecfg/winecfg.rc:232 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"Kon niet verbinden met de mount manager, de schijfconfiguratie kan niet " +"Kon niet verbinden met de schijfkoppelaar, de schijfconfiguratie kan niet " "worden bewerkt." #: programs/winecfg/winecfg.rc:235 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Toevoegen..." @@ -16958,10 +16267,8 @@ msgid "&Path:" msgstr "&Pad:" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Toon uitgebreid" +msgstr "Uitgebreide Opties" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" @@ -16977,21 +16284,19 @@ msgstr "&Naam:" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "S&erienummer:" +msgstr "S&erie-nr:" #: programs/winecfg/winecfg.rc:256 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Toon \".\" bestanden" +msgstr "Toon verborgen bestanden" #: programs/winecfg/winecfg.rc:263 msgid "Driver diagnostics" -msgstr "Aansturingsdiagnostiek" +msgstr "Stuurprogramma" #: programs/winecfg/winecfg.rc:265 msgid "Defaults" -msgstr "Standaardinstellingen" +msgstr "Multimedia Apparaten" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" @@ -16999,7 +16304,7 @@ msgstr "Uitvoer apparaat:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "Stemuitvoer:" +msgstr "Stemuitvoer apparaat:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" @@ -17007,21 +16312,19 @@ msgstr "Invoer apparaat:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "Steminvoer:" +msgstr "Steminvoer apparaat:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" -msgstr "Geluidstest" +msgstr "Geluids&test" #: programs/winecfg/winecfg.rc:275 programs/winecfg/winecfg.rc:89 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine configuratie" +msgstr "Luidsprekeropstelling" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Luidsprekeropstelling:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17033,7 +16336,7 @@ msgstr "Thema:" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." -msgstr "Thema installeren..." +msgstr "Thema &installeren..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" @@ -17045,19 +16348,19 @@ msgstr "Kleur:" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" -msgstr "" +msgstr "Bestandassociaties" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "" +msgstr "Toestaan dat bestandassociaties worden gemaakt" #: programs/winecfg/winecfg.rc:306 msgid "Folders" -msgstr "Mappen" +msgstr "Speciale Mappen" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "Verwijs naar:" +msgstr "Doelmap:" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17065,17 +16368,15 @@ msgstr "Bibliotheken" #: programs/winecfg/winecfg.rc:34 msgid "Drives" -msgstr "Stations" +msgstr "Schijven" #: programs/winecfg/winecfg.rc:35 msgid "Select the Unix target directory, please." -msgstr "Selecteer de Unix doelmap a.u.b." +msgstr "Kies de map waarnaar verwezen moet worden." #: programs/winecfg/winecfg.rc:36 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Verberg uitgebreid" +msgstr "Verberg Opties" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" @@ -17111,11 +16412,11 @@ msgstr "Thema-bestanden kiezen" #: programs/winecfg/winecfg.rc:47 msgid "Folder" -msgstr "Persoonlijke map" +msgstr "Map" #: programs/winecfg/winecfg.rc:48 msgid "Links to" -msgstr "Verwijst naar" +msgstr "Verwijzing" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" @@ -17123,7 +16424,7 @@ msgstr "Wine configuratie voor %s" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "Geselecteerd stuurprogramma: %s" +msgstr "Gebruikt stuurprogramma: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17135,25 +16436,23 @@ msgstr "Audiotest is mislukt!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" -msgstr "(Standaardinstelling van het systeem)" +msgstr "(Systeeminstelling)" #: programs/winecfg/winecfg.rc:90 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 Surround" #: programs/winecfg/winecfg.rc:91 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafisch" +msgstr "4.0 Surround" #: programs/winecfg/winecfg.rc:92 msgid "Stereo" -msgstr "" +msgstr "2.0 Stereo" #: programs/winecfg/winecfg.rc:93 msgid "Mono" -msgstr "" +msgstr "Mono" #: programs/winecfg/winecfg.rc:53 msgid "" @@ -17169,7 +16468,7 @@ msgstr "Waarschuwing: systeembibliotheek" #: programs/winecfg/winecfg.rc:55 msgid "native" -msgstr "native" +msgstr "windows" #: programs/winecfg/winecfg.rc:56 msgid "builtin" @@ -17193,11 +16492,11 @@ msgstr "Standaardinstellingen" #: programs/winecfg/winecfg.rc:61 msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine toepassingen (*.exe; *.exe.so)" +msgstr "Wine Toepassingen (*.exe; *.exe.so)" #: programs/winecfg/winecfg.rc:62 msgid "Use global settings" -msgstr "Gebruik globale instellingen" +msgstr "Gebruik de standaardinstellingen" #: programs/winecfg/winecfg.rc:63 msgid "Select an executable file" @@ -17205,11 +16504,11 @@ msgstr "Selecteer een uitvoerbaar bestand" #: programs/winecfg/winecfg.rc:68 msgid "Autodetect" -msgstr "&Automatisch detecteren" +msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Lokaal station" +msgstr "Hardeschijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -17229,44 +16528,36 @@ msgid "" "\n" "Each drive must have a letter, from A to Z, so you cannot have more than 26." msgstr "" -"U kunt geen stations meer toevoegen.\n" +"U kunt geen schijven meer toevoegen.\n" "\n" -"Elk station moet een letter van A tot Z hebben dus er kunnen niet meer dan " -"26 zijn." +"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"dan 26 zijn." #: programs/winecfg/winecfg.rc:74 msgid "System drive" -msgstr "Systeem station" +msgstr "Systeemschijf" #: programs/winecfg/winecfg.rc:75 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"Weet u zeker dat u station C wilt verwijderen?\n" +"Weet u zeker dat u de C-schijf wilt verwijderen?\n" "\n" -"De meeste Windows toepassingen verwachten dat station C bestaat en zullen, " -"met onverwachte resultaten, afbreken. Als u doorgaat vergeet dan niet om " -"station C opnieuw aan te maken!" +"De meeste Windows toepassingen verwachten dat er C-schijf bestaat en zullen, " +"met onverwachte resultaten, afbreken. Als u doorgaat vergeet dan niet om de C-" +"schijf opnieuw aan te maken!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" msgid "Letter" -msgstr "Letter" +msgstr "Schijf" #: programs/winecfg/winecfg.rc:77 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Nieuwe Map" +msgstr "Doel Map" #: programs/winecfg/winecfg.rc:78 msgid "" @@ -17274,22 +16565,22 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"U heeft geen C station. Dit kan tot problemen leiden.\n" +"U heeft geen C-schijf. Dit kan tot problemen leiden.\n" "\n" -"Vergeet niet om m.b.v. de knop 'Toevoegen' in de Stations tab een C station " -"aan te maken!\n" +"Vergeet niet om m.b.v. de knop 'Toevoegen' in het 'Schijven'-tabblad een \n" +"C-schijf aan te maken!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" -msgstr "Instellingen Achtergrond" +msgstr "Achtergrond Kleur" #: programs/winecfg/winecfg.rc:99 msgid "Controls Text" -msgstr "Instellingen Tekst" +msgstr "Tekst Kleur" #: programs/winecfg/winecfg.rc:101 msgid "Menu Background" -msgstr "Menu Achtergrond" +msgstr "Menu Kleur" #: programs/winecfg/winecfg.rc:102 msgid "Menu Text" @@ -17309,11 +16600,11 @@ msgstr "Selectie Tekst" #: programs/winecfg/winecfg.rc:106 msgid "Tooltip Background" -msgstr "Tooltip Achtergrond" +msgstr "Knopinfo Achtergrond" #: programs/winecfg/winecfg.rc:107 msgid "Tooltip Text" -msgstr "Tooltip Tekst" +msgstr "Knopinfo Tekst" #: programs/winecfg/winecfg.rc:108 msgid "Window Background" @@ -17345,11 +16636,11 @@ msgstr "Meldingsvenster Tekst" #: programs/winecfg/winecfg.rc:115 msgid "Application Workspace" -msgstr "Applicatie Werkruimte" +msgstr "Toepassingsachtergrond" #: programs/winecfg/winecfg.rc:116 msgid "Window Frame" -msgstr "Vensterraamwerk" +msgstr "Vensterrand" #: programs/winecfg/winecfg.rc:117 msgid "Active Border" @@ -17361,7 +16652,7 @@ msgstr "Inactieve Rand" #: programs/winecfg/winecfg.rc:119 msgid "Controls Shadow" -msgstr "Knopschaduw" +msgstr "Schaduw" #: programs/winecfg/winecfg.rc:120 msgid "Gray Text" @@ -17369,23 +16660,23 @@ msgstr "Grijze Tekst" #: programs/winecfg/winecfg.rc:121 msgid "Controls Highlight" -msgstr "Knoppen Gemarkeerd" +msgstr "Markering" #: programs/winecfg/winecfg.rc:122 msgid "Controls Dark Shadow" -msgstr "Knoppen Donkere Schaduw" +msgstr "Donkere Schaduw" #: programs/winecfg/winecfg.rc:123 msgid "Controls Light" -msgstr "Knoppen Licht" +msgstr "Lichtinval" #: programs/winecfg/winecfg.rc:124 msgid "Controls Alternate Background" -msgstr "Knoppen Alternatieve Achtergrond" +msgstr "Alternatieve Achtergrond" #: programs/winecfg/winecfg.rc:125 msgid "Hot Tracked Item" -msgstr "Hot-Tracked Onderdeel" +msgstr "Gevolgd Onderdeel" #: programs/winecfg/winecfg.rc:126 msgid "Active Title Bar Gradient" @@ -17424,7 +16715,6 @@ msgstr "" "worden. Excuses voor het ongemak." #: programs/winedbg/winedbg.rc:59 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"https://appdb.winehq.org\">Application " @@ -17432,10 +16722,7 @@ msgid "" msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " "Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma.\n" -"\n" -"Als dit probleem niet optreedt onder Windows en nog niet is gerapporteerd, " -"dan kunt u <a href=\"https://wiki.winehq.org/Bugs\">een bug rapporteren</a>." +"Database</a> naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -17462,6 +16749,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Een programma op uw computer is vastgelopen, maar WineDbg kon niet aan het " +"proces vastgemaakt worden om een backtrace te verkrijgen." #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" @@ -17493,7 +16782,7 @@ msgstr "Nieuwe &map..." #: programs/winefile/winefile.rc:43 msgid "&Disk" -msgstr "&Disk" +msgstr "Schijf" #: programs/winefile/winefile.rc:44 msgid "Connect &Network Drive..." @@ -17553,7 +16842,7 @@ msgstr "&Naast elkaar\tCtrl+F4" #: programs/winefile/winefile.rc:84 msgid "&About Wine File Manager" -msgstr "&Over Wine bestandsbeheer" +msgstr "&Over Wine Bestandsbeheer" #: programs/winefile/winefile.rc:121 msgid "Select destination" @@ -17593,7 +16882,7 @@ msgstr "&Bestandsnaam:" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "Volledig &pad:" +msgstr "Volledig &Pad:" #: programs/winefile/winefile.rc:163 msgid "Last Change:" @@ -17609,7 +16898,7 @@ msgstr "&Systeem" #: programs/winefile/winefile.rc:176 msgid "&Compressed" -msgstr "Ge&comprimeerd" +msgstr "Ingepakt" #: programs/winefile/winefile.rc:177 msgid "Version information" @@ -17630,7 +16919,7 @@ msgstr "Probleem tijdens het selecteren van het nieuwe lettertype." #: programs/winefile/winefile.rc:96 msgid "Wine File Manager" -msgstr "Wine bestandsbeheer" +msgstr "Wine Bestandsbeheer" #: programs/winefile/winefile.rc:98 msgid "root fs" @@ -17677,10 +16966,8 @@ msgid "&Beginner" msgstr "&Beginner" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interface" +msgstr "Gem&iddeld" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17696,7 +16983,7 @@ msgstr "&Snelste tijden" #: programs/winemine/winemine.rc:54 msgid "&About WineMine" -msgstr "&Over Winemine" +msgstr "&Over WineMine" #: programs/winemine/winemine.rc:61 msgid "Fastest Times" @@ -17711,20 +16998,16 @@ msgid "Beginner" msgstr "Beginner" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interface" +msgstr "Gemiddeld" #: programs/winemine/winemine.rc:66 msgid "Expert" msgstr "Expert" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultaat" +msgstr "Wis Lijst" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -17752,11 +17035,11 @@ msgstr "Mijnen" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Alle resultaten worden gewist. Weet u het zeker?" #: programs/winemine/winemine.rc:30 msgid "WineMine" -msgstr "Winemine" +msgstr "WineMine" #: programs/winemine/winemine.rc:31 msgid "Nobody" @@ -17768,11 +17051,11 @@ msgstr "Copyright 2000 Joshua Thielen" #: programs/winhlp32/winhlp32.rc:35 msgid "Printer &setup..." -msgstr "&Pagina-instellingen..." +msgstr "&Printer-instellingen..." #: programs/winhlp32/winhlp32.rc:42 msgid "&Annotate..." -msgstr "&Annoteren..." +msgstr "&Aantekening..." #: programs/winhlp32/winhlp32.rc:44 msgid "&Bookmark" @@ -17808,11 +17091,11 @@ msgstr "H&ulp bij Help\tF1" #: programs/winhlp32/winhlp32.rc:59 msgid "&About Wine Help" -msgstr "&Info" +msgstr "&Over Wine Help" #: programs/winhlp32/winhlp32.rc:67 msgid "Annotation..." -msgstr "Annotering..." +msgstr "Aantekening..." #: programs/winhlp32/winhlp32.rc:68 msgid "Copy" @@ -17860,7 +17143,7 @@ msgstr "Help-onderwerpen: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "Fout: Commandoregel niet ondersteund\n" +msgstr "Fout: Opdrachtregel niet ondersteund\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" @@ -17871,10 +17154,8 @@ msgid "Error: Invalid query\n" msgstr "Fout: Foutieve zoekopdracht\n" #: programs/wmic/wmic.rc:31 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid syntax for PATH\n" -msgstr "Fout: Foutieve sleutelnaam\n" +msgstr "Fout: Foutieve syntax voor PATH\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -17949,36 +17230,32 @@ msgid "F&ormat" msgstr "&Opmaak" #: programs/wordpad/wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Lijst" +msgstr "&Lijsten" #: programs/wordpad/wordpad.rc:87 programs/wordpad/wordpad.rc:116 msgid "&Bullet points" msgstr "&Opsommingstekens" #: programs/wordpad/wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL Nummer" +msgstr "Cijfers" #: programs/wordpad/wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Letters - kleine letters" #: programs/wordpad/wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Letters - hoofdletters" #: programs/wordpad/wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Romeinse nummers - klein" #: programs/wordpad/wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Romeinse nummers - hoofd" #: programs/wordpad/wordpad.rc:94 programs/wordpad/wordpad.rc:117 msgid "&Paragraph..." @@ -18124,10 +17401,8 @@ msgid "Text documents (*.txt)" msgstr "Tekstdocumenten (*.txt)" #: programs/wordpad/wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "Unicode tekstdocument (*.txt)" +msgstr "Unicode tekstdocumenten (*.txt)" #: programs/wordpad/wordpad.rc:150 msgid "Rich text format (*.rtf)" @@ -18175,7 +17450,7 @@ msgstr "Twee pagina's" #: programs/wordpad/wordpad.rc:177 msgid "One page" -msgstr "Een pagina" +msgstr "Eén pagina" #: programs/wordpad/wordpad.rc:178 msgid "Zoom in" @@ -18282,7 +17557,7 @@ msgstr "Onjuiste parameter '%1' - Gebruik xcopy /? voor hulp\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" -msgstr "Druk op <enter> om te beginnen met kopiëren\n" +msgstr "Druk op <Enter> om te beginnen met kopiëren\n" #: programs/xcopy/xcopy.rc:33 msgid "%1!d! file(s) would be copied\n" @@ -18308,7 +17583,7 @@ msgstr "%1? (Ja|Nee)\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%1 overschrijven? (Ja|Nee|Alles)\n" +msgstr "Overschrijf %1? (Ja|Nee|Alles)\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -18329,41 +17604,6 @@ msgid "D" msgstr "D" #: programs/xcopy/xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -18405,9 +17645,9 @@ msgstr "" "XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"Parameters:\n" +"Opties:\n" "\n" -"[/I] Als bestemming niet bestaat en 2 of meer bestanden worden\n" +"[/I] Als bestemming niet bestaat en twee of meer bestanden worden\n" "\tgekopieerd, neem aan dat een map werd bedoeld.\n" "[/S] Kopieer mappen en submappen.\n" "[/E] Kopieer mappen en submappen, inclusief lege.\n" @@ -18426,7 +17666,9 @@ msgstr "" "[/C] Ga door zelfs als er een fout optreed tijdens het kopiëren.\n" "[/A] Kopieer alleen bestanden met archiveringsattribuut aan.\n" "[/M] Kopieer alleen bestanden met archiveringsattribuut aan, verwijdert\n" -"\tdit archiveringsattribuut.\n" +"\thet archiveringsattribuut.\n" +"[/K] Kopieer de bestandskenmerken. Zonder deze optie gaan de kenmerken\n" +"\tverloren.\n" "[/D | /D:m-d-y] Kopieer bestanden die nieuw zijn of gewijzigd zijn na de " "opgegeven.\n" "\t\tdatum. Als geen datum wordt gegeven, kopieer alleen als bron nieuwer " -- 2.30.0

2 1

[PATCH 1/2] winevulkan: Don't advertise VK_EXT_headless_surface.
by Georg Lehmann 26 Jan '21

26 Jan '21

This extension never worked. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40978a8fc7a..4532fe1559a 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -86,6 +86,7 @@ EXT_BLOCK_SIZE = 1000 UNSUPPORTED_EXTENSIONS = [ # Instance extensions + "VK_EXT_headless_surface", # Needs WSI work. "VK_KHR_display", # Needs WSI work. "VK_KHR_surface_protected_capabilities", -- 2.30.0

1 1

[PATCH 1/6] widl: Remove unnecessary WinRT type comments.
by Rémi Bernon 26 Jan '21

26 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 223ab5c5ca9..d5e35aac92f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -45,8 +45,6 @@ generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name, enum name_type name_type); -static void write_winrt_type_comments(FILE *header, const type_t *type); - static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); @@ -1482,20 +1480,6 @@ static char *format_apicontract_macro(const type_t *type) return name; } -static void write_winrt_type_comments(FILE *header, const type_t *type) -{ - expr_t *contract = get_attrp(type->attrs, ATTR_CONTRACT); - fprintf(header, " *\n"); - if (contract) - { - const type_t *type = contract->u.tref.type; - char *name = format_namespace(type->namespace, "", ".", type->name, NULL); - int ver = contract->ref->u.lval; - fprintf(header, " * Introduced to %s in version %d.%d\n *\n", name, (ver >> 16) & 0xffff, ver & 0xffff); - free(name); - } -} - static void write_apicontract_guard_start(FILE *header, const expr_t *expr) { const type_t *type; @@ -1528,7 +1512,6 @@ static void write_com_interface_start(FILE *header, const type_t *iface) expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); @@ -1630,7 +1613,6 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); -- 2.30.0

2 9

[PATCH] secur32: implement the SECPKG_ATTR_UNIQUE_BINDINGS context attribute
by Damjan Jovanovic 26 Jan '21

26 Jan '21

.NET's System.Data.SqlClient needs this to connect to MSSQL Server. A MacOSX implementation doesn't appear to be possible. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/secur32/schannel.c | 7 ++++++ dlls/secur32/schannel_gnutls.c | 41 ++++++++++++++++++++++++++++++++++ dlls/secur32/schannel_macosx.c | 6 +++++ dlls/secur32/secur32_priv.h | 2 ++ dlls/secur32/tests/schannel.c | 26 +++++++++++++++++++++ 5 files changed, 82 insertions(+)

2 2

[PATCH 1/6] winegstreamer: Avoid using Wine debug functions in event_sink().
by Zebediah Figura 26 Jan '21

26 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5401d942a41..8ded4aeef31 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -705,7 +705,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct parser_source *pin = gst_pad_get_element_private(pad); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -719,7 +719,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); break; } @@ -798,7 +798,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); } gst_event_unref(event); return TRUE; -- 2.30.0

1 5

[tools 1/3] testbot/TestWTBS: Check the result and error emails.
by Francois Gouget 26 Jan '21

26 Jan '21

When a job completes the TestBot sends an email with the results and another with a summary of the errors in case of new failures. This patch allows checking that these emails did get sent if appropriate and seem to contain the expected data. For this the emails should be saved to a file in mbox format and that file passed to TestWTBS using the --mbox option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 187 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 175 insertions(+), 12 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 098008110..58cbf3041 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -107,6 +107,7 @@ sub check_opt_val($$) } my $OptJobs; +my $OptMbox; while (@ARGV) { my $Arg = shift @ARGV; @@ -114,6 +115,10 @@ while (@ARGV) { $OptJobs = check_opt_val($Arg, $OptJobs); } + elsif ($Arg eq "--mbox") + { + $OptMbox = check_opt_val($Arg, $OptMbox); + } elsif ($Arg eq "--help") { $Usage = 0; @@ -156,7 +161,7 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--jobs RANGES] [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; print "\n"; print "Tests the Patches subject parser.\n"; print "\n"; @@ -166,6 +171,7 @@ if (defined $Usage) print " these jobs to be ignored. Each range is either a single job id,\n"; print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; print " empty string or a job id.\n"; + print " --mbox FILE Check the TestBot's emails in this mbox-format file.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -417,6 +423,114 @@ sub GetReportTestUnits($) } +# +# Load the TestBot emails +# + +my %Emails; + +sub CloseEmail($) +{ + my ($State) = @_; + + # Avoid undefined values to simplify diagnostic messages + $State->{HasFailedEmail} ||= 0; + $State->{HasResEmail} ||= 0; + + if (!$State->{JobId}) + { + foreach my $Field ("HasFailedEmail", "HasResEmail") + { + next if (!$State->{$Field}); + fail("Unexpected $Field property found on line $State->{$Field}"); + } + foreach my $Hash ("FailedVMs", "ResVMs") + { + next if (!$State->{$Hash}); + my $Lines = join(" ", map { "$_:$State->{$Hash}->{$_}" } sort keys %{$State->{$Hash}}); + fail("Unexpected $Hash property found on lines: $Lines"); + } + } + else + { + my $Email = $Emails{$State->{JobId}}; + $Emails{$State->{JobId}} = $Email = {} if (!$Email); + + $Email->{HasFailedEmail} ||= $State->{HasFailedEmail}; + $Email->{FailedVMs} ||= $State->{FailedVMs}; + + $Email->{HasResEmail} ||= $State->{HasResEmail}; + $Email->{ResVMs} ||= $State->{ResVMs}; + } +} + +sub LoadMbox($) +{ + my ($MboxFilename) = @_; + + if (open(my $MboxFh, "<", $MboxFilename)) + { + my ($State, $LineNo, $Empty); + foreach my $Line (<$MboxFh>) + { + chomp $Line; + $LineNo++; + if ($Line eq "") + { + $Empty = 1; + next; + } + if ($Line =~ m~^From ~) + { + CloseEmail($State); + $State = {}; + } + elsif ($Line =~ /^Subject: TestBot job (\d+) results:/) + { + $State->{JobId} = $1; + $State->{JobIdLine} = $LineNo; + $State->{HasResEmail} = $LineNo; + } + elsif ($Line =~ /JobDetails.pl\?Key=(\d+)$/) + { + my $JobId = $1; + if (defined $State->{JobId}) + { + is($JobId, $State->{JobId}, "Check mbox job ids on lines $LineNo and $State->{JobIdLine}"); + } + else + { + $State->{JobId} = $JobId; + $State->{JobIdLine} = $LineNo; + } + } + elsif ($Line =~ /^Content-Disposition: attachment; filename=([^-]+)-/) + { + my $VM = $1; + # This could match attachments in other emails + $State->{ResVMs}->{$VM}++ if ($State->{HasResEmail}); + } + elsif ($Line =~ /I found new failures/) + { + $State->{HasFailedEmail} = $LineNo; + } + elsif ($Line =~ /^=== (\w+) $.*$ ===$/) + { + my $VM = $1; + $State->{FailedVMs}->{$VM}++; + } + $Empty = undef; + } + CloseEmail($State); + close($MboxFh); + } + else + { + fail("Could not open $MboxFilename for reading: $!"); + } +} + + # # Verify the Jobs and Tasks # @@ -627,11 +741,12 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } - my $ReportCount = 0; + my ($ReportCount, $NewFailures) = (0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { my $LogPath = $Task->GetDir() ."/$LogName"; my $LogInfo = LoadLogErrors($LogPath); + $NewFailures += $LogInfo->{NewCount} || 0; my $LogType = "log"; if ($LogName =~ /\.report$/) @@ -662,6 +777,7 @@ sub CheckTask($$$$) # was run, i.e. $ReportCount, or take it as is if no report is available. is($Task->TestFailures, $TaskInfo->{TestFailures} * ($ReportCount || 1), "Check Failures of task ". TaskKeyStr($Task)); } + return $NewFailures; } =pod @@ -687,13 +803,13 @@ sub CheckJob($$) $Remarks =~ s/^\[\Q$PatchesMailingList\E\] //; is($Remarks, $JobInfo->{Remarks}, "Check Remarks for job ". $Job->Id); } - if (CheckValue($JobInfo->{Status})) + if (CheckValue($TestInfo->{patch}->{Disposition})) { - is($Job->Status, $JobInfo->{Status}, "Check Status for job ". $Job->Id); + fail("The '$TestInfo->{patch}->{Disposition}' patch disposition is incompatible with job ". $Job->Id); } - elsif (CheckValue($TestInfo->{patch}->{Disposition})) + elsif (CheckValue($JobInfo->{Status})) { - fail("The '$TestInfo->{patch}->{Disposition}' patch disposition is incompatible with job ". $Job->Id); + is($Job->Status, $JobInfo->{Status}, "Check Status for job ". $Job->Id); } } @@ -741,12 +857,15 @@ sub CheckJobTree($;$) my ($Job, $TestInfo) = @_; return if (!IsJobInRange($Job)); - return if ($CheckedJobs{$Job->Id}); - $CheckedJobs{$Job->Id} = 1; + my $JobId = $Job->Id; # Simplify use in strings + return if ($CheckedJobs{$JobId}); + $CheckedJobs{$JobId} = 1; - my $HasTask; + my ($HasTask, $HasNewFailures); my $TestUnits = { wine => {} }; + my $Email = $Emails{$JobId}; + my %FailedVMs; my $Steps = $Job->Steps; foreach my $Step (sort { $a->No <=> $b->No } @{$Job->Steps->GetItems()}) { @@ -766,7 +885,22 @@ sub CheckJobTree($;$) foreach my $Task (sort { $a->No <=> $b->No } @{$Step->Tasks->GetItems()}) { $HasTask->{$TaskType} = 1; - CheckTask($Task, $TaskType, $TestInfo, $TestUnits); + my $NewFailures = CheckTask($Task, $TaskType, $TestInfo, $TestUnits); + if ($NewFailures) + { + $FailedVMs{$Task->VM->Name}++; + $HasNewFailures = 1; + } + + if ($Emails{$JobId}) + { + my $VMName = $Task->VM->Name; + if ($Task->Status !~ /^(?:canceled|skipped)$/ and $Email->{HasResEmail}) + { + ok($Email->{ResVMs}->{$VMName}, "Expecting $VMName logs / reports in the job $JobId results email"); + } + } + if ($TaskType =~ /^win(?:32|64)$/) { my $TestUnit = $Step->FileName; @@ -776,6 +910,22 @@ sub CheckJobTree($;$) } } } + if ($Email->{HasFailedEmail}) + { + foreach my $VMName (sort keys %FailedVMs) + { + # The emails count each VM once per task report containing a new error + # while CheckJobTree counts them only once per task. + ok(($Email->{FailedVMs}->{$VMName} || 0) >= $FailedVMs{$VMName}, + "Check for $VMName logs / reports in the job $JobId new failures email") + or diag("Expected at least $FailedVMs{$VMName} $VMName instance in the email, got $Email->{FailedVMs}->{$VMName}"); + delete $Email->{FailedVMs}->{$VMName}; + } + foreach my $VMName (sort keys %{$Email->{FailedVMs}}) + { + fail("New failure email for job $JobId reported an extra VM: $VMName"); + } + } CheckJob($Job, $TestInfo); # Ignore manually submitted jobs because they allow the developer to pick @@ -790,7 +940,7 @@ sub CheckJobTree($;$) if (CheckValue($TypeInfo->{HasTask})) { $HasTask->{$Type} ||= 0; - is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job ". $Job->Id); + is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job $JobId"); } next if ($TestUnits->{$Type}->{"*skipped*"}); @@ -798,11 +948,18 @@ sub CheckJobTree($;$) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) + ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); } } } + + if ($OptMbox) + { + my $Email = $Emails{$JobId}; + ok($Email->{HasResEmail}, "Looking for results email for job $JobId"); + is(!!$Email->{HasFailedEmail}, !!($Job->Status ne "completed" or $HasNewFailures), "Check presence of a new failures email for job $JobId"); + } } } @@ -986,6 +1143,12 @@ if (!$HasBaseVM->{build}) delete $HasBaseVM->{win64}; } +if (defined $OptMbox) +{ + print "***** Loading emails *****\n"; + LoadMbox($OptMbox); +} + print "***** Checking Patches *****\n"; CheckPatches(); -- 2.20.1

1 2

RFC testbot: Remove the VM status block from the main page.
by Francois Gouget 25 Jan '21

25 Jan '21

It is buried far far away at the end of the page so I doubt many people actually scroll down to check it out. As far as showing what the TestBot is doing, the Activity page does that way better. It does require having a TestBot account and being logged in but that hard seems like an issue. http://winetestbot.dolphin/Activity.pl The one information one cannot get from elsewhere without an administrator account is the role of each VM (base, winetest, extra, etc.). I'm not sure that's much of an issue. But maybe I'm wrong and there are some people who would really depend on it. If so let me know which part of it makes it a must have. diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 39fea3e7a..f4b675172 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -182,48 +182,6 @@ sub GenerateDataCell($$$$) } -package VMStatusBlock; - -use ObjectModel::CGI::CollectionBlock; -our @ISA = qw(ObjectModel::CGI::CollectionBlock); - - -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{Collection}->SortKeysBySortOrder($Keys); -} - -sub GetItemActions($) -{ - #my ($self) = @_; - return []; -} - -sub GetActions($) -{ - #my ($self) = @_; - return []; -} - -sub DisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - my $PropertyName = $PropertyDescriptor->GetName(); - return $PropertyName eq "Name" || $PropertyName eq "Type" || - $PropertyName eq "Role" || $PropertyName eq "Status" || - $PropertyName eq "Description"; -} - -sub GetDetailsPage($) -{ - #my ($self) = @_; - return undef; -} - - package StatusPage; use ObjectModel::CGI::Page; @@ -268,7 +226,6 @@ sub GenerateBody($) print "<h1>${ProjectName} Test Bot status</h1>\n"; print "<div class='Content'>\n"; - print "<h2>General</h2>\n"; print "<div class='GeneralStatus'>\n"; print "<div class='GeneralStatusItem'>"; if (PingEngine()) @@ -313,18 +270,12 @@ sub GenerateBody($) print "</div>\n"; } } - print "</div>\n"; + print "</div><br>\n"; - print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs(); my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - print "<h2><a name='vms'></a>VMs</h2>\n"; - my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); - $VMsCollectionBlock->GenerateList(); - print "</div>\n"; - print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } -- 2.20.1

2 1

[PATCH] wined3d: Select physical device with highest apiVersion.
by Jan Sikorski 25 Jan '21

25 Jan '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9a226edc65a..11f7db44370 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1980,8 +1980,8 @@ fail: static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_info) { - VkPhysicalDevice physical_devices[1]; - uint32_t count; + VkPhysicalDevice physical_devices[16]; + uint32_t count, selected = 0, i, best_api_version = 0; VkResult vr; if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, NULL))) < 0) @@ -1998,7 +1998,8 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in { /* TODO: Create wined3d_adapter for each device. */ FIXME("Multiple physical devices available.\n"); - count = 1; + if (count > ARRAY_SIZE(physical_devices)) + count = ARRAY_SIZE(physical_devices); } if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, physical_devices))) < 0) @@ -2007,7 +2008,17 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in return VK_NULL_HANDLE; } - return physical_devices[0]; + for (i = 0; i < count; ++i) + { + VkPhysicalDeviceProperties properties; + VK_CALL(vkGetPhysicalDeviceProperties(physical_devices[i], &properties)); + if (properties.apiVersion > best_api_version) { + selected = i; + best_api_version = properties.apiVersion; + } + } + + return physical_devices[selected]; } static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor vendor) -- 2.30.0

3 3

[PATCH] d2d1: Ignore whether the rectangle of the text layout in DrawText() is inverted.
by 陈Daxia 25 Jan '21

25 Jan '21

4 3

[PATCH 1/5] winegstreamer: Correct mistaken enum value in ProcessMessage.
by Derek Lesho 25 Jan '21

25 Jan '21

This is the message session relies on succeeding. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/audioconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index c5762bfdc60..82467b2f4e2 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -517,7 +517,7 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME switch(message) { - case MFT_MESSAGE_NOTIFY_START_OF_STREAM: + case MFT_MESSAGE_NOTIFY_BEGIN_STREAMING: return S_OK; default: FIXME("Unhandled message type %x.\n", message); -- 2.30.0

3 10

[PATCH 1/2] winevulkan: Skip commands which are declared but not defined.
by Liam Middlebrook 25 Jan '21

25 Jan '21

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40978a8fc7a..f4c5065ccd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2936,7 +2936,13 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extensions.append(ext_name) + # Need to verify that the command is defined, and otherwise skip it. + # vkCreateScreenSurfaceQNX is declared in <extensions> but not defined in + # <commands>. A command without a definition cannot be enabled, so it's valid for + # the XML file to handle this, but because of the manner in which we parse the XML + # file we pre-populate from <commands> before we check if a command is enabled. + if cmd_name in self.funcs: + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.29.2

1 1

[PATCH 1/5] d3d11: Add stub implementation for CreateDeviceContextState.
by Rémi Bernon 25 Jan '21

25 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As suggested, this is the beginning of a series implementating D3D11 state capture and restore, to fix the D2D1 regression [1] by using D3D11 interfaces in D2D1 instead of D3D10. [1] https://bugs.winehq.org/show_bug.cgi?id=49395 dlls/d3d11/d3d11_private.h | 12 +++ dlls/d3d11/device.c | 155 ++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 74 +++++++++++++----- 3 files changed, 219 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 3248285fcda..94a0fd8ce74 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -516,6 +516,18 @@ struct d3d_query *unsafe_impl_from_ID3D11Query(ID3D11Query *iface) DECLSPEC_HIDD struct d3d_query *unsafe_impl_from_ID3D10Query(ID3D10Query *iface) DECLSPEC_HIDDEN; struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) DECLSPEC_HIDDEN; +/* ID3DDeviceContextState */ +struct d3d_device_context_state +{ + ID3DDeviceContextState ID3DDeviceContextState_iface; + LONG refcount; + + struct wined3d_private_store private_store; + + ID3D11Device2 *device; + GUID emulated_interface; +}; + /* ID3D11DeviceContext - immediate context */ struct d3d11_immediate_context { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 50e8cd58fe2..2435c34dbff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -29,6 +29,140 @@ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = d3d_null_wined3d_object_destroyed, }; +/* ID3DDeviceContextState methods */ + +static inline struct d3d_device_context_state *impl_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_device_context_state, ID3DDeviceContextState_iface); +} + +static inline struct d3d_device *device_from_ID3DDeviceContextState(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + return impl_from_ID3D11Device2(state->device); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_QueryInterface(ID3DDeviceContextState *iface, + REFIID iid, void **out) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID3DDeviceContextState) + || IsEqualGUID(iid, &IID_ID3D11DeviceChild) + || IsEqualGUID(iid, &IID_IUnknown)) + { + *out = &state->ID3DDeviceContextState_iface; + } + else + { + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; + } + + ID3DDeviceContextState_AddRef(iface); + return S_OK; +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + struct d3d_device *device = device_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); + + TRACE("%p increasing refcount to %u.\n", state, refcount); + + if (refcount == 1) + { + ID3D11Device2_AddRef(&device->ID3D11Device2_iface); + } + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + struct d3d_device *device = device_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device2_Release(&device->ID3D11Device2_iface); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d_device_context_state_GetDevice(ID3DDeviceContextState *iface, ID3D11Device **device) +{ + struct d3d_device *device_object = device_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D11Device *)&device_object->ID3D11Device2_iface; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_GetPrivateData(ID3DDeviceContextState *iface, REFGUID guid, + UINT *data_size, void *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_SetPrivateData(ID3DDeviceContextState *iface, REFGUID guid, + UINT data_size, const void *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d_device_context_state_SetPrivateDataInterface(ID3DDeviceContextState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static const struct ID3DDeviceContextStateVtbl d3d_device_context_state_vtbl = +{ + /* IUnknown methods */ + d3d_device_context_state_QueryInterface, + d3d_device_context_state_AddRef, + d3d_device_context_state_Release, + /* ID3D11DeviceChild methods */ + d3d_device_context_state_GetDevice, + d3d_device_context_state_GetPrivateData, + d3d_device_context_state_SetPrivateData, + d3d_device_context_state_SetPrivateDataInterface, +}; + +static void d3d_device_context_state_init(struct d3d_device_context_state *state, struct d3d_device *device, + REFIID emulated_interface) +{ + state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; + state->refcount = 1; + state->emulated_interface = *emulated_interface; + ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface); + + wined3d_private_store_init(&state->private_store); +} + /* ID3D11DeviceContext - immediate context methods */ static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext1(ID3D11DeviceContext1 *iface) @@ -3738,11 +3872,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev const D3D_FEATURE_LEVEL *feature_levels, UINT feature_levels_count, UINT sdk_version, REFIID emulated_interface, D3D_FEATURE_LEVEL *chosen_feature_level, ID3DDeviceContextState **state) { + struct d3d_device *device = impl_from_ID3D11Device2(iface); + struct d3d_device_context_state *state_impl; + FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p stub!\n", iface, flags, feature_levels, + "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", iface, flags, feature_levels, feature_levels_count, sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); - return E_NOTIMPL; + if (chosen_feature_level) + FIXME("Device context state feature level not implemented yet.\n"); + + if (state) + { + *state = NULL; + if (!(state_impl = heap_alloc(sizeof(*state_impl)))) + return E_OUTOFMEMORY; + d3d_device_context_state_init(state_impl, device, emulated_interface); + *state = &state_impl->ID3DDeviceContextState_iface; + } + + device->d3d11_only = FALSE; + if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); + return state ? S_OK : S_FALSE; } static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource1(ID3D11Device2 *iface, HANDLE handle, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9fc09a5ec83..fde7a11766d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6683,10 +6683,9 @@ static void test_device_context_state(void) ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); - feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_11_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, - &IID_ID3D10Device, NULL, &context_state); -todo_wine + &IID_ID3D11Device1, NULL, &context_state); ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); if (FAILED(hr)) { @@ -6700,6 +6699,24 @@ todo_wine context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + check_interface(device, &IID_ID3D11Device, TRUE, FALSE); + check_interface(device, &IID_ID3D11Device1, TRUE, FALSE); + + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D10Device, NULL, &context_state); + ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + refcount = get_refcount(context_state); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + cb = create_buffer((ID3D11Device *)device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), NULL); ID3D11DeviceContext1_CSSetConstantBuffers(context, 0, 1, &cb); @@ -6743,73 +6760,90 @@ todo_wine ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(previous_context_state != NULL, "Failed to get previous context state\n"); + + context_type = ID3D11DeviceContext1_GetType(context); + ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); - ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler && tmp_sampler != (ID3D11SamplerState *)0xdeadbeef) + ID3D11SamplerState_Release(tmp_sampler); if (!enable_debug_layer) ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_CSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_DSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_DSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_GSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_HSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_HSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_VSGetSamplers(context, 0, 1, &tmp_sampler); - ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); - - context_type = ID3D11DeviceContext1_GetType(context); - ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); + todo_wine ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + if (tmp_sampler) ID3D11SamplerState_Release(tmp_sampler); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_PSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_VSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_DSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_GSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_HSGetConstantBuffers(context, 0, 1, &tmp_cb); - ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + todo_wine ok(!tmp_cb, "Got unexpected buffer %p.\n", tmp_cb); + if (tmp_cb) ID3D11Buffer_Release(tmp_cb); check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); + if (!context_state) refcount = 0; + else refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3DDeviceContextState_Release(previous_context_state); + if (!previous_context_state) refcount = 0; + else refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); /* ID3DDeviceContextState retains the previous state. */ -- 2.30.0

3 9

[PATCH 2/3] winebuild: Use lld-link to create importlibs on MSVC target.
by Jacek Caban 25 Jan '21

25 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 31 +++++++++++++++++++++---------- tools/winebuild/spec32.c | 10 ++++++++-- tools/winebuild/utils.c | 11 +++++++++++ 4 files changed, 41 insertions(+), 12 deletions(-)

1 1

[PATCH] wined3d: Trace the available Vulkan extensions.
by Henri Verbeet 25 Jan '21

25 Jan '21

Like we do for OpenGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9a226edc65a0..d2ac652ab629 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1853,6 +1853,12 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, goto done; } + TRACE("Vulkan instance extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) { if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) @@ -2207,6 +2213,12 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk goto done; } + TRACE("Vulkan device extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) { if (info[i].core_since_version <= vk_info->api_version) -- 2.20.1

1 0

[PATCH] mfmediaengine: Return current session time in GetCurrentTime().
by Nikolay Sivov 25 Jan '21

25 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 55585b8b826..5981548c9f8 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -99,6 +99,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; + IMFClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -774,6 +775,8 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); + if (engine->clock) + IMFClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -987,9 +990,22 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + LONGLONG clocktime; + double ret = 0.0; + MFTIME systime; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + { + /* Assume 100ns clock. */ + ret = (double)clocktime / 10000000.0; + } + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -1644,6 +1660,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + return hr; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr; -- 2.29.2

1 0

[PATCH] wined3d: Make adapter_gl_clear_uav() static.
by Zebediah Figura 25 Jan '21

25 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..d9f70049e6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5012,7 +5012,7 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } -void adapter_gl_clear_uav(struct wined3d_context *context, +static void adapter_gl_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); -- 2.29.2

2 1

[tools] testbot/PatchUtils: Always track modified paths, if only for deletions.
by Francois Gouget 25 Jan '21

25 Jan '21

We track all deleted and (re)added files. Global files and scripts should be no exception even if they are unlikely to be deleted / (re)added. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 974ff8eb6..5588df204 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -138,9 +138,9 @@ sub _LoadWineFiles() # These paths are too generic to be proof that this is a Wine patch. my $AmbiguousPathsRe = join('|', 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment + 'aclocal\.m4$', + 'configure$', + 'configure\.ac$', 'include/Makefile\.in$', 'include/config\.h\.in$', 'po/', @@ -313,42 +313,50 @@ sub GetPatchImpacts($) my ($Path, $Change); while (my $Line = <$fh>) { - if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) + if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) + elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/server/protocol\.def$=) + elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { + $Path = $1; $Impacts->{MakeFir} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { + $Path = $1; $Impacts->{MakeErrors} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) + elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{IsWinePatch} = 1; } -- 2.20.1

1 0

[tools] winetest/dissect: Minor tweaks to match the TestBot parser.
by Francois Gouget 25 Jan '21

25 Jan '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 8f30ccde2..c62f9141b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -591,7 +591,7 @@ sub close_test_unit($) $line =~ /^Test output:/ or mydie "no test header: $line"; while ($line = <IN>) { $unitsize += length($line); - next if ($line =~ /^\s*$/); + next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) @@ -697,8 +697,8 @@ while ($line = <IN>) { # There may be more than one summary line due to child processes $pids{$l_pid || 0} = 1; $s_total += $l_total; - $s_todo += $l_todo; $s_failures += $l_failures; + $s_todo += $l_todo; $s_skipped += $l_skipped; add_test_line($class, escapeHTML($line)); } -- 2.20.1

1 0

[PATCH 3/3] winebuild: Use lld-link for static libraries on msvc target.
by Jacek Caban 25 Jan '21

25 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/import.c | 44 +++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] winebuild: Make mingw a separated platform from msvc.
by Jacek Caban 25 Jan '21

25 Jan '21

Based on winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 6 ++++++ tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 21 +++++++++++---------- tools/winebuild/relay.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 14 +++++++------- tools/winebuild/utils.c | 15 ++++++++++++--- 7 files changed, 41 insertions(+), 25 deletions(-)

1 0

[tools 1/4] testbot/LogUtils: Add support for arrays in .errors files.
by Francois Gouget 25 Jan '21

25 Jan '21

Array lines allow providing multiple values for a given 'property' name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 30 ++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3488c7b28..79714358c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -848,6 +848,10 @@ Property lines contain (name, value) pairs. Note that properties which can be calculated while reading the errors file are not saved (e.g. ErrCount and NewCount). +=item a <name> <value> +Array lines contain (name, value) pairs and can appear multiple times for a +given name, resulting in a corresponding list of values. + =item g <lineno> <groupname> Group lines contain the group name and the line number of the first line of the group in the log. Note that the first line would typically not be an @@ -897,6 +901,22 @@ sub LoadLogErrorsFromFh($$) return $Line; } } + elsif ($Type eq "a") + { + if (!defined $LogInfo->{$Property}) + { + $LogInfo->{$Property} = [ $Value ]; + } + elsif (ref($LogInfo->{$Property}) eq "ARRAY") + { + push @{$LogInfo->{$Property}}, $Value; + } + else + { + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: $Property is not an array, its value is $LogInfo->{$Property}"; + return $Line; + } + } elsif ($Type eq "g") { $LogInfo->{CurGroup} = _AddLogGroup($LogInfo, $Value, $Property); @@ -1025,7 +1045,15 @@ sub _DumpErrors next; } - print STDERR "+ $Key $LogInfo->{$Key}\n"; + if (ref($LogInfo->{$Key}) eq "ARRAY") + { + print STDERR "+ $Key\n"; + map { print STDERR " | $_\n" } (@{$LogInfo->{$Key}}); + } + else + { + print STDERR "+ $Key $LogInfo->{$Key}\n"; + } } _WriteLogErrorsToFh(*STDERR, $LogInfo); map { _DumpErrors("$Label.$_", $LogInfo->{$_}) } (@SubKeys); -- 2.20.1

1 3

[PATCH] crypt32: Also import user/admin defined root certificates on macOS.
by Piotr Caban 25 Jan '21

25 Jan '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/unixlib.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

1 0

[PATCH 1/5] include: Add windows.media.speechsynthesis.idl draft.
by Rémi Bernon 25 Jan '21

25 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the continuation of my WinRT support patches, tracked in [1]. I've left the DECLSPEC_SELECTANY runtimeclass string constants aside for now, and I'll add them to the generated headers in a separate patch. A previous version of whole series is already in Wine Staging, and it has been successfully used [2] by Steve Lhomme <robux4(a)ycbcr.xyz> for VLC, and who also contributed fixes that I've merged in the series. [1] https://bugs.winehq.org/show_bug.cgi?id=49998 [2] https://github.com/robUx4/mingw-w64/commits/vlc_winrt/12 This IDL is used by windows.media.speech.dll, which is itself required by Flight Simulator. It will here be used as an illustration and test case for WIDL WinRT features. include/Makefile.in | 1 + include/windows.media.speechsynthesis.idl | 47 +++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 include/windows.media.speechsynthesis.idl diff --git a/include/Makefile.in b/include/Makefile.in index 74a1d8e0c89..096fb4554e5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -745,6 +745,7 @@ SOURCES = \ windef.h \ windns.h \ windows.foundation.idl \ + windows.media.speechsynthesis.idl \ windows.h \ windowscontracts.idl \ windowsx.h \ diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl new file mode 100644 index 00000000000..7a1de5fcba6 --- /dev/null +++ b/include/windows.media.speechsynthesis.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2020 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + typedef enum VoiceGender VoiceGender; + interface IInstalledVoicesStatic; + interface IVoiceInformation; + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechSynthesis { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum VoiceGender + { + Male = 0, + Female = 1 + }; + } + } +} -- 2.30.0

4 14

[PATCH] msvcrt: Fix lldiv definition in spec files.
by Paul Gofman 25 Jan '21

25 Jan '21

lldiv returns lldiv_t structure (which includes two int64). In such case the address of return structure is implicitly passed as the first parameter. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes No Man's Sky crashig with +relay trace. .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index c81c3d42127..62e79a35cda 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ cdecl lldiv(int64 int64) ucrtbase.lldiv +@ cdecl lldiv(ptr int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b15a6219c52..e79fa9e3aed 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl lldiv(ptr int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c4782b5977b..8a69cbac82f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl lldiv(ptr int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b8ba61a2e8c..09a1f99401d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl lldiv(ptr int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b99bb2ee614..7e9d096a8eb 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ cdecl lldiv(int64 int64) msvcr120.lldiv +@ cdecl lldiv(ptr int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b1d6cf992b4..ad6ac73a17e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl lldiv(ptr int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint -- 2.29.2

2 4

[PATCH] msvcrt: Add -norelay flag to lldiv definition in spec files.
by Paul Gofman 25 Jan '21

25 Jan '21

lldiv returns lldiv_t structure (which includes two int64). In such case the address of return structure is implicitly passed as the first parameter. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 198481. Fixes No Man's Sky crashing with +relay trace. .../api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index c81c3d42127..584e61dd652 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ cdecl lldiv(int64 int64) ucrtbase.lldiv +@ cdecl -norelay lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b15a6219c52..6af92d7ea6f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c4782b5977b..45d8e2b3507 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b8ba61a2e8c..91be9c65d2d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b99bb2ee614..f5d6cde1cac 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ cdecl lldiv(int64 int64) msvcr120.lldiv +@ cdecl -norelay lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b1d6cf992b4..0a8d74521f5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint -- 2.29.2

2 1

[PATCH] po: Updated Dutch translation.
by floris 25 Jan '21

25 Jan '21

Updated Dutch translation --- Floris

3 3

[PATCH 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye 25 Jan '21

25 Jan '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6cbe725bada..7d1eb5437df 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2332,6 +2332,84 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ptr = ptr->Next; + } + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} + START_TEST(iphlpapi) { @@ -2364,6 +2442,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

2 2

[PATCH 1/2] msi: Check for failure from do_msidbCustomActionTypeDll().
by Zebediah Figura 25 Jan '21

25 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b3ac7327d94..7ae7e45af29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -771,7 +771,8 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); - info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); } @@ -876,7 +877,8 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const return ERROR_FUNCTION_FAILED; } - info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); } -- 2.29.2

2 3

[PATCH 1/2] advapi32/tests: Add some tests for querying the security of pseudo-handles.
by Zebediah Figura 24 Jan '21

24 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6d2d5f56f1b..0c1c498bbce 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7871,6 +7871,34 @@ static void test_create_process_token_child(void) } } +static void test_pseudo_handle_security(void) +{ + char buffer[200]; + PSECURITY_DESCRIPTOR sd = buffer, *sd_ptr; + DWORD size; + BOOL ret; + + ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(ret, "got error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(HKEY_CLASSES_ROOT, OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError()); + + todo_wine ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_REGISTRY_KEY, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + ok(!ret, "got error %u\n", ret); + LocalFree(sd_ptr); + + ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_KERNEL_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); + ok(ret == ERROR_INVALID_HANDLE, "got error %u\n", ret); +} + START_TEST(security) { init(); @@ -7935,6 +7963,7 @@ START_TEST(security) test_BuildSecurityDescriptorW(); test_duplicate_handle_access(); test_create_process_token(); + test_pseudo_handle_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor(); -- 2.29.2

3 3

[PATCH v2 resend 1/2] include: Add IFileOperation interface.
by Jactry Zeng 24 Jan '21

24 Jan '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/shobjidl.idl | 117 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 42ef264ed86..ab9b64430aa 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3871,4 +3871,121 @@ library ShellObjects { interface IApplicationActivationManager; } + + [ + uuid(3ad05575-8857-4850-9277-11b85bdb8e09) + ] + coclass FileOperation + { + interface IFileOperation; + } +} + +[v1_enum] enum _OPPROGDLGF +{ + OPPROGDLG_DEFAULT = 0x00000000, + OPPROGDLG_ENABLEPAUSE = 0x00000080, + OPPROGDLG_ALLOWUNDO = 0x00000100, + OPPROGDLG_DONTDISPLAYSOURCEPATH = 0x00000200, + OPPROGDLG_DONTDISPLAYDESTPATH = 0x00000400, + OPPROGDLG_NOMULTIDAYESTIMATES = 0x00000800, + OPPROGDLG_DONTDISPLAYLOCATIONS = 0x00001000, +}; +typedef DWORD OPPROGDLGF; + +typedef [v1_enum] enum _SPACTION { + SPACTION_NONE = 0, + SPACTION_MOVING, + SPACTION_COPYING, + SPACTION_RECYCLING, + SPACTION_APPLYINGATTRIBS, + SPACTION_DOWNLOADING, + SPACTION_SEARCHING_INTERNET, + SPACTION_CALCULATING, + SPACTION_UPLOADING, + SPACTION_SEARCHING_FILES, + SPACTION_DELETING, + SPACTION_RENAMING, + SPACTION_FORMATTING, + SPACTION_COPY_MOVING, +} SPACTION; + +[ + object, + uuid(0c9fb851-e5c9-43eb-a370-f0677b13874c), + pointer_default(unique) +] +interface IOperationsProgressDialog : IUnknown +{ + [v1_enum] enum _PDMODE + { + PDM_DEFAULT = 0x00000000, + PDM_RUN = 0x00000001, + PDM_PREFLIGHT = 0x00000002, + PDM_UNDOING = 0x00000004, + PDM_ERRORSBLOCKING = 0x00000008, + PDM_INDETERMINATE = 0x00000010, + }; + typedef DWORD PDMODE; + + typedef [v1_enum] enum PDOPSTATUS + { + PDOPS_RUNNING = 1, + PDOPS_PAUSED = 2, + PDOPS_CANCELLED = 3, + PDOPS_STOPPED = 4, + PDOPS_ERRORS = 5, + } PDOPSTATUS; + + HRESULT StartProgressDialog([in, unique] HWND owner, [in] OPPROGDLGF flags); + HRESULT StopProgressDialog(); + HRESULT SetOperation([in] SPACTION action); + HRESULT SetMode([in] PDMODE mode); + HRESULT UpdateProgress([in] ULONGLONG current_points, [in] ULONGLONG total_points, + [in] ULONGLONG current_size, [in] ULONGLONG total_size, + [in] ULONGLONG current_item, [in] ULONGLONG total_item); + HRESULT UpdateLocations([in, unique] IShellItem *source, [in, unique] IShellItem *target, + [in, unique] IShellItem *item); + HRESULT ResetTimer(); + HRESULT PauseTimer(); + HRESULT ResumeTimer(); + HRESULT GetMilliseconds([out] ULONGLONG *elapsed, [out] ULONGLONG *remaining); + HRESULT GetOperationStatus([out] PDOPSTATUS *status); +} + +[ + object, + uuid(947aab5f-0a5c-4c13-b4d6-4bf7836fc9f8), + pointer_default(unique) +] +interface IFileOperation : IUnknown +{ + HRESULT Advise([in] IFileOperationProgressSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT SetOperationFlags([in] DWORD flags); + HRESULT SetProgressMessage([in, string] LPCWSTR message); + HRESULT SetProgressDialog([in] IOperationsProgressDialog *dialog); + HRESULT SetProperties([in] IPropertyChangeArray *array); + HRESULT SetOwnerWindow([in] HWND owner); + HRESULT ApplyPropertiesToItem([in] IShellItem *item); + HRESULT ApplyPropertiesToItems([in] IUnknown *items); + HRESULT RenameItem([in] IShellItem *item, [in, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT RenameItems([in] IUnknown *items, [in, string] LPCWSTR name); + HRESULT MoveItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT MoveItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT CopyItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT CopyItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT DeleteItem([in] IShellItem *item, + [in, unique] IFileOperationProgressSink *sink); + HRESULT DeleteItems([in] IUnknown *items); + HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique] IFileOperationProgressSink *sink); + HRESULT PerformOperations(); + HRESULT GetAnyOperationsAborted([out] BOOL *aborted); } -- 2.29.2

1 1

[PATCH] netprofm: set *ret=NULL if no more connections
by Alex Xu (Hello71) 24 Jan '21

24 Jan '21

Qt 5.14+ tries to check network connection suitability when any network connection is made. Unfortunately, this is done incorrectly. The return value of IEnumNetworkConnections::Next is only checked for failure, not for S_FALSE. Instead, !*ret is used to quit the loop. Apparently, Windows puts NULL in the output in this case. It is possible that all of the non-populated slots are actually set to NULL, but Qt only uses count=1. To work around the issue, make Wine set NULL too. Signed-off-by: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> --- dlls/netprofm/list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f9b9e2e..833236a 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1013,6 +1013,7 @@ static HRESULT WINAPI connections_enum_Next( i++; } if (fetched) *fetched = i; + if (!i) ret[0] = NULL; return i < count ? S_FALSE : S_OK; } -- 2.30.0

2 1

[PATCH vkd3d 1/4] vkd3d-shader: Parse #line directives.
by Zebediah Figura 23 Jan '21

23 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++------ libs/vkd3d-shader/preproc.y | 12 ++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 1bf14ff4..0ce75f0e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -52,6 +52,7 @@ static void update_location(struct preproc_ctx *ctx); %s ERROR %s INCLUDE +%s LINE NEWLINE \r?\n WS [ \t] @@ -91,9 +92,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>## {return T_CONCAT;} @@ -103,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">>"=? {return T_TEXT;} <INITIAL>[-+*/%&|^]= {return T_TEXT;} -<INCLUDE>\"[^"]*\" {return T_STRING;} +<INCLUDE,LINE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} /* C strings (including escaped quotes). */ @@ -131,6 +132,12 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_INCLUDE; } + if (!strcmp(p, "line")) + { + BEGIN(LINE); + return T_LINE; + } + if (!strcmp(p, "define")) return T_DEFINE; if (!strcmp(p, "elif")) @@ -155,8 +162,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_TEXT; } -<INITIAL,INCLUDE>\\{NEWLINE} {} -<INITIAL,INCLUDE,ERROR>{NEWLINE} { +<INITIAL,INCLUDE,LINE>\\{NEWLINE} {} +<INITIAL,INCLUDE,ERROR,LINE>{NEWLINE} { BEGIN(INITIAL); return T_NEWLINE; } @@ -371,6 +378,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_LINE: case T_PRAGMA: case T_UNDEF: ctx->current_directive = token; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 7a995430..01437b2b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_LINE "#line" %token T_PRAGMA "#pragma" %token T_UNDEF "#undef" @@ -671,6 +672,17 @@ directive } vkd3d_free($2); } + | T_LINE T_INTEGER T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + } + | T_LINE T_INTEGER T_STRING T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + vkd3d_free($3); + } primary_expr : T_INTEGER -- 2.30.0

1 3

[PATCH] netprofm: set *ret=NULL if no more connections
by Alex Xu (Hello71) 23 Jan '21

23 Jan '21

Qt 5.14+ tries to check network connection suitability when any network connection is made. Unfortunately, this is done incorrectly. The return value of IEnumNetworkConnections::Next is only checked for failure, not for S_FALSE. Instead, !*ret is used to quit the loop. Apparently, Windows puts NULL in the output in this case. It is possible that all of the non-populated slots are actually set to NULL, but Qt only uses count=1. To work around the issue, make Wine set NULL too. Signed-off-by: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> --- dlls/netprofm/list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f9b9e2e..833236a 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1013,6 +1013,7 @@ static HRESULT WINAPI connections_enum_Next( i++; } if (fetched) *fetched = i; + if (!i) ret[0] = NULL; return i < count ? S_FALSE : S_OK; } -- 2.30.0

1 0

[PATCH 1/6] winegstreamer: Avoid using Wine debug functions in no_more_pads().
by Zebediah Figura 23 Jan '21

23 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e85e54c2e34..56b8225c3df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1398,7 +1398,8 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { struct parser *filter = user; - TRACE("filter %p.\n", filter); + + GST_DEBUG("filter %p.", filter); pthread_mutex_lock(&filter->mutex); filter->no_more_pads = true; -- 2.30.0

1 5

[patch resend] uiautomationcore: Add stub UiaRegisterProviderCallback function
by Vijay Kiran Kamuju 23 Jan '21

23 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50508 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V2 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.
by Jefferson Carpenter 23 Jan '21

23 Jan '21

See commit message for differences from V1. I'd like to send a smaller patch, but I feel like this functionality is pretty irreducible. The method bodies all have to be modified by the time you add an alternate destination. Didn't touch encoding property: "The encoding property has no effect for BSTR or DOM output" [1] [1] https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ms764660… thanks, Jefferson

1 1

[PATCH V2 1/2] msxml3/tests: Test mxwriter DOMDocument output.
by Jefferson Carpenter 23 Jan '21

23 Jan '21

This patch series supersedes 198422. Thanks, sorry for having you re-assign the reviewer. Submitting the conformance test separately first. thanks, Jefferson

1 0

[PATCH vkd3d 1/5] vkd3d-shader: Implement equality operators in #if directives.
by Zebediah Figura 22 Jan '21

22 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.l | 4 +++- libs/vkd3d-shader/preproc.y | 26 ++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 30bea627..76a2f31a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 6779a39e..d21ddd1f 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -80,6 +80,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"<=" {return T_LE;} <INITIAL>">=" {return T_GE;} +<INITIAL>"==" {return T_EQ;} +<INITIAL>"!=" {return T_NE;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -99,7 +101,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 6d88419e..089fd760 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -334,6 +334,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_LE "<=" %token T_GE ">=" +%token T_EQ "==" +%token T_NE "!=" %token T_DEFINED "defined" %type <integer> primary_expr @@ -341,6 +343,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> mul_expr %type <integer> add_expr %type <integer> ineq_expr +%type <integer> eq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -473,6 +476,14 @@ body_token_const { $$ = ">="; } + | T_EQ + { + $$ = "=="; + } + | T_NE + { + $$ = "!="; + } | T_DEFINED { $$ = "defined"; @@ -510,7 +521,7 @@ directive } vkd3d_free($2); } - | T_IF ineq_expr T_NEWLINE + | T_IF eq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -525,7 +536,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF ineq_expr T_NEWLINE + | T_ELIF eq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -707,3 +718,14 @@ ineq_expr { $$ = $1 >= $3; } + +eq_expr + : ineq_expr + | eq_expr T_EQ ineq_expr + { + $$ = $1 == $3; + } + | eq_expr T_NE ineq_expr + { + $$ = $1 != $3; + } -- 2.30.0

3 14

[PATCH v2 1/2] winevulkan: Wrap VkSurfaceKHR in winevulkan.
by Georg Lehmann 22 Jan '21

22 Jan '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winemac.drv/vulkan.c | 4 +-- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++-- dlls/winevulkan/vulkan.c | 47 ++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_private.h | 17 ++++++++++++ dlls/winex11.drv/vulkan.c | 4 +-- 5 files changed, 97 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index dd92231d3ea..1f70059dc65 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -99,7 +99,7 @@ static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *n static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { - return (struct wine_vk_surface *)(uintptr_t)handle; + return vulkan_driver_get_surface_data(handle); } static void *vulkan_handle; @@ -320,7 +320,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } - *surface = (uintptr_t)mac_surface; + vulkan_driver_init_surface(*surface, mac_surface->surface, mac_surface); release_win_data(data); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1ae6fdbff64..6242ddcce0b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -131,7 +131,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 8 +DRIVER_VERSION = 9 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -174,7 +174,7 @@ FUNCTION_OVERRIDES = { "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface - "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceSurfaceSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetPhysicalDeviceSurfaceCapabilitiesKHR" : {"dispatch" : True, "driver" : True, "thunk" : False, "private_thunk" : True}, "vkGetPhysicalDeviceSurfaceFormatsKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, @@ -185,7 +185,7 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceSurfaceFormats2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_win32_surface - "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkCreateWin32SurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_swapchain @@ -2584,6 +2584,32 @@ class VkGenerator(object): f.write(" name -= 2;\n\n") f.write(" return get_vulkan_driver_device_proc_addr(vulkan_funcs, name);\n}\n\n") + f.write("struct wine_surface_base\n") + f.write("{\n") + f.write(" VkSurfaceKHR surface; /* native surface */\n") + f.write(" void *driver_data;\n") + f.write("};\n\n") + + f.write("static inline void vulkan_driver_init_surface(\n") + f.write(" VkSurfaceKHR surface, VkSurfaceKHR native_surface, void *data)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" object->surface = native_surface;\n") + f.write(" object->driver_data = data;\n") + f.write("};\n\n") + + f.write("static inline VkSurfaceKHR vulkan_driver_get_native_surface(VkSurfaceKHR surface)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" return object->surface;\n") + f.write("};\n\n") + + f.write("static inline void *vulkan_driver_get_surface_data(VkSurfaceKHR surface)\n") + f.write("{\n") + f.write(" struct wine_surface_base *object = (void *)(uintptr_t)surface;\n") + f.write(" return object->driver_data;\n") + f.write("};\n\n") + f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") def generate_vulkan_spec(self, f): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b0a8559fe2c..9b3064e2a44 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1770,6 +1770,53 @@ void WINAPI wine_vkGetPrivateDataEXT(VkDevice device, VkObjectType object_type, device->funcs.p_vkGetPrivateDataEXT(device->device, object_type, object_handle, private_data_slot, data); } +VkResult WINAPI wine_vkCreateWin32SurfaceKHR(VkInstance instance, + const VkWin32SurfaceCreateInfoKHR *createInfo, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) +{ + struct wine_surface *object; + VkResult res; + + TRACE("%p, %p, %p, %p\n", instance, createInfo, allocator, surface); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + object = heap_alloc_zero(sizeof(*object)); + + if (!object) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + *surface = wine_surface_to_handle(object); + + res = instance->funcs.p_vkCreateWin32SurfaceKHR(instance->instance, createInfo, NULL, surface); + + if (res != VK_SUCCESS) + { + heap_free(object); + *surface = VK_NULL_HANDLE; + return res; + } + + WINE_VK_ADD_NON_DISPATCHABLE_MAPPING(instance, object, object->base.surface); + + return VK_SUCCESS; +} + +void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator) +{ + struct wine_surface *object = wine_surface_from_handle(surface); + + TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(surface), allocator); + + if (!object) + return; + + instance->funcs.p_vkDestroySurfaceKHR(instance->instance, surface, NULL); + + WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); + heap_free(object); +} + static inline void adjust_max_image_count(VkPhysicalDevice phys_dev, VkSurfaceCapabilitiesKHR* capabilities) { /* Many Windows games, for example Strange Brigade, No Man's Sky, Path of Exile diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 92c04543587..bf49371e40e 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -213,6 +213,23 @@ static inline VkDebugReportCallbackEXT wine_debug_report_callback_to_handle( return (VkDebugReportCallbackEXT)(uintptr_t)debug_messenger; } +struct wine_surface +{ + struct wine_surface_base base; + + struct wine_vk_mapping mapping; +}; + +static inline struct wine_surface *wine_surface_from_handle(VkSurfaceKHR handle) +{ + return (struct wine_surface *)(uintptr_t)handle; +} + +static inline VkSurfaceKHR wine_surface_to_handle(struct wine_surface *surface) +{ + return (VkSurfaceKHR)(uintptr_t)surface; +} + void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4de82586906..f908d3f7777 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -99,7 +99,7 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) { - return (struct wine_vk_surface *)(uintptr_t)handle; + return vulkan_driver_get_surface_data(handle); } static void *vulkan_handle; @@ -324,7 +324,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); LeaveCriticalSection(&context_section); - *surface = (uintptr_t)x11_surface; + vulkan_driver_init_surface(*surface, x11_surface->surface, x11_surface); TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); return VK_SUCCESS; -- 2.30.0

2 3

[PATCH] jscript: Add VT_CY type support.
by Jacek Caban 22 Jan '21

22 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 6 +++++ dlls/jscript/tests/lang.js | 28 +++++++++++++++++++++ dlls/jscript/tests/run.c | 51 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+)

1 0

[PATCH] po: Updated Dutch translation.
by floris 22 Jan '21

22 Jan '21

Updated Dutch translation Floris Renaud

2 1

[PATCH] po: Updated Dutch translation.
by floris 22 Jan '21

22 Jan '21

A patch for the Dutch translation. I hope it can be added. Floris Renaud

2 1

[PATCH 18/18] kernel32/tests: Add debugger syscall handling tests.
by Jacek Caban 22 Jan '21

22 Jan '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 172 ++++++++++++++++++++++++++++++++- 1 file changed, 171 insertions(+), 1 deletion(-)

2 1

[tools 1/5] testbot/TestWTBS: Skip the base Windows VMs if there is no base build VM.
by Francois Gouget 22 Jan '21

22 Jan '21

Do not report errors about missing Windows tasks if the TestBot only has Wine VMs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5f62d634e..c5ac9e1a4 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -696,6 +696,12 @@ foreach my $VM (@{$VMs->GetItems()}) { $HasBaseVM->{$VM->Type} = 1 if ($VM->Role eq "base"); } +if (!$HasBaseVM->{build}) +{ + # Cannot run the tests on Windows if there is no build VM + delete $HasBaseVM->{win32}; + delete $HasBaseVM->{win64}; +} CheckJobs(); -- 2.20.1

1 4