February 2016 - Wine-commits

Sebastian Lackner : xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: caff64333f6dfee3b99cc067ed522da101f40a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=caff64333f6dfee3b99cc067e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:12:12 2016 +0100 xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 503c974..1393599 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1252,12 +1252,14 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ HeapFree(GetProcessHeap(), 0, src->sends); IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); + src->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&src->lock); HeapFree(GetProcessHeap(), 0, src); } LIST_FOR_EACH_ENTRY_SAFE(sub, sub2, &This->submix_voices, XA2SubmixImpl, entry){ IXAudio2SubmixVoice_DestroyVoice(&sub->IXAudio2SubmixVoice_iface); + sub->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&sub->lock); HeapFree(GetProcessHeap(), 0, sub); } @@ -1273,6 +1275,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) CloseHandle(This->mmevt); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This);

1 0

Sebastian Lackner : mciqtz32: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 3179dd7bb1abee00f33ba2e4484838a7e86f40ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=3179dd7bb1abee00f33ba2e44… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:16:57 2016 +0100 mciqtz32: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 24d48f3..aa257a0 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -162,6 +162,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) CloseHandle(wma->task.notify); CloseHandle(wma->task.done); CloseHandle(wma->task.thread); + wma->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&wma->cs); mciSetDriverData(dwDevID, 0); CloseHandle(wma->stop_event);

1 0

Sebastian Lackner : winmm: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 4dcb21933981a196830b3ce63cd0b4dfe3ff6211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb21933981a196830b3ce63… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:31:55 2016 +0100 winmm: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a4917a2..2d8b838 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -206,12 +206,14 @@ void WINMM_DeleteWaveform(void) WINMM_Device *device = mmdevice->devices[j]; if(device->handle) CloseHandle(device->handle); + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); } if(mmdevice->volume) ISimpleAudioVolume_Release(mmdevice->volume); CoTaskMemFree(mmdevice->dev_id); + mmdevice->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mmdevice->lock); } @@ -222,12 +224,14 @@ void WINMM_DeleteWaveform(void) WINMM_Device *device = mmdevice->devices[j]; if(device->handle) CloseHandle(device->handle); + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); } if(mmdevice->volume) ISimpleAudioVolume_Release(mmdevice->volume); CoTaskMemFree(mmdevice->dev_id); + mmdevice->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&mmdevice->lock); }

1 0

Nikolay Sivov : gdi32: Only REG_SZ and REG_MULTI_SZ types make sense for font replacement, ignore the rest.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 932838faa3d608d2b74cd98b8427389169fbe26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=932838faa3d608d2b74cd98b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 01:50:49 2016 +0300 gdi32: Only REG_SZ and REG_MULTI_SZ types make sense for font replacement, ignore the rest. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9fa520f..cf3df53 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2387,7 +2387,7 @@ static void LoadReplaceList(void) replace += strlenW(replace) + 1; } } - else + else if (type == REG_SZ) map_font_family(value, data); } else

1 0

Nikolay Sivov : dwrite: Support font replacement registry settings.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 5a262d45dcb1b6675e2309e9c0086e0bf2acd20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a262d45dcb1b6675e2309e9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 12 01:51:58 2016 +0300 dwrite: Support font replacement registry settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fd64d8b..9bd5404 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2986,6 +2986,88 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data } } +static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collection, const WCHAR *target_name, + const WCHAR *replacement_name) +{ + UINT32 i = collection_find_family(collection, replacement_name); + struct dwrite_fontfamily_data *target; + IDWriteLocalizedStrings *strings; + HRESULT hr; + + /* replacement does not exist */ + if (i == ~0u) + return FALSE; + + hr = create_localizedstrings(&strings); + if (FAILED(hr)) + return FALSE; + + /* add a new family with target name, reuse font data from replacement */ + add_localizedstring(strings, enusW, target_name); + hr = init_fontfamily_data(strings, &target); + if (hr == S_OK) { + struct dwrite_fontfamily_data *replacement = collection->family_data[i]; + WCHAR nameW[255]; + + for (i = 0; i < replacement->font_count; i++) + fontfamily_add_font(target, replacement->fonts[i]); + + fontcollection_add_family(collection, target); + fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR)); + TRACE("replacement %s -> %s\n", debugstr_w(target_name), debugstr_w(nameW)); + } + IDWriteLocalizedStrings_Release(strings); + return TRUE; +} + +/* Add family mappings from HKCU\Software\Wine\Fonts\Replacements. This only affects + system font collections. */ +static void fontcollection_add_replacements(struct dwrite_fontcollection *collection) +{ + DWORD max_namelen, max_datalen, i = 0, type, datalen, namelen; + WCHAR *name; + void *data; + HKEY hkey; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey)) + return; + + if (RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_namelen, &max_datalen, NULL, NULL)) { + RegCloseKey(hkey); + return; + } + + max_namelen++; /* returned value doesn't include room for '\0' */ + name = heap_alloc(max_namelen * sizeof(WCHAR)); + data = heap_alloc(max_datalen); + + datalen = max_datalen; + namelen = max_namelen; + while (RegEnumValueW(hkey, i++, name, &namelen, NULL, &type, data, &datalen) == ERROR_SUCCESS) { + if (collection_find_family(collection, name) == ~0u) { + if (type == REG_MULTI_SZ) { + WCHAR *replacement = data; + while (*replacement) { + if (fontcollection_add_replacement(collection, name, replacement)) + break; + replacement += strlenW(replacement) + 1; + } + } + else if (type == REG_SZ) + fontcollection_add_replacement(collection, name, data); + } + else + TRACE("%s is available, won't be replaced.\n", debugstr_w(name)); + + datalen = max_datalen; + namelen = max_namelen; + } + + heap_free(data); + heap_free(name); + RegCloseKey(hkey); +} + HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { struct fontfile_enum { @@ -3106,6 +3188,9 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat fontfamily_add_oblique_simulated_face(collection->family_data[i]); } + if (is_system) + fontcollection_add_replacements(collection); + return hr; }

1 0

Sebastian Lackner : vmm.vxd: Fix protection flags passed to VirtualAlloc.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 7fb74ed9450d75bdb504ba81e1bc28e68ad36421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb74ed9450d75bdb504ba81e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 07:10:41 2016 +0100 vmm.vxd: Fix protection flags passed to VirtualAlloc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vmm.vxd/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 7327f78..833a8d1 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ address = (LPVOID )(page * page_size); - ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); + ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); TRACE("PageReserve: returning: %p\n", ret ); if ( ret == NULL ) return -1;

1 0

Michael Müller : ntdll: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 5c50f658306119c40358721c9f0bf75f324e01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c50f658306119c40358721c9… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 12 08:37:32 2016 +0100 ntdll: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 11 +++++++++++ dlls/ntdll/tests/info.c | 16 ++++++++++++++++ include/winternl.h | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a18dfae..47d7b31 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2317,6 +2317,17 @@ NTSTATUS WINAPI NtQuerySystemInformation( RtlFreeHeap(GetProcessHeap(), 0, buf); } break; + case SystemRecommendedSharedDataAlignment: + { + len = sizeof(DWORD); + if (Length >= len) + { + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else *((DWORD *)SystemInformation) = 64; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + } + break; default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c9b6703..be355fb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1984,6 +1984,19 @@ static void test_thread_start_address(void) CloseHandle(thread); } +static void test_query_data_alignment(void) +{ + ULONG ReturnLength; + NTSTATUS status; + DWORD value; + + value = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength); + ok(value == 64, "Expected 64, got %u\n", value); +} + START_TEST(info) { char **argv; @@ -2116,4 +2129,7 @@ START_TEST(info) trace("Starting test_thread_start_address()\n"); test_thread_start_address(); + + trace("Starting test_query_data_alignment()\n"); + test_query_data_alignment(); } diff --git a/include/winternl.h b/include/winternl.h index 51320f2..9b40fd4 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -826,7 +826,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { Unknown55, Unknown56, Unknown57, - Unknown58, + SystemRecommendedSharedDataAlignment = 58, Unknown59, Unknown60, Unknown61,

1 0

Dmitry Timoshkov : kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: dfbbd55af7e625968473d233671d9aa63ec33f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbbd55af7e625968473d2336… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 12 08:52:50 2016 +0100 kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 17b5537..7280501 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } -static inline int real_length(const WCHAR *str, int len) -{ - while (len && !str[len - 1]) len--; - return len; -} - int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2) { int ret; - len1 = real_length(str1, len1); - len2 = real_length(str2, len2); - ret = compare_unicode_weights(flags, str1, len1, str2, len2); if (!ret) {

1 0

Sebastian Lackner : kernel32/tests: Add additional tests for CompareStringA.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 90819e9c1b2c0575993128d962df1b348e93adc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90819e9c1b2c0575993128d96… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 08:53:04 2016 +0100 kernel32/tests: Add additional tests for CompareStringA. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 385e8e4..4a9e540 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1636,7 +1636,21 @@ static const struct comparestringa_entry comparestringa_data[] = { { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN }, { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN }, { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL }, - { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN } + { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0\0", 4, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0\0", 4, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 2, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0x", 4, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0x", 4, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 2, CSTR_GREATER_THAN }, }; static void test_CompareStringA(void)

1 0

Vincent Povirk : kernel32/tests: Avoid testing for a hard-coded timezone name.
by Alexandre Julliard 12 Feb '16

12 Feb '16

Module: wine Branch: master Commit: 82a55e7bf8c8fb15950c29b108e336e0b686739b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a55e7bf8c8fb15950c29b10… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 11:36:44 2016 -0600 kernel32/tests: Avoid testing for a hard-coded timezone name. It turns out timezone names are localized, so this breaks on non-English Windows 8 and 10 systems. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 53af39c..e6e779c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -913,7 +913,7 @@ static void test_GetTimeZoneInformationForYear(void) { BOOL ret; SYSTEMTIME systemtime; - TIME_ZONE_INFORMATION local_tzinfo, tzinfo; + TIME_ZONE_INFORMATION local_tzinfo, tzinfo, tzinfo2; DYNAMIC_TIME_ZONE_INFORMATION dyn_tzinfo; static const WCHAR std_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0}; static const WCHAR dlt_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','D','a','y','l','i','g','h','t',' ','T','i','m','e',0}; @@ -962,21 +962,24 @@ static void test_GetTimeZoneInformationForYear(void) ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); ok(tzinfo.Bias == 180, "Expected Bias 180, got %d\n", tzinfo.Bias); - ok(!lstrcmpW(tzinfo.StandardName, std_tzname) || broken(!tzinfo.StandardName[0]) /* vista,7 */, - "Expected StandardName %s, got %s\n", - wine_dbgstr_w(std_tzname), wine_dbgstr_w(tzinfo.StandardName)); ok(tzinfo.StandardDate.wMonth == 10, "Expected standard month 10, got %d\n", tzinfo.StandardDate.wMonth); std_day = day_of_month(&tzinfo.StandardDate, 2015); ok(std_day == 24, "Expected standard day 24, got %d\n", std_day); ok(tzinfo.StandardBias == 0, "Expected StandardBias 0, got %d\n", tzinfo.StandardBias); - ok(!lstrcmpW(tzinfo.DaylightName, dlt_tzname) || broken(!tzinfo.DaylightName[0]) /* vista,7 */, - "Expected DaylightName %s, got %s\n", - wine_dbgstr_w(dlt_tzname), wine_dbgstr_w(tzinfo.DaylightName)); ok(tzinfo.DaylightDate.wMonth == 3, "Expected daylight month 3, got %d\n", tzinfo.DaylightDate.wMonth); dlt_day = day_of_month(&tzinfo.DaylightDate, 2015); ok(dlt_day == 28, "Expected daylight day 28, got %d\n", dlt_day); ok(tzinfo.DaylightBias == -60, "Expected DaylightBias -60, got %d\n", tzinfo.DaylightBias); + ret = pGetTimeZoneInformationForYear(2016, &dyn_tzinfo, &tzinfo2); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(!lstrcmpW(tzinfo.StandardName, tzinfo2.StandardName), + "Got differing StandardName values %s and %s\n", + wine_dbgstr_w(tzinfo.StandardName), wine_dbgstr_w(tzinfo2.StandardName)); + ok(!lstrcmpW(tzinfo.DaylightName, tzinfo2.DaylightName), + "Got differing DaylightName values %s and %s\n", + wine_dbgstr_w(tzinfo.DaylightName), wine_dbgstr_w(tzinfo2.DaylightName)); + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); lstrcpyW(dyn_tzinfo.TimeZoneKeyName, dlt_tzname);

1 0