- wine-devel - winehq.org

[PATCH] dlls/windows.media.speech/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.media.speech/tests/Makefile.in | 1 dlls/windows.media.speech/tests/speech.c | 60 ++++++++++++++------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in index e1616991573..2ee10d3db21 100644 --- a/dlls/windows.media.speech/tests/Makefile.in +++ b/dlls/windows.media.speech/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.speech.dll IMPORTS = combase uuid diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 38fd5c90dd0..df00f407bc7 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -56,10 +56,10 @@ static void test_SpeechSynthesizer(void) ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hdll = LoadLibraryW(L"windows.media.speech.dll"); if (hdll) @@ -68,31 +68,31 @@ static void test_SpeechSynthesizer(void) ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = pDllGetActivationFactory(str2, &factory2); - ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); WindowsDeleteString(str2); hr = pDllGetActivationFactory(str, &factory2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { - win_skip("Failed to load library, err %u.\n", GetLastError()); + win_skip("Failed to load library, err %lu.\n", GetLastError()); } hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); if (hdll) { @@ -102,47 +102,47 @@ static void test_SpeechSynthesizer(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#lx\n", hr); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices); - ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr); + ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#lx\n", hr); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr); + ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_VoiceInformation_get_Size(voices, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); voice = (IVoiceInformation *)0xdeadbeef; hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice); - ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#lx\n", hr); ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice); hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); - ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size); IVectorView_VoiceInformation_Release(voices); @@ -153,25 +153,25 @@ static void test_SpeechSynthesizer(void) IInspectable_Release(inspectable); hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = RoActivateInstance(str, &inspectable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ref = IClosable_Release(closable); - ok(ref == 2, "Got unexpected ref %u.\n", ref); + ok(ref == 2, "Got unexpected ref %lu.\n", ref); ref = ISpeechSynthesizer_Release(synthesizer); - ok(ref == 1, "Got unexpected ref %u.\n", ref); + ok(ref == 1, "Got unexpected ref %lu.\n", ref); ref = IInspectable_Release(inspectable); - ok(!ref, "Got unexpected ref %u.\n", ref); + ok(!ref, "Got unexpected ref %lu.\n", ref); IActivationFactory_Release(factory); WindowsDeleteString(str); @@ -188,13 +188,13 @@ static void test_VoiceInformation(void) HRESULT hr; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#lx\n", hr); WindowsDeleteString(str);

4 6

[PATCH] dlls/wtsapi32/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wtsapi32/tests/Makefile.in | 1 dlls/wtsapi32/tests/wtsapi.c | 90 ++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in index 1b18073bdac..57014aea938 100644 --- a/dlls/wtsapi32/tests/Makefile.in +++ b/dlls/wtsapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wtsapi32.dll IMPORTS = wtsapi32 advapi32 psapi diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 3eec81d8556..32caa05588c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -64,7 +64,7 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) nt_length *= 2; nt_info = realloc(nt_info, nt_length); } - ok(!status, "got %#x\n", status); + ok(!status, "got %#lx\n", status); for (i = 0; i < count; i++) { @@ -75,11 +75,11 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) DWORD size; nt_process = find_nt_process_info(nt_info, info[i].ProcessId); - ok(!!nt_process, "failed to find pid %#x\n", info[i].ProcessId); + ok(!!nt_process, "failed to find pid %#lx\n", info[i].ProcessId); - winetest_push_context("pid %#x", info[i].ProcessId); + winetest_push_context("pid %#lx", info[i].ProcessId); - ok(info[i].SessionId == nt_process->SessionId, "expected session id %#x, got %#x\n", + ok(info[i].SessionId == nt_process->SessionId, "expected session id %#lx, got %#lx\n", nt_process->SessionId, info[i].SessionId); ok(!memcmp(info[i].pProcessName, nt_process->ProcessName.Buffer, nt_process->ProcessName.Length), @@ -89,9 +89,9 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, info[i].ProcessId))) { ret = OpenProcessToken(process, TOKEN_QUERY, &token); - ok(ret, "failed to open token, error %u\n", GetLastError()); + ok(ret, "failed to open token, error %lu\n", GetLastError()); ret = GetTokenInformation(token, TokenUser, sid_buffer, sizeof(sid_buffer), &size); - ok(ret, "failed to get token user, error %u\n", GetLastError()); + ok(ret, "failed to get token user, error %lu\n", GetLastError()); ok(EqualSid(info[i].pUserSid, sid->Sid), "SID did not match\n"); CloseHandle(token); CloseHandle(process); @@ -117,33 +117,33 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 1, 1, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 0, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 2, &info, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, NULL, &count); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); info = NULL; SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, NULL); ok(!ret, "expected WTSEnumerateProcessesW to fail\n"); - ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()== ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); WTSFreeMemory(info); count = 0; @@ -151,7 +151,7 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = WTSEnumerateProcessesW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, &count); ok(ret, "expected success\n"); - ok(!GetLastError(), "got error %u\n", GetLastError()); + ok(!GetLastError(), "got error %lu\n", GetLastError()); check_wts_process_info(info, count); WTSFreeMemory(info); @@ -167,14 +167,14 @@ static void test_WTSEnumerateProcessesW(void) count = 0xdeadbeef; ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, NULL, &count); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); - ok(count == 0xdeadbeef, "got count %u\n", count); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); + ok(count == 0xdeadbeef, "got count %lu\n", count); info = (void *)0xdeadbeef; SetLastError(0xdeadbeef); ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, (WCHAR **)&info, NULL); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); ok(info == (void *)0xdeadbeef, "got info %p\n", info); info = NULL; @@ -182,7 +182,7 @@ static void test_WTSEnumerateProcessesW(void) SetLastError(0xdeadbeef); ret = pWTSEnumerateProcessesExW(WTS_CURRENT_SERVER_HANDLE, &level, WTS_ANY_SESSION, (WCHAR **)&info, &count); ok(ret, "expected success\n"); - ok(!GetLastError(), "got error %u\n", GetLastError()); + ok(!GetLastError(), "got error %lu\n", GetLastError()); check_wts_process_info(info, count); pWTSFreeMemoryExW(WTSTypeProcessInfoLevel0, info, count); } @@ -197,91 +197,91 @@ static void test_WTSQuerySessionInformation(void) SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 0, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 0, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); count = 1; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 1, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 1, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); - ok(!ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); tempsize = UNLEN + 1; GetUserNameW(usernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); - ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); + ok(count == tempsize * sizeof(WCHAR), "expected %Iu, got %lu\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf1, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); tempsize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameW(computernameW, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); - ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %u, got %u\n", (tempsize + 1) * sizeof(WCHAR), count); + ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %Iu, got %lu\n", (tempsize + 1) * sizeof(WCHAR), count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 0, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 0, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); count = 1; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); - ok(!ret, "got %u\n", GetLastError()); - ok(count == 1, "got %u\n", count); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(count == 1, "got %lu\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); - ok(!ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + ok(!ret, "got %lu\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %lu\n", GetLastError()); count = 0; buf2 = NULL; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); - ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %lu\n", lstrlenA(buf2) + 1, count); tempsize = UNLEN + 1; GetUserNameA(username, &tempsize); /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); - ok(count == tempsize, "expected %u, got %u\n", tempsize, count); + ok(count == tempsize, "expected %lu, got %lu\n", tempsize, count); WTSFreeMemory(buf2); count = 0; buf2 = NULL; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf2, &count); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); - ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %lu\n", lstrlenA(buf2) + 1, count); tempsize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameA(computername, &tempsize); /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); - ok(count == tempsize + 1, "expected %u, got %u\n", tempsize + 1, count); + ok(count == tempsize + 1, "expected %lu, got %lu\n", tempsize + 1, count); WTSFreeMemory(buf2); } @@ -292,7 +292,7 @@ static void test_WTSQueryUserToken(void) SetLastError(0xdeadbeef); ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); ok(!ret, "expected WTSQueryUserToken to fail\n"); - ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %ld\n", GetLastError()); } START_TEST (wtsapi)

1 0

[PATCH] dlls/wsdapi/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wsdapi/tests/Makefile.in | 1 dlls/wsdapi/tests/address.c | 108 ++++++++++++++++++----------------- dlls/wsdapi/tests/discovery.c | 108 ++++++++++++++++++----------------- dlls/wsdapi/tests/msgparams.c | 86 ++++++++++++++-------------- dlls/wsdapi/tests/xml.c | 126 +++++++++++++++++++++-------------------- 5 files changed, 214 insertions(+), 215 deletions(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 2198c066369..eaefa3a962b 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 iphlpapi rpcrt4 diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index dd3e048c25c..4e021a4e65a 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -39,39 +39,39 @@ static void CreateUdpAddress_tests(void) ULONG ref; rc = WSDCreateUdpAddress(NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08lx\n", rc); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUDPAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* Try to query for objects */ rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDUdpAddress_Release(udpAddress2); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDTransportAddress_Release(transportAddress); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08lx\n", rc); if (rc == S_OK) IWSDAddress_Release(address); rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); ref = IWSDUdpAddress_Release(udpAddress); - ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDUdpAddress_Release() has %ld references, should have 0\n", ref); } static void GetSetTransportAddress_udp_tests(void) @@ -89,52 +89,52 @@ static void GetSetTransportAddress_udp_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); - ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08lx\n", rc); /* Try setting a null address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); - ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08lx\n", rc); /* Try setting an invalid address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, L"not/valid"); - ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08lx\n", rc); /* Try setting an IPv4 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); - ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); - ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv4 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, L"10.20.30.40:124"); - ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(ipv4Address) failed: %08lx\n", rc); /* Try setting an IPv6 address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); - ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); /* Try setting an IPv6 address with a port number */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6AddressWithPort); - ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress(ipv6AddressWithPort) failed: %08lx\n", rc); rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); todo_wine ok(lstrcmpW(returnedAddress, ipv6AddressWithPort) == 0, "Returned address != ipv6AddressWithPort (%s)\n", wine_dbgstr_w(returnedAddress)); @@ -156,37 +156,37 @@ static void GetSetPort_udp_tests(void) int ret; rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Try setting a zero port */ rc = IWSDUdpAddress_SetPort(udpAddress, 0); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); /* Set a real port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); /* Now set a different port */ rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); - ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetPort returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); /* Release the object */ @@ -204,30 +204,30 @@ static void GetSetMessageType_udp_tests(void) int ret; rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); - ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Try setting a message type */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); - ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Set another one */ rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); - ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetMessageType returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); - ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetMessageType returned unexpected result: %08lx\n", rc); ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); /* Release the object */ @@ -265,22 +265,22 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); rc = IWSDUdpAddress_GetSockaddr(udpAddress, NULL); - ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08lx\n", rc); /* Try setting a transport address */ rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); /* A socket address should be returned */ rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == AF_INET6, "returnedStorage.ss_family != AF_INET6 (%d)\n", returnedStorage.ss_family); sockAddr6Ptr = (struct sockaddr_in6 *) &returnedStorage; @@ -297,7 +297,7 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); rc = WSDCreateUdpAddress(&udpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08lx\n", rc); ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); /* Try setting an IPv4 address */ @@ -309,34 +309,34 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 1, "inet_pton(ipv4) failed: %d\n", WSAGetLastError()); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == storage1.ss_family, "returnedStorage.ss_family != storage1.ss_family (%d)\n", returnedStorage.ss_family); ok(memcmp(&returnedStorage, &storage1, sizeof(struct sockaddr_in)) == 0, "returnedStorage != storage1\n"); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"1.2.3.4:1234") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv4 address without a port */ sockAddrPtr->sin_port = 0; rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"1.2.3.4") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); @@ -349,39 +349,39 @@ static void GetSetSockaddr_udp_tests(void) ok(ret == 1, "inet_pton(ipv6) failed: %d\n", WSAGetLastError()); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); - ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetSockaddr returned unexpected result: %08lx\n", rc); ok(returnedStorage.ss_family == storage2.ss_family, "returnedStorage.ss_family != storage2.ss_family (%d)\n", returnedStorage.ss_family); ok(memcmp(&returnedStorage, &storage2, sizeof(struct sockaddr_in6)) == 0, "returnedStorage != storage2\n"); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); /* Check that GetPort doesn't return the port set via the socket */ rc = IWSDUdpAddress_GetPort(udpAddress, &port); - ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "GetPort returned unexpected result: %08lx\n", rc); ok(port == 0, "GetPort returned unexpected port: %d\n", port); /* Try setting an IPv6 address without a port */ sockAddr6Ptr->sin6_port = 0; rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Check that GetTransportAddress returns the address set via the socket */ rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); - ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetTransportAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); ok(lstrcmpW(returnedAddress, L"2a00:1234:5678:dead:beef::aaaa") == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); - ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + ok(rc == S_OK, "SetSockaddr returned unexpected result: %08lx\n", rc); /* Release the object */ ret = IWSDUdpAddress_Release(udpAddress); diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 2ecb3d2ccd8..01b28a3c1ad 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -482,7 +482,7 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_AddRef(IWSDiscoveryPublisher IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); ULONG ref = InterlockedIncrement(&This->ref); - trace("IWSDiscoveryPublisherNotifyImpl_AddRef called (%p, ref = %d)\n", This, ref); + trace("IWSDiscoveryPublisherNotifyImpl_AddRef called (%p, ref = %ld)\n", This, ref); return ref; } @@ -491,7 +491,7 @@ static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_Release(IWSDiscoveryPublishe IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); ULONG ref = InterlockedDecrement(&This->ref); - trace("IWSDiscoveryPublisherNotifyImpl_Release called (%p, ref = %d)\n", This, ref); + trace("IWSDiscoveryPublisherNotifyImpl_Release called (%p, ref = %ld)\n", This, ref); if (ref == 0) { @@ -621,7 +621,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP verify_wsdxml_any_text("probe_msg->Any", probe_msg->Any, uri_more_tests_no_slash, prefix_grog, L"Lager", L"MoreInfo"); rc = IWSDMessageParameters_GetRemoteAddress(pMessageParameters, (IWSDAddress **) &remote_addr); - ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08x\n", rc); + ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08lx\n", rc); if (remote_addr != NULL) { @@ -640,7 +640,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP int i; rc = IWSDUdpAddress_GetSockaddr(remote_addr, &remote_sock); - ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08x\n", rc); + ok(rc == S_OK, "IWSDMessageParameters_GetRemoteAddress returned %08lx\n", rc); IWSDUdpAddress_Release(remote_addr); @@ -664,21 +664,21 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP header_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"PublishTest", &header_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"EndPTest", &endpoint_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"RefPTest", &ref_param_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = IWSDiscoveryPublisher_MatchProbeEx(publisher_instance, pSoap, pMessageParameters, publisherIdW, 1, 1, 1, sequenceIdW, probe_msg->Types, NULL, NULL, header_any_element, ref_param_any_element, NULL, endpoint_any_element, body_any_element); - ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbeEx failed with %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_MatchProbeEx failed with %08lx\n", rc); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); @@ -808,27 +808,27 @@ static void CreateDiscoveryPublisher_tests(void) ULONG ref; rc = WSDCreateDiscoveryPublisher(NULL, NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateDiscoveryPublisher(NULL, NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateDiscoveryPublisher(NULL, NULL) failed: %08lx\n", rc); rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); /* Try to query for objects */ rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); rc = IWSDiscoveryPublisher_QueryInterface(publisher, &IID_IWSDiscoveryPublisher, (LPVOID*)&publisher2); - ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IWSDiscoveryPublisher) failed: %08x\n", rc); + ok(rc == S_OK,"IWSDiscoveryPublisher_QueryInterface(IID_IWSDiscoveryPublisher) failed: %08lx\n", rc); if (rc == S_OK) IWSDiscoveryPublisher_Release(publisher2); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); } static void CreateDiscoveryPublisher_XMLContext_tests(void) @@ -840,17 +840,17 @@ static void CreateDiscoveryPublisher_XMLContext_tests(void) /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ rc = WSDXMLCreateContext(&xmlContext); - ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08lx\n", rc); rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); - ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08lx\n", rc); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); - ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + ok(rc == S_OK, "GetXMLContext failed: %08lx\n", rc); ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); @@ -868,11 +868,11 @@ static void CreateDiscoveryPublisher_XMLContext_tests(void) returnedContext = NULL; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); - ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + ok(rc == S_OK, "GetXMLContext failed: %08lx\n", rc); ref = IWSDXMLContext_Release(returnedContext); ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); @@ -907,21 +907,21 @@ static void Publish_tests(void) unsigned char *probe_uuid_str; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); publisher_instance = publisher; /* Test SetAddressFamily */ rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, 12345); - ok(rc == E_INVALIDARG, "IWSDiscoveryPublisher_SetAddressFamily(12345) returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "IWSDiscoveryPublisher_SetAddressFamily(12345) returned unexpected result: %08lx\n", rc); rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); - ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08lx\n", rc); /* Try to update the address family after already setting it */ rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV6); - ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08x\n", rc); + ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08lx\n", rc); /* Create notification sinks */ ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); @@ -933,21 +933,21 @@ static void Publish_tests(void) /* Attempt to unregister sink before registering it */ rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); - ok(rc == E_FAIL, "IWSDiscoveryPublisher_UnRegisterNotificationSink returned unexpected result: %08x\n", rc); + ok(rc == E_FAIL, "IWSDiscoveryPublisher_UnRegisterNotificationSink returned unexpected result: %08lx\n", rc); /* Register notification sinks */ rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); - ok(sink1Impl->ref == 2, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); + ok(sink1Impl->ref == 2, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink2); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); - ok(sink2Impl->ref == 2, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); + ok(sink2Impl->ref == 2, "Ref count for sink 2 is not as expected: %ld\n", sink2Impl->ref); /* Unregister the first sink */ rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_UnRegisterNotificationSink failed: %08x\n", rc); - ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + ok(rc == S_OK, "IWSDiscoveryPublisher_UnRegisterNotificationSink failed: %08lx\n", rc); + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); /* Set up network listener */ publisherIdW = utf8_to_wide(publisherId); @@ -976,16 +976,16 @@ static void Publish_tests(void) header_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"PublishTest", &header_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"EndPTest", &endpoint_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); rc = WSDXMLBuildAnyForSingleElement(&header_any_name, L"RefPTest", &ref_param_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); /* Create types list */ ns2.Uri = uri_more_tests; @@ -1025,7 +1025,7 @@ static void Publish_tests(void) heap_free(scopes_list.Next); heap_free(xaddrs_list.Next); - ok(rc == S_OK, "Publish failed: %08x\n", rc); + ok(rc == S_OK, "Publish failed: %08lx\n", rc); /* Wait up to 2 seconds for messages to be received */ if (WaitForMultipleObjects(msgStorage->numThreadHandles, msgStorage->threadHandles, TRUE, 2000) == WAIT_TIMEOUT) @@ -1122,11 +1122,11 @@ after_publish_test: CloseHandle(probe_event); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); /* Check that the sinks have been released by the publisher */ - ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); - ok(sink2Impl->ref == 1, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %ld\n", sink1Impl->ref); + ok(sink2Impl->ref == 1, "Ref count for sink 2 is not as expected: %ld\n", sink2Impl->ref); /* Release the sinks */ IWSDiscoveryPublisherNotify_Release(sink1); @@ -1154,16 +1154,16 @@ static void UnPublish_tests(void) WSDXML_NAMESPACE ns; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); - ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08lx\n", rc); ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); - ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08lx\n", rc); /* Create notification sink */ ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); - ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08lx\n", rc); /* Set up network listener */ publisherIdW = utf8_to_wide(publisherId); @@ -1192,14 +1192,14 @@ static void UnPublish_tests(void) body_any_name.Space = &ns; rc = WSDXMLBuildAnyForSingleElement(&body_any_name, L"BodyTest", &body_any_element); - ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08lx\n", rc); /* Unpublish the service */ rc = IWSDiscoveryPublisher_UnPublish(publisher, publisherIdW, 1, 1, sequenceIdW, body_any_element); WSDFreeLinkedMemory(body_any_element); - ok(rc == S_OK, "Unpublish failed: %08x\n", rc); + ok(rc == S_OK, "Unpublish failed: %08lx\n", rc); /* Wait up to 2 seconds for messages to be received */ if (WaitForMultipleObjects(msg_storage->numThreadHandles, msg_storage->threadHandles, TRUE, 2000) == WAIT_TIMEOUT) @@ -1260,7 +1260,7 @@ after_unpublish_test: heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); - ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %ld references, should have 0\n", ref); /* Release the sinks */ IWSDiscoveryPublisherNotify_Release(sink1); @@ -1302,18 +1302,18 @@ static BOOL is_firewall_enabled(void) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); done: if (policy) INetFwPolicy_Release( policy ); @@ -1342,23 +1342,23 @@ static HRESULT set_firewall( enum firewall_op op ) hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); @@ -1367,7 +1367,7 @@ static HRESULT set_firewall( enum firewall_op op ) name = SysAllocString( L"wsdapi_test" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (hr != S_OK) goto done; if (op == APP_ADD) @@ -1402,7 +1402,7 @@ START_TEST(discovery) } if ((hr = set_firewall(APP_ADD)) != S_OK) { - skip("can't authorize app in firewall %08x\n", hr); + skip("can't authorize app in firewall %08lx\n", hr); return; } } diff --git a/dlls/wsdapi/tests/msgparams.c b/dlls/wsdapi/tests/msgparams.c index 6e40094f171..116b3c94d78 100644 --- a/dlls/wsdapi/tests/msgparams.c +++ b/dlls/wsdapi/tests/msgparams.c @@ -37,33 +37,33 @@ static void CreateUdpMessageParameters_tests(void) ULONG ref; rc = WSDCreateUdpMessageParameters(NULL); - ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08x\n", rc); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUdpMessageParameters(NULL) failed: %08lx\n", rc); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); /* Try to query for objects */ rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDUdpMessageParameters, (LPVOID*)&udpMessageParams2); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IWSDUdpMessageParameters) failed: %08lx\n", rc); if (rc == S_OK) IWSDUdpMessageParameters_Release(udpMessageParams2); rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IWSDMessageParameters, (LPVOID*)&messageParams); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_WSDMessageParameters) failed: %08lx\n", rc); if (rc == S_OK) IWSDMessageParameters_Release(messageParams); rc = IWSDUdpMessageParameters_QueryInterface(udpMessageParams, &IID_IUnknown, (LPVOID*)&unknown); - ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc == S_OK, "IWSDUdpMessageParams_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc == S_OK) IUnknown_Release(unknown); ref = IWSDUdpMessageParameters_Release(udpMessageParams); - ok(ref == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ref); + ok(ref == 0, "IWSDUdpMessageParameters_Release() has %ld references, should have 0\n", ref); } static void LocalAddress_tests(void) @@ -79,29 +79,29 @@ static void LocalAddress_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - ok(rc == E_ABORT, "GetLocalAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetLocalAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08lx\n", rc); ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, L"1.2.3.4"); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_SetLocalAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - ok(rc == S_OK, "SetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetLocalAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_GetLocalAddress(udpMessageParams, &returnedAddress); - ok(rc == S_OK, "GetLocalAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetLocalAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetLocalAddress returns the same object */ @@ -136,29 +136,29 @@ static void RemoteAddress_tests(void) ok(ret == 0, "WSAStartup failed: %d\n", ret); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_POINTER, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - ok(rc == E_ABORT, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == E_ABORT, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress == NULL, "GetRemoteAddress returned %p\n", returnedAddress); rc = WSDCreateUdpAddress(&origUdpAddress); - ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &origUdpAddress) failed: %08lx\n", rc); ok(origUdpAddress != NULL, "WSDCreateUdpMessageParameters(NULL, &origUdpAddress) failed: origUdpAddress == NULL\n"); rc = IWSDUdpAddress_SetTransportAddress(origUdpAddress, L"1.2.3.4"); - ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetTransportAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_SetRemoteAddress(udpMessageParams, (IWSDAddress *)origUdpAddress); - ok(rc == S_OK, "SetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "SetRemoteAddress failed: %08lx\n", rc); rc = IWSDUdpMessageParameters_GetRemoteAddress(udpMessageParams, &returnedAddress); - ok(rc == S_OK, "GetRemoteAddress failed: %08x\n", rc); + ok(rc == S_OK, "GetRemoteAddress failed: %08lx\n", rc); ok(returnedAddress != NULL, "GetLocalAddress returned NULL\n"); /* Check if GetRemoteAddress returns the same object */ @@ -191,21 +191,21 @@ static void RetransmitParams_tests(void) ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = WSDCreateUdpMessageParameters(&udpMessageParams); - ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08x\n", rc); + ok(rc == S_OK, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: %08lx\n", rc); ok(udpMessageParams != NULL, "WSDCreateUdpMessageParameters(NULL, &udpMessageParams) failed: udpMessageParams == NULL\n"); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, NULL); - ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_POINTER, "GetRetransmitParams returned unexpected result: %08lx\n", rc); /* Check if the default values are returned */ rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(returnedParams.ulRepeat == 1, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(returnedParams.ulSendDelay == 0, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(returnedParams.ulRepeat == 1, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(returnedParams.ulRepeatMinDelay == 50, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(returnedParams.ulRepeatMaxDelay == 250, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(returnedParams.ulRepeatUpperDelay == 450, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); /* Now try setting some custom parameters */ origParams.ulSendDelay = 100; @@ -215,22 +215,22 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 500; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08lx\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); /* Try setting a null parameter */ rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, NULL); - ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08x\n", rc); + ok(rc == E_INVALIDARG, "SetRetransmitParams returned unexpected result: %08lx\n", rc); /* Now attempt to set some invalid parameters - these appear to be accepted */ origParams.ulSendDelay = INFINITE; @@ -240,18 +240,18 @@ static void RetransmitParams_tests(void) origParams.ulRepeatUpperDelay = 100; rc = IWSDUdpMessageParameters_SetRetransmitParams(udpMessageParams, &origParams); - ok(rc == S_OK, "SetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "SetRetransmitParams failed: %08lx\n", rc); ZeroMemory(&returnedParams, sizeof(WSDUdpRetransmitParams)); rc = IWSDUdpMessageParameters_GetRetransmitParams(udpMessageParams, &returnedParams); - ok(rc == S_OK, "GetRetransmitParams failed: %08x\n", rc); + ok(rc == S_OK, "GetRetransmitParams failed: %08lx\n", rc); - ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %d\n", returnedParams.ulSendDelay); - ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %d\n", returnedParams.ulRepeat); - ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %d\n", returnedParams.ulRepeatMinDelay); - ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %d\n", returnedParams.ulRepeatMaxDelay); - ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %d\n", returnedParams.ulRepeatUpperDelay); + ok(origParams.ulSendDelay == returnedParams.ulSendDelay, "ulSendDelay = %ld\n", returnedParams.ulSendDelay); + ok(origParams.ulRepeat == returnedParams.ulRepeat, "ulRepeat = %ld\n", returnedParams.ulRepeat); + ok(origParams.ulRepeatMinDelay == returnedParams.ulRepeatMinDelay, "ulRepeatMinDelay = %ld\n", returnedParams.ulRepeatMinDelay); + ok(origParams.ulRepeatMaxDelay == returnedParams.ulRepeatMaxDelay, "ulRepeatMaxDelay = %ld\n", returnedParams.ulRepeatMaxDelay); + ok(origParams.ulRepeatUpperDelay == returnedParams.ulRepeatUpperDelay, "ulRepeatUpperDelay = %ld\n", returnedParams.ulRepeatUpperDelay); ret = IWSDUdpMessageParameters_Release(udpMessageParams); ok(ret == 0, "IWSDUdpMessageParameters_Release() has %d references, should have 0\n", ret); diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index ad0d5d11068..0b56024c667 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -46,19 +46,19 @@ static void BuildAnyForSingleElement_tests(void) /* Test invalid arguments */ hr = WSDXMLBuildAnyForSingleElement(NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&name, NULL, NULL); - ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Test calling the function with a text size that exceeds 8192 characters */ hr = WSDXMLBuildAnyForSingleElement(&name, largeText, &element); - ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Test with valid parameters but no text */ hr = WSDXMLBuildAnyForSingleElement(&name, NULL, &element); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(element->Name != &name, "element->Name has not been duplicated\n"); ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); @@ -74,7 +74,7 @@ static void BuildAnyForSingleElement_tests(void) /* Test with valid parameters and text */ hr = WSDXMLBuildAnyForSingleElement(&name, text, &element); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(element->Name != &name, "element->Name has not been duplicated\n"); ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); @@ -108,7 +108,7 @@ static void AddChild_tests(void) /* Test invalid values */ hr = WSDXMLAddChild(NULL, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Populate structures */ ns.Uri = L"http://test.test/"; @@ -125,13 +125,13 @@ static void AddChild_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == NULL, "parent->FirstChild == %p\n", parent->FirstChild); @@ -143,7 +143,7 @@ static void AddChild_tests(void) /* Add the child to the parent */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -155,15 +155,15 @@ static void AddChild_tests(void) /* Try to set child1 as the child of child2, which already has a parent */ hr = WSDXMLAddChild(child2, child1); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Try to set child2 as the child of child1, which has a text node as a child */ hr = WSDXMLAddChild(child2, child1); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08lx\n", hr); /* Add child2 as a child of parent */ hr = WSDXMLAddChild(parent, child2); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -189,7 +189,7 @@ static void AddSibling_tests(void) /* Test invalid values */ hr = WSDXMLAddSibling(NULL, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08lx\n", hr); /* Populate structures */ ns.Uri = L"http://test.test/"; @@ -206,20 +206,20 @@ static void AddSibling_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1NameText, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, NULL, &child3); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Add child1 to parent */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "WSDXMLAddChild failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddChild failed with %08lx\n", hr); ok(parent->Node.Parent == NULL, "parent->Node.Parent == %p\n", parent->Node.Parent); ok(parent->FirstChild == (WSDXML_NODE *)child1, "parent->FirstChild == %p\n", parent->FirstChild); @@ -234,7 +234,7 @@ static void AddSibling_tests(void) /* Try to add child2 as sibling of child1 */ hr = WSDXMLAddSibling(child1, child2); - ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08lx\n", hr); ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); @@ -244,7 +244,7 @@ static void AddSibling_tests(void) /* Try to add child3 as sibling of child1 */ hr = WSDXMLAddSibling(child1, child3); - ok(hr == S_OK, "WSDXMLAddSibling failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLAddSibling failed with %08lx\n", hr); ok(child1->Node.Parent == parent, "child1->Node.Parent == %p\n", child1->Node.Parent); ok(child1->Node.Next == (WSDXML_NODE *)child2, "child1->Node.Next == %p\n", child1->Node.Next); @@ -293,71 +293,71 @@ static void GetValueFromAny_tests(void) /* Create some elements */ hr = WSDXMLBuildAnyForSingleElement(&parentName, NULL, &parent); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child1Name, child1Value, &child1); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child2Name, child2Value, &child2); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); hr = WSDXMLBuildAnyForSingleElement(&child3Name, NULL, &child3); - ok(hr == S_OK, "BuildAnyForSingleElement failed with %08x\n", hr); + ok(hr == S_OK, "BuildAnyForSingleElement failed with %08lx\n", hr); /* Attach them to the parent element */ hr = WSDXMLAddChild(parent, child1); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); hr = WSDXMLAddChild(parent, child2); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); hr = WSDXMLAddChild(parent, child3); - ok(hr == S_OK, "AddChild failed with %08x\n", hr); + ok(hr == S_OK, "AddChild failed with %08lx\n", hr); /* Test invalid arguments */ hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(NULL, NULL, NULL, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(NULL, NULL, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, NULL, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, child2NameText, parent, NULL); - ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_POINTER, "GetValueFromAny returned unexpected result: %08lx\n", hr); /* Test calling the function with a text size that exceeds 8192 characters */ hr = WSDXMLGetValueFromAny(largeText, child2NameText, parent, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); hr = WSDXMLGetValueFromAny(uri, largeText, parent, &returnedValue); - ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetValueFromAny returned unexpected result: %08lx\n", hr); /* Test with valid parameters */ hr = WSDXMLGetValueFromAny(uri, child2NameText, child1, &returnedValue); - ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(hr == S_OK, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue != NULL, "returnedValue == NULL\n"); ok(lstrcmpW(returnedValue, child2Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child2Value)); hr = WSDXMLGetValueFromAny(uri2, child1NameText, child1, &returnedValue); - ok(hr == S_OK, "GetValueFromAny failed with %08x\n", hr); + ok(hr == S_OK, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue != NULL, "returnedValue == NULL\n"); ok(lstrcmpW(returnedValue, child1Value) == 0, "returnedValue ('%s') != '%s'\n", wine_dbgstr_w(returnedValue), wine_dbgstr_w(child1Value)); oldReturnedValue = returnedValue; hr = WSDXMLGetValueFromAny(uri2, child2NameText, child1, &returnedValue); - ok(hr == E_FAIL, "GetValueFromAny returned unexpected value: %08x\n", hr); + ok(hr == E_FAIL, "GetValueFromAny returned unexpected value: %08lx\n", hr); ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); oldReturnedValue = returnedValue; hr = WSDXMLGetValueFromAny(uri, child3NameText, child1, &returnedValue); - ok(hr == E_FAIL, "GetValueFromAny failed with %08x\n", hr); + ok(hr == E_FAIL, "GetValueFromAny failed with %08lx\n", hr); ok(returnedValue == oldReturnedValue, "returnedValue == %p\n", returnedValue); WSDFreeLinkedMemory(parent); @@ -377,26 +377,26 @@ static void XMLContext_AddNamespace_tests(void) HRESULT hr; hr = WSDXMLCreateContext(&context); - ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08lx\n", hr); ok(context != NULL, "context == NULL\n"); /* Test calling AddNamespace with invalid arguments */ hr = IWSDXMLContext_AddNamespace(context, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, ns1Uri, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, NULL, prefix1, NULL); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); /* Test calling AddNamespace without the ppNamespace parameter */ hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, NULL); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Now retrieve the created namespace */ hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, &ns1); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns1 != NULL, "ns1 == NULL\n"); @@ -413,17 +413,17 @@ static void XMLContext_AddNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNamespace(context, largeText, prefix2, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, ns2Uri, largeText, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNamespace(context, largeText, largeText, &ns2); - ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNamespace failed with %08lx\n", hr); /* Test calling AddNamespace with a conflicting prefix */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -443,7 +443,7 @@ static void XMLContext_AddNamespace_tests(void) /* Try explicitly creating a prefix called 'un1' */ hr = IWSDXMLContext_AddNamespace(context, L"http://one.more", unPrefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -457,7 +457,7 @@ static void XMLContext_AddNamespace_tests(void) /* Test with one more conflicting prefix */ hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix1, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -471,7 +471,7 @@ static void XMLContext_AddNamespace_tests(void) /* Try renaming a prefix */ hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n"); @@ -500,25 +500,25 @@ static void XMLContext_AddNameToNamespace_tests(void) HRESULT hr; hr = WSDXMLCreateContext(&context); - ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08lx\n", hr); /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(name1 != NULL, "name1 == NULL\n"); @@ -538,18 +538,18 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08lx\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(name2 != NULL, "name2 == NULL\n"); @@ -574,7 +574,7 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now re-retrieve ns2 */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); - ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNamespace failed with %08lx\n", hr); /* Check the returned structure */ ok(ns2 != NULL, "ns2 == NULL\n");

1 0

[PATCH 1/2] dlls/ws2_32/tests: use correct integral type
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a0bbde875d3..38c8b65ccdb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2633,7 +2633,7 @@ static void test_WSASocket(void) int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; int items, err, size, socktype, i, j; - UINT pi_size; + DWORD pi_size; static const struct {

1 1

[PATCH] dlls/wpc/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wpc/tests/Makefile.in | 1 - dlls/wpc/tests/wpc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in index 45098b8fbf9..72f550d576f 100644 --- a/dlls/wpc/tests/Makefile.in +++ b/dlls/wpc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wpc.dll IMPORTS = ole32 diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 2cf35ccf6ec..3dbf595a9a7 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -32,7 +32,7 @@ static void test_wpc(void) if(hres == REGDB_E_CLASSNOTREG) win_skip("CLSID_WindowsParentalControls not registered\n"); else - ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08lx\n", hres); if(FAILED(hres)) return;

1 0

[PATCH] dlls/wmvcore/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wmvcore/tests/Makefile.in | 1 dlls/wmvcore/tests/wmvcore.c | 778 ++++++++++++++++++++-------------------- 2 files changed, 389 insertions(+), 390 deletions(-) diff --git a/dlls/wmvcore/tests/Makefile.in b/dlls/wmvcore/tests/Makefile.in index 159de067e06..856e02d45d5 100644 --- a/dlls/wmvcore/tests/Makefile.in +++ b/dlls/wmvcore/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmvcore.dll IMPORTS = ole32 wmvcore diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 1b9cffaee1d..50a7a023488 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -60,11 +60,11 @@ static WCHAR *load_resource(const WCHAR *name) wcscat(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", wine_dbgstr_w(pathW), GetLastError()); res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); - ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ok(!!res, "Failed to load resource, error %lu.\n", GetLastError()); ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); @@ -82,7 +82,7 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); return hr; @@ -94,7 +94,7 @@ static void test_wmwriter_interfaces(void) IWMWriter *writer; hr = WMCreateWriter( NULL, &writer ); - ok(hr == S_OK, "WMCreateWriter failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateWriter failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMWriter\n"); @@ -121,7 +121,7 @@ static void test_wmreader_interfaces(void) IWMReader *reader; hr = WMCreateReader( NULL, 0, &reader ); - ok(hr == S_OK, "WMCreateReader failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateReader failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMReader\n"); @@ -168,7 +168,7 @@ static void test_wmsyncreader_interfaces(void) IWMSyncReader *reader; hr = WMCreateSyncReader( NULL, 0, &reader ); - ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateSyncReader failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMSyncReader\n"); @@ -216,7 +216,7 @@ static void test_profile_manager_interfaces(void) IWMProfileManager *profile; hr = WMCreateProfileManager(&profile); - ok(hr == S_OK, "WMCreateProfileManager failed 0x%08x\n", hr); + ok(hr == S_OK, "WMCreateProfileManager failed 0x%08lx\n", hr); if(FAILED(hr)) { win_skip("Failed to create IWMProfileManager\n"); @@ -232,10 +232,10 @@ static void test_WMCreateWriterPriv(void) HRESULT hr; hr = WMCreateWriterPriv(&writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IWMWriter_Release(writer); IWMWriter_Release(writer2); @@ -246,15 +246,15 @@ static void test_urlextension(void) HRESULT hr; hr = WMCheckURLExtension(NULL); - ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"test.mkv"); - ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"test.mp3"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"abcd://test/test.wmv"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); - todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08lx\n", hr); } static void test_iscontentprotected(void) @@ -263,13 +263,13 @@ static void test_iscontentprotected(void) BOOL drm; hr = WMIsContentProtected(NULL, NULL); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(NULL, &drm); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(L"test.mp3", NULL); - ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08lx\n", hr); hr = WMIsContentProtected(L"test.mp3", &drm); - ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); + ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08lx\n", hr); ok(drm == FALSE, "got %0dx\n", drm); } @@ -292,7 +292,7 @@ static inline struct buffer *impl_from_INSSBuffer(INSSBuffer *iface) static HRESULT WINAPI buffer_QueryInterface(INSSBuffer *iface, REFIID iid, void **out) { if (winetest_debug > 1) - trace("%04x: INSSBuffer::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: INSSBuffer::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (!IsEqualGUID(iid, &IID_INSSBuffer3) && !IsEqualGUID(iid, &IID_IMediaBuffer)) ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); @@ -324,7 +324,7 @@ static HRESULT WINAPI buffer_GetLength(INSSBuffer *iface, DWORD *size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetLength()\n", GetCurrentThreadId()); *size = buffer->size; return S_OK; @@ -335,9 +335,9 @@ static HRESULT WINAPI buffer_SetLength(INSSBuffer *iface, DWORD size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::SetLength(%u)\n", GetCurrentThreadId(), size); + trace("%04lx: INSSBuffer::SetLength(%lu)\n", GetCurrentThreadId(), size); - ok(size <= buffer->capacity, "Got size %u, buffer capacity %u.\n", size, buffer->capacity); + ok(size <= buffer->capacity, "Got size %lu, buffer capacity %lu.\n", size, buffer->capacity); buffer->size = size; return S_OK; @@ -348,7 +348,7 @@ static HRESULT WINAPI buffer_GetMaxLength(INSSBuffer *iface, DWORD *size) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetMaxLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetMaxLength()\n", GetCurrentThreadId()); *size = buffer->capacity; return S_OK; @@ -359,7 +359,7 @@ static HRESULT WINAPI buffer_GetBuffer(INSSBuffer *iface, BYTE **data) struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetBuffer()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetBuffer()\n", GetCurrentThreadId()); *data = buffer->data; return S_OK; @@ -370,7 +370,7 @@ static HRESULT WINAPI buffer_GetBufferAndLength(INSSBuffer *iface, BYTE **data, struct buffer *buffer = impl_from_INSSBuffer(iface); if (winetest_debug > 1) - trace("%04x: INSSBuffer::GetBufferAndLength()\n", GetCurrentThreadId()); + trace("%04lx: INSSBuffer::GetBufferAndLength()\n", GetCurrentThreadId()); *size = buffer->size; *data = buffer->data; @@ -404,7 +404,7 @@ static struct teststream *impl_from_IStream(IStream *iface) static HRESULT WINAPI stream_QueryInterface(IStream *iface, REFIID iid, void **out) { if (winetest_debug > 1) - trace("%04x: IStream::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: IStream::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (!IsEqualGUID(iid, &IID_IWMGetSecureChannel) && !IsEqualGUID(iid, &IID_IWMIStreamProps)) ok(0, "Unexpected IID %s.\n", debugstr_guid(iid)); @@ -431,7 +431,7 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *data, ULONG size, ULONG struct teststream *stream = impl_from_IStream(iface); if (winetest_debug > 2) - trace("%04x: IStream::Read(size %u)\n", GetCurrentThreadId(), size); + trace("%04lx: IStream::Read(size %lu)\n", GetCurrentThreadId(), size); ok(size > 0, "Got zero size.\n"); ok(!!ret_size, "Got NULL ret_size pointer.\n"); @@ -452,13 +452,13 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD me LARGE_INTEGER size; if (winetest_debug > 2) - trace("%04x: IStream::Seek(offset %I64u, method %#x)\n", GetCurrentThreadId(), offset.QuadPart, method); + trace("%04lx: IStream::Seek(offset %I64u, method %#lx)\n", GetCurrentThreadId(), offset.QuadPart, method); GetFileSizeEx(stream->file, &size); ok(offset.QuadPart < size.QuadPart, "Expected offset less than size %I64u, got %I64u.\n", size.QuadPart, offset.QuadPart); - ok(method == STREAM_SEEK_SET, "Got method %#x.\n", method); + ok(method == STREAM_SEEK_SET, "Got method %#lx.\n", method); ok(!ret_offset, "Got unexpected ret_offset pointer %p\n", ret_offset); if (!SetFilePointerEx(stream->file, offset, &offset, method)) @@ -509,9 +509,9 @@ static HRESULT WINAPI stream_Stat(IStream *iface, STATSTG *stat, DWORD flags) LARGE_INTEGER size; if (winetest_debug > 1) - trace("%04x: IStream::Stat(flags %#x)\n", GetCurrentThreadId(), flags); + trace("%04lx: IStream::Stat(flags %#lx)\n", GetCurrentThreadId(), flags); - ok(flags == STATFLAG_NONAME, "Got flags %#x.\n", flags); + ok(flags == STATFLAG_NONAME, "Got flags %#lx.\n", flags); stat->type = 0xdeadbeef; GetFileSizeEx(stream->file, &size); @@ -568,15 +568,15 @@ static void test_reader_attributes(IWMProfile *profile) IWMProfile_QueryInterface(profile, &IID_IWMHeaderInfo, (void **)&header_info); hr = IWMProfile_GetStreamCount(profile, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < count; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_stream_number = stream_number; size = sizeof(DWORD); @@ -584,10 +584,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", stream_number, ret_stream_number); @@ -596,7 +596,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", @@ -607,7 +607,7 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, L"Seekable", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", @@ -623,10 +623,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, NULL, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); /* And with a zero stream number. */ @@ -636,10 +636,10 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"WM/VideoFrameRate", &type, (BYTE *)&dword, &size); - ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(hr == ASF_E_NOTFOUND, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); - ok(dword == 0xdeadbeef, "Got frame rate %u.\n", dword); + ok(dword == 0xdeadbeef, "Got frame rate %lu.\n", dword); ok(stream_number == 0, "Got stream number %u.\n", stream_number); /* Duration with a NULL stream number. */ @@ -649,7 +649,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, NULL, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); @@ -661,7 +661,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 20460000, "Got duration %I64u.\n", duration); @@ -674,7 +674,7 @@ static void test_reader_attributes(IWMProfile *profile) duration = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, (BYTE *)&duration, &size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); ok(type == 0xdeadbeef, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); @@ -686,7 +686,7 @@ static void test_reader_attributes(IWMProfile *profile) type = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Duration", &type, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(stream_number == 0, "Got stream number %u.\n", stream_number); @@ -696,7 +696,7 @@ static void test_reader_attributes(IWMProfile *profile) dword = 0xdeadbeef; hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, L"Seekable", &type, (BYTE *)&dword, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(type == WMT_TYPE_BOOL, "Got type %#x.\n", type); ok(size == sizeof(DWORD), "Got size %u.\n", size); ok(dword == TRUE, "Got duration %I64u.\n", duration); @@ -716,58 +716,58 @@ static void test_sync_reader_selection(IWMSyncReader *reader) selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 0, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 3, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); hr = IWMSyncReader_SetStreamsSelected(reader, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 0; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); stream_numbers[0] = stream_numbers[1] = 1; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_OFF, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMSyncReader_GetStreamSelected(reader, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); hr = IWMSyncReader_GetNextSample(reader, 1, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 2, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -775,19 +775,19 @@ static void test_sync_reader_selection(IWMSyncReader *reader) hr = IWMSyncReader_GetNextSample(reader, 2, &sample, &pts, &duration, &flags, NULL, NULL); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); } hr = IWMSyncReader_GetNextSample(reader, 1, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_numbers[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[0] == 2, "Got stream number %u.\n", stream_numbers[0]); INSSBuffer_Release(sample); @@ -797,7 +797,7 @@ static void test_sync_reader_selection(IWMSyncReader *reader) &flags, NULL, &stream_numbers[0]); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[0] == 2, "Got stream number %u.\n", stream_numbers[0]); INSSBuffer_Release(sample); } @@ -805,20 +805,20 @@ static void test_sync_reader_selection(IWMSyncReader *reader) stream_numbers[0] = stream_numbers[1] = 2; selections[0] = selections[1] = WMT_OFF; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_numbers[0]); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 2; selections[0] = selections[1] = WMT_ON; hr = IWMSyncReader_SetStreamsSelected(reader, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_sync_reader_compressed(IWMSyncReader *reader) @@ -830,19 +830,19 @@ static void test_sync_reader_compressed(IWMSyncReader *reader) HRESULT hr; hr = IWMSyncReader_SetReadStreamSamples(reader, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -850,14 +850,14 @@ static void test_sync_reader_compressed(IWMSyncReader *reader) hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); if (hr == NS_E_NO_MORE_SAMPLES) break; - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); } hr = IWMSyncReader_SetReadStreamSamples(reader, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetReadStreamSamples(reader, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_sync_reader_streaming(void) @@ -879,53 +879,53 @@ static void test_sync_reader_streaming(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); hr = IWMProfile_GetStreamCount(profile, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); count = 0xdeadbeef; hr = IWMProfile_GetStreamCount(profile, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); count = 0xdeadbeef; hr = IWMSyncReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < 2; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMProfile_GetStream(profile, i, &config2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(config2 != config, "Expected different objects.\n"); ref = IWMStreamConfig_Release(config2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } hr = IWMProfile_GetStream(profile, 2, &config); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); while (!eos[0] || !eos[1]) { @@ -935,50 +935,50 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, stream_numbers[j], &sample, &pts, &duration, &flags, &output_number, &stream_number); if (first) - ok(hr == S_OK, "Expected at least one valid sample; got hr %#x.\n", hr); + ok(hr == S_OK, "Expected at least one valid sample; got hr %#lx.\n", hr); else if (eos[j]) - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); else - ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); if (hr == S_OK) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); hr = INSSBuffer_SetLength(sample, capacity + 1); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = INSSBuffer_SetLength(sample, capacity - 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); - ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ok(size == capacity - 1, "Expected size %lu, got %lu.\n", capacity - 1, size); ref = INSSBuffer_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &expect_output_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(output_number == expect_output_number, "Expected output number %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(output_number == expect_output_number, "Expected output number %lu, got %lu.\n", expect_output_number, output_number); } else { ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); - ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); - ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + ok(flags == 0xdeadbeef, "Got flags %#lx.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %lu.\n", output_number); eos[j] = true; } @@ -990,28 +990,28 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); INSSBuffer_Release(sample); for (;;) @@ -1019,30 +1019,30 @@ static void test_sync_reader_streaming(void) stream_number = pts = duration = flags = output_number = 0xdeadbeef; hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, &output_number, &stream_number); - ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == S_OK || hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); if (hr == S_OK) { hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); ref = INSSBuffer_Release(sample); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } else { ok(pts == 0xdeadbeef, "Got PTS %I64u.\n", pts); ok(duration == 0xdeadbeef, "Got duration %I64u.\n", duration); - ok(flags == 0xdeadbeef, "Got flags %#x.\n", flags); - ok(output_number == 0xdeadbeef, "Got output number %u.\n", output_number); + ok(flags == 0xdeadbeef, "Got flags %#lx.\n", flags); + ok(output_number == 0xdeadbeef, "Got output number %lu.\n", output_number); ok(stream_number == 0xbeef, "Got stream number %u.\n", stream_number); break; } @@ -1050,18 +1050,18 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[0], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetNextSample(reader, stream_numbers[1], &sample, &pts, &duration, &flags, NULL, NULL); - ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); + ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetRange(reader, 0, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); test_sync_reader_selection(reader); test_sync_reader_compressed(reader); @@ -1069,26 +1069,26 @@ static void test_sync_reader_streaming(void) test_reader_attributes(profile); hr = IWMSyncReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); SetFilePointer(stream.file, 0, NULL, FILE_BEGIN); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void check_video_type(const WM_MEDIA_TYPE *mt) @@ -1103,12 +1103,12 @@ static void check_video_type(const WM_MEDIA_TYPE *mt) ok(EqualRect(&video_info->rcSource, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&rect)); ok(EqualRect(&video_info->rcTarget, &rect), "Got target rect %s.\n", wine_dbgstr_rect(&rect)); - ok(!video_info->dwBitRate, "Got bit rate %u.\n", video_info->dwBitRate); - ok(!video_info->dwBitErrorRate, "Got bit error rate %u.\n", video_info->dwBitErrorRate); + ok(!video_info->dwBitRate, "Got bit rate %lu.\n", video_info->dwBitRate); + ok(!video_info->dwBitErrorRate, "Got bit error rate %lu.\n", video_info->dwBitErrorRate); ok(video_info->bmiHeader.biSize == sizeof(video_info->bmiHeader), - "Got size %u.\n", video_info->bmiHeader.biSize); - ok(video_info->bmiHeader.biWidth == 64, "Got width %d.\n", video_info->bmiHeader.biWidth); - ok(video_info->bmiHeader.biHeight == 48, "Got height %d.\n", video_info->bmiHeader.biHeight); + "Got size %lu.\n", video_info->bmiHeader.biSize); + ok(video_info->bmiHeader.biWidth == 64, "Got width %ld.\n", video_info->bmiHeader.biWidth); + ok(video_info->bmiHeader.biHeight == 48, "Got height %ld.\n", video_info->bmiHeader.biHeight); ok(video_info->bmiHeader.biPlanes == 1, "Got planes %d.\n", video_info->bmiHeader.biPlanes); } @@ -1134,24 +1134,24 @@ static void test_stream_media_props(IWMStreamConfig *config, const GUID *majorty HRESULT hr; hr = IWMStreamConfig_QueryInterface(config, &IID_IWMMediaProps, (void **)&props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); size = 0xdeadbeef; hr = IWMMediaProps_GetMediaType(props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMMediaProps_GetMediaType(props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n", debugstr_guid(majortype), debugstr_guid(&mt->majortype)); @@ -1180,32 +1180,32 @@ static void test_sync_reader_types(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); for (i = 0; i < 2; ++i) { - winetest_push_context("Stream %u", i); + winetest_push_context("Stream %lu", i); hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); stream_number = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_number == i + 1, "Got stream number %u.\n", stream_number); hr = IWMStreamConfig_GetStreamType(config, &majortype); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (!i) ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); else @@ -1214,33 +1214,33 @@ static void test_sync_reader_types(void) test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); output_number = 0xdeadbeef; hr = IWMSyncReader_GetOutputNumberForStream(reader, stream_number, &output_number); - ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(output_number == 1 - i, "Got output number %u.\n", output_number); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(output_number == 1 - i, "Got output number %lu.\n", output_number); stream_number2 = 0xdead; hr = IWMSyncReader_GetStreamNumberForOutput(reader, output_number, &stream_number2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { @@ -1256,38 +1256,38 @@ static void test_sync_reader_types(void) count = 0; hr = IWMSyncReader_GetOutputFormatCount(reader, output_number, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count > 0, "Got count %lu.\n", count); for (j = 0; j < count; ++j) { - winetest_push_context("Format %u", j); + winetest_push_context("Format %lu", j); hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputFormat(reader, output_number, j, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); size = 0xdeadbeef; hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -1299,52 +1299,52 @@ static void test_sync_reader_types(void) memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 1 - output_number, output_props); if (!i) - todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#x.\n", hr); + todo_wine ok(hr == ASF_E_BADMEDIATYPE, "Got hr %#lx.\n", hr); else ok(hr == NS_E_INCOMPATIBLE_FORMAT - || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#x.\n", hr); + || hr == NS_E_INVALID_OUTPUT_FORMAT /* win10 */, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, 2, output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } hr = IWMSyncReader_GetOutputFormat(reader, output_number, count, &output_props); - ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } @@ -1354,27 +1354,27 @@ static void test_sync_reader_types(void) count = 0xdeadbeef; hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - ok(count == 0xdeadbeef, "Got count %#x.\n", count); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(count == 0xdeadbeef, "Got count %#lx.\n", count); output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputProps(reader, 2, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputFormat(reader, 2, 0, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void test_sync_reader_file(void) @@ -1388,32 +1388,32 @@ static void test_sync_reader_file(void) BOOL ret; hr = WMCreateSyncReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); hr = IWMSyncReader_Open(reader, filename); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); count = 0xdeadbeef; hr = IWMSyncReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); hr = IWMSyncReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMSyncReader_Open(reader, filename); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } struct callback @@ -1444,7 +1444,7 @@ static HRESULT WINAPI callback_QueryInterface(IWMReaderCallback *iface, REFIID i struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%04x: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); + trace("%04lx: IWMReaderCallback::QueryInterface(%s)\n", GetCurrentThreadId(), debugstr_guid(iid)); if (IsEqualGUID(iid, &IID_IWMReaderAllocatorEx)) *out = &callback->IWMReaderAllocatorEx_iface; @@ -1482,21 +1482,21 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallback::OnStatus(status %u, hr %#x, type %#x, value %p)\n", + trace("%lu: %04lx: IWMReaderCallback::OnStatus(status %u, hr %#lx, type %#x, value %p)\n", GetTickCount(), GetCurrentThreadId(), status, hr, type, value); switch (status) { case WMT_OPENED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xdeadbeef, "Got unexpected context %p.\n", context); SetEvent(callback->got_opened); break; case WMT_STARTED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); callback->got_end_of_streaming = callback->got_eof = callback->got_sample = 0; ++callback->got_started; @@ -1504,21 +1504,21 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_STOPPED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); SetEvent(callback->got_stopped); break; case WMT_CLOSED: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); ++callback->got_closed; break; case WMT_END_OF_STREAMING: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); ok(!callback->got_eof, "Got %u WMT_EOF callbacks.\n", callback->got_eof); ++callback->got_end_of_streaming; @@ -1526,7 +1526,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta case WMT_EOF: ok(type == WMT_TYPE_DWORD, "Got type %#x.\n", type); - ok(!*(DWORD *)value, "Got value %#x.\n", *(DWORD *)value); + ok(!*(DWORD *)value, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->got_sample == 0, "Got %u samples.\n", callback->got_sample); @@ -1541,7 +1541,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta /* Not sent when not using IWMReaderAdvanced::DeliverTime(). */ case WMT_END_OF_SEGMENT: ok(type == WMT_TYPE_QWORD, "Got type %#x.\n", type); - ok(*(QWORD *)value == 3000, "Got value %#x.\n", *(DWORD *)value); + ok(*(QWORD *)value == 3000, "Got value %#lx.\n", *(DWORD *)value); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); if (callback->all_streams_off) ok(callback->got_sample == 0, "Got %u samples.\n", callback->got_sample); @@ -1554,7 +1554,7 @@ static HRESULT WINAPI callback_OnStatus(IWMReaderCallback *iface, WMT_STATUS sta ok(0, "Unexpected status %#x.\n", status); } - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return S_OK; } @@ -1569,33 +1569,33 @@ static void check_async_sample(struct callback *callback, INSSBuffer *sample) struct buffer *buffer = impl_from_INSSBuffer(sample); ok(sample->lpVtbl == &buffer_vtbl, "Buffer vtbl didn't match.\n"); - ok(buffer->size > 0 && buffer->size <= buffer->capacity, "Got size %d.\n", buffer->size); + ok(buffer->size > 0 && buffer->size <= buffer->capacity, "Got size %ld.\n", buffer->size); } else { ok(sample->lpVtbl != &buffer_vtbl, "Buffer vtbl shouldn't match.\n"); hr = INSSBuffer_GetBufferAndLength(sample, &data, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBuffer(sample, &data2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); hr = INSSBuffer_GetMaxLength(sample, &capacity); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size <= capacity, "Size %u exceeds capacity %u.\n", size, capacity); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size <= capacity, "Size %lu exceeds capacity %lu.\n", size, capacity); hr = INSSBuffer_SetLength(sample, capacity + 1); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = INSSBuffer_SetLength(sample, capacity - 1); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = INSSBuffer_GetBufferAndLength(sample, &data2, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(data2 == data, "Data pointers didn't match.\n"); - ok(size == capacity - 1, "Expected size %u, got %u.\n", capacity - 1, size); + ok(size == capacity - 1, "Expected size %lu, got %lu.\n", capacity - 1, size); } } @@ -1605,7 +1605,7 @@ static HRESULT WINAPI callback_OnSample(IWMReaderCallback *iface, DWORD output, struct callback *callback = impl_from_IWMReaderCallback(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallback::OnSample(output %u, time %I64u, duration %I64u, flags %#x)\n", + trace("%lu: %04lx: IWMReaderCallback::OnSample(output %lu, time %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), output, time, duration, flags); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1658,7 +1658,7 @@ static HRESULT WINAPI callback_advanced_OnStreamSample(IWMReaderCallbackAdvanced struct callback *callback = impl_from_IWMReaderCallbackAdvanced(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#x)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnStreamSample(stream %u, pts %I64u, duration %I64u, flags %#lx)\n", GetTickCount(), GetCurrentThreadId(), stream_number, pts, duration, flags); ok(context == (void *)0xfacade, "Got unexpected context %p.\n", context); @@ -1678,7 +1678,7 @@ static HRESULT WINAPI callback_advanced_OnTime(IWMReaderCallbackAdvanced *iface, struct callback *callback = impl_from_IWMReaderCallbackAdvanced(iface); if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::OnTime(time %I64u)\n", GetTickCount(), GetCurrentThreadId(), time); ok(time == callback->expect_ontime, "Got time %I64u.\n", time); @@ -1709,13 +1709,13 @@ static HRESULT WINAPI callback_advanced_AllocateForStream(IWMReaderCallbackAdvan struct buffer *object; if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::AllocateForStream(output %u, size %u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForStream(output %u, size %lu)\n", GetTickCount(), GetCurrentThreadId(), stream_number, size); ok(callback->read_compressed, "AllocateForStream() should only be called when reading compressed samples.\n"); ok(callback->allocated_samples, "AllocateForStream() should only be called when using a custom allocator.\n"); - ok(size <= max_size, "Got size %u, max stream sample size %u.\n", size, max_size); + ok(size <= max_size, "Got size %lu, max stream sample size %lu.\n", size, max_size); if (!(object = malloc(offsetof(struct buffer, data[size])))) return E_OUTOFMEMORY; @@ -1742,7 +1742,7 @@ static HRESULT WINAPI callback_advanced_AllocateForOutput(IWMReaderCallbackAdvan struct buffer *object; if (winetest_debug > 1) - trace("%u: %04x: IWMReaderCallbackAdvanced::AllocateForOutput(output %u, size %u)\n", + trace("%lu: %04lx: IWMReaderCallbackAdvanced::AllocateForOutput(output %lu, size %lu)\n", GetTickCount(), GetCurrentThreadId(), output, size); if (!callback->read_compressed) @@ -1866,23 +1866,23 @@ static void run_async_reader(IWMReader *reader, IWMReaderAdvanced2 *advanced, st callback->got_eof = 0; hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback->eof_event, 1000); ok(!ret, "Wait timed out.\n"); ok(callback->got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback->got_eof); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback->got_stopped, 1000); ok(!ret, "Wait timed out.\n"); - ok(!outstanding_buffers, "Got %d outstanding buffers.\n", outstanding_buffers); + ok(!outstanding_buffers, "Got %ld outstanding buffers.\n", outstanding_buffers); } static void test_async_reader_allocate(IWMReader *reader, @@ -1894,51 +1894,51 @@ static void test_async_reader_allocate(IWMReader *reader, callback->allocated_samples = true; hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 2, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 0, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 3, &allocate); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 2, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); @@ -1947,43 +1947,43 @@ static void test_async_reader_allocate(IWMReader *reader, callback->allocated_samples = false; hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 0, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForOutput(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(!allocate, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 1, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); hr = IWMReaderAdvanced2_GetAllocateForStream(advanced, 2, &allocate); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) ok(allocate == TRUE, "Got allocate %d.\n", allocate); run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_selection(IWMReader *reader, @@ -1995,51 +1995,51 @@ static void test_async_reader_selection(IWMReader *reader, selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 0, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 3, &selections[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(selections[0] == 0xdeadbeef, "Got selection %#x.\n", selections[0]); hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 0, NULL, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); stream_numbers[0] = 1; stream_numbers[1] = 0; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); stream_numbers[0] = stream_numbers[1] = 1; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 1, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_OFF, "Got selection %#x.\n", selections[0]); selections[0] = 0xdeadbeef; hr = IWMReaderAdvanced2_GetStreamSelected(advanced, 2, &selections[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(selections[0] == WMT_ON, "Got selection %#x.\n", selections[0]); run_async_reader(reader, advanced, callback); @@ -2047,7 +2047,7 @@ static void test_async_reader_selection(IWMReader *reader, stream_numbers[0] = stream_numbers[1] = 2; selections[0] = selections[1] = WMT_OFF; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->all_streams_off = true; run_async_reader(reader, advanced, callback); @@ -2057,7 +2057,7 @@ static void test_async_reader_selection(IWMReader *reader, stream_numbers[1] = 2; selections[0] = selections[1] = WMT_ON; hr = IWMReaderAdvanced2_SetStreamsSelected(advanced, 2, stream_numbers, selections); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_compressed(IWMReader *reader, @@ -2066,33 +2066,33 @@ static void test_async_reader_compressed(IWMReader *reader, HRESULT hr; hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 0, &callback->max_stream_sample_size[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 3, &callback->max_stream_sample_size[0]); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 1, &callback->max_stream_sample_size[0]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback->max_stream_sample_size[0] > 0, "Expected nonzero size.\n"); hr = IWMReaderAdvanced2_GetMaxStreamSampleSize(advanced, 2, &callback->max_stream_sample_size[1]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback->max_stream_sample_size[1] > 0, "Expected nonzero size.\n"); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 0, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 3, TRUE); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->read_compressed = true; run_async_reader(reader, advanced, callback); callback->read_compressed = false; hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_async_reader_allocate_compressed(IWMReader *reader, @@ -2103,42 +2103,42 @@ static void test_async_reader_allocate_compressed(IWMReader *reader, callback->read_compressed = true; hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->allocated_samples = true; hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForStream(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->allocated_samples = false; run_async_reader(reader, advanced, callback); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 0, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetAllocateForOutput(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 1, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetReceiveStreamSamples(advanced, 2, FALSE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback->read_compressed = false; } @@ -2159,68 +2159,68 @@ static void test_async_reader_streaming(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReader_Stop(reader); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); for (i = 0; i < 2; ++i) { hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(stream_numbers[i] == i + 1, "Got stream number %u.\n", stream_numbers[i]); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); /* By default the reader will time itself, and attempt to deliver samples * according to their presentation time. Call DeliverTime with the file * duration in order to request all samples as fast as possible. */ hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_SetUserProvidedClock(advanced, TRUE); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); callback.expect_ontime = 0; hr = IWMReaderAdvanced2_DeliverTime(advanced, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); callback.expect_ontime = 1000 * 10000; hr = IWMReaderAdvanced2_DeliverTime(advanced, 1000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); callback.expect_ontime = 3000 * 10000; hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.ontime_event, 1000); ok(!ret, "Wait timed out.\n"); @@ -2229,22 +2229,22 @@ static void test_async_reader_streaming(void) ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReaderAdvanced2_DeliverTime(advanced, 3000 * 10000); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.eof_event, 1000); ok(!ret, "Wait timed out.\n"); ok(callback.got_eof == 1, "Got %u WMT_EOF callbacks.\n", callback.got_eof); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.got_stopped, 1000); ok(!ret, "Wait timed out.\n"); hr = IWMReader_Stop(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = WaitForSingleObject(callback.got_stopped, 1000); ok(!ret, "Wait timed out.\n"); @@ -2255,26 +2255,26 @@ static void test_async_reader_streaming(void) test_async_reader_allocate_compressed(reader, advanced, &callback); hr = IWMReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); hr = IWMReader_Stop(reader); - ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); hr = IWMReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } static void test_async_reader_types(void) @@ -2299,32 +2299,32 @@ static void test_async_reader_types(void) BOOL ret; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", debugstr_w(file), GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %lu.\n", debugstr_w(file), GetLastError()); teststream_init(&stream, file); callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); IWMReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); IWMReader_QueryInterface(reader, &IID_IWMReaderAdvanced2, (void **)&advanced); hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(stream.refcount > 1, "Got refcount %ld.\n", stream.refcount); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); for (i = 0; i < 2; ++i) { - winetest_push_context("Stream %u", i); + winetest_push_context("Stream %lu", i); hr = IWMProfile_GetStream(profile, i, &config); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMStreamConfig_GetStreamType(config, &majortype); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (!i) ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); else @@ -2333,32 +2333,32 @@ static void test_async_reader_types(void) test_stream_media_props(config, &majortype); ref = IWMStreamConfig_Release(config); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } for (i = 0; i < 2; ++i) { - winetest_push_context("Output %u", i); + winetest_push_context("Output %lu", i); output_number = i; hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); majortype = mt->majortype; memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { @@ -2372,14 +2372,14 @@ static void test_async_reader_types(void) * with. In particular it has to be PCM. */ hr = IWMReader_GetOutputFormat(reader, output_number, 0, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); /* The sample size might differ. */ mt2->lSampleSize = mt->lSampleSize; @@ -2396,38 +2396,38 @@ static void test_async_reader_types(void) count = 0; hr = IWMReader_GetOutputFormatCount(reader, output_number, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count > 0, "Got count %lu.\n", count); for (j = 0; j < count; ++j) { - winetest_push_context("Format %u", j); + winetest_push_context("Format %lu", j); hr = IWMReader_GetOutputFormat(reader, output_number, j, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputFormat(reader, output_number, j, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); size = 0xdeadbeef; hr = IWMOutputMediaProps_GetMediaType(output_props, NULL, &size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %lu.\n", size); ret_size = size - 1; hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); + ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); ret_size = sizeof(mt_buffer); memset(mt_buffer, 0xcc, sizeof(mt_buffer)); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size); - ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n", + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(ret_size == size, "Expected size %lu, got %lu.\n", size, ret_size); + ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %Iu, got %lu.\n", sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size); ok(IsEqualGUID(&mt->majortype, &majortype), "Got major type %s.\n", debugstr_guid(&mt->majortype)); @@ -2439,52 +2439,52 @@ static void test_async_reader_types(void) memset(&majortype2, 0xcc, sizeof(majortype2)); hr = IWMOutputMediaProps_GetType(output_props, &majortype2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&majortype2, &majortype), "Expected major type %s, got %s.\n", debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMReader_SetOutputProps(reader, output_number, output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, 1 - output_number, output_props); if (!i) ok(hr == NS_E_INCOMPATIBLE_FORMAT /* win < 8, win10 1507-1809 */ - || hr == ASF_E_BADMEDIATYPE /* win8, win10 1909+ */, "Got hr %#x.\n", hr); + || hr == ASF_E_BADMEDIATYPE /* win8, win10 1909+ */, "Got hr %#lx.\n", hr); else - todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, 2, output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ret_size = sizeof(mt2_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props2, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } hr = IWMReader_GetOutputFormat(reader, output_number, count, &output_props); - ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(output_props2 != output_props, "Expected different objects.\n"); ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); winetest_pop_context(); } @@ -2494,28 +2494,28 @@ static void test_async_reader_types(void) count = 0xdeadbeef; hr = IWMReader_GetOutputFormatCount(reader, 2, &count); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - ok(count == 0xdeadbeef, "Got count %#x.\n", count); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(count == 0xdeadbeef, "Got count %#lx.\n", count); output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputProps(reader, 2, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputFormat(reader, 2, 0, &output_props); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMReaderAdvanced2_Release(advanced); IWMProfile_Release(profile); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); - ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); + ok(stream.refcount == 1, "Got outstanding refcount %ld.\n", stream.refcount); CloseHandle(stream.file); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } static void test_async_reader_file(void) @@ -2531,39 +2531,39 @@ static void test_async_reader_file(void) callback_init(&callback); hr = WMCreateReader(NULL, 0, &reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Open(reader, filename, &callback.IWMReaderCallback_iface, (void **)0xdeadbeef); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(callback.refcount > 1, "Got refcount %d.\n", callback.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(callback.refcount > 1, "Got refcount %ld.\n", callback.refcount); ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(count == 2, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 2, "Got count %lu.\n", count); hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)0xfacade); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_Close(reader); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); hr = IWMReader_Close(reader); - ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#lx.\n", hr); ref = IWMReader_Release(reader); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %ld.\n", ref); ok(callback.got_closed == 1, "Got %u WMT_CLOSED callbacks.\n", callback.got_closed); - ok(callback.refcount == 1, "Got outstanding refcount %d.\n", callback.refcount); + ok(callback.refcount == 1, "Got outstanding refcount %ld.\n", callback.refcount); callback_cleanup(&callback); ret = DeleteFileW(filename); - ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(filename), GetLastError()); + ok(ret, "Failed to delete %s, error %lu.\n", debugstr_w(filename), GetLastError()); } START_TEST(wmvcore)

1 0

[PATCH] dlls/wlanapi/tests: enable compilation with long types
by Eric Pouech 10 Mar '22

10 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wlanapi/tests/Makefile.in | 1 - dlls/wlanapi/tests/wlanapi.c | 60 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/wlanapi/tests/Makefile.in b/dlls/wlanapi/tests/Makefile.in index 6fede3572c8..a08db320f1f 100644 --- a/dlls/wlanapi/tests/Makefile.in +++ b/dlls/wlanapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wlanapi.dll IMPORTS = wlanapi diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 55ac21eee04..5c26e6d8ba0 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -35,73 +35,73 @@ static void test_WlanOpenHandle(void) is_xp = ret == ERROR_SUCCESS; if (!is_xp) /* the results in XP differ completely from all other versions */ { - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); ret = WlanOpenHandle(10, NULL, &neg_version, &handle); - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* reserved parameter must not be used */ ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* invalid parameters */ ret = WlanOpenHandle(1, NULL, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(handle == bad_handle, "bad handle\n"); ret = WlanOpenHandle(1, NULL, &neg_version, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); } else { - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } /* good tests */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(2, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); if (!is_xp) /* XP does not support client version 2 */ - ok(neg_version == 2, "Expected 2, got %d\n", neg_version); + ok(neg_version == 2, "Expected 2, got %ld\n", neg_version); else - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "bad handle\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* open twice */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(1, NULL, &neg_version, &handle2); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle, &reserved); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ret = WlanCloseHandle(handle, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle2, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(bad_handle, NULL); - ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %d\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %ld\n", ret); ret = WlanCloseHandle(NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); } static void test_WlanAllocateFreeMemory(void) @@ -111,7 +111,7 @@ static void test_WlanAllocateFreeMemory(void) SetLastError(0xdeadbeef); ptr = WlanAllocateMemory(0); ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", GetLastError()); ptr = WlanAllocateMemory(1024); ok(ptr != NULL, "Expected non-NULL\n"); @@ -130,23 +130,23 @@ static void test_WlanEnumInterfaces(void) WLAN_INTERFACE_INFO *info; ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) { @@ -156,11 +156,11 @@ static void test_WlanEnumInterfaces(void) return; } - trace("Wireless interfaces: %d\n", list->dwNumberOfItems); + trace("Wireless interfaces: %ld\n", list->dwNumberOfItems); for (i = 0; i < list->dwNumberOfItems;i ++) { info = &list->InterfaceInfo[i]; - trace(" Index[%d] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); + trace(" Index[%ld] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); switch (info->isState) { case wlan_interface_state_disconnected: @@ -179,7 +179,7 @@ static void test_WlanEnumInterfaces(void) WlanFreeMemory(list); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } START_TEST(wlanapi)

1 0

[PATCH vkd3d v4 2/8] vkd3d-shader/hlsl: Avoid leaks on memory allocation failures when parsing initializers.
by Francisco Casas 10 Mar '22

10 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - This patch is new in v4. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 92dcb3f2..8c66a33c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3211,7 +3211,10 @@ complex_initializer: { $$.args_count = 1; if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) + { + destroy_instr_list($1); YYABORT; + } $$.args[0] = node_from_list($1); $$.instrs = $1; } @@ -3240,7 +3243,11 @@ initializer_expr_list: { $$ = $1; if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + destroy_instr_list($3); YYABORT; + } $$.args[$$.args_count++] = node_from_list($3); list_move_tail($$.instrs, $3); vkd3d_free($3); -- 2.25.1

2 4

[PATCH v3 1/5] bcrypt: Implement KeyLength property.
by Santino Mazza 10 Mar '22

10 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 6 ++++++ dlls/bcrypt/tests/bcrypt.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7353cae26eb..75ee96f56c7 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -701,6 +701,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } } + else if (!wcscmp( prop, BCRYPT_KEY_LENGTH )) + { + if(size < sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + key->u.a.bitlen = *(DWORD*)value; + return STATUS_SUCCESS; + } FIXME( "unsupported key property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 95addc1ab16..9230726969b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -672,6 +672,7 @@ static void test_BCryptGenerateSymmetricKey(void) BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); @@ -706,6 +707,13 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + todo_wine + { + keylen = 512; + ret = BCryptSetProperty(aes, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + } + size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); @@ -2005,6 +2013,7 @@ static void test_RSA(void) ULONG len, size, size2, schemes; NTSTATUS ret; BYTE *buf; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) @@ -2052,12 +2061,21 @@ static void test_RSA(void) ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* sign/verify with export/import round-trip */ - ret = BCryptGenerateKeyPair(alg, &key, 512, 0); + ret = BCryptGenerateKeyPair(alg, &key, 1024, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + keylen = 512; + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, 2, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); -- 2.32.0

2 7

[PATCH v3 1/2] ncrypt: Implement NCryptCreatePersistedKey.
by Santino Mazza 10 Mar '22

10 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 109 +++++++++++++++++++++++++++------- dlls/ncrypt/ncrypt_internal.h | 21 +++++++ dlls/ncrypt/tests/ncrypt.c | 8 ++- 3 files changed, 114 insertions(+), 24 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8ace3e55731..1cc09cdfc97 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -30,14 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); -SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, - const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) -{ - FIXME("(%#Ix, %p, %s, %s, %#lx, %#lx): stub\n", provider, key, wine_dbgstr_w(algid), - wine_dbgstr_w(name), keyspec, flags); - return NTE_NOT_SUPPORTED; -} - SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { @@ -229,6 +221,45 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n return ERROR_SUCCESS; } +static struct object *create_key_object(enum algid algid, NCRYPT_PROV_HANDLE provider) +{ + struct object *key_object; + NTSTATUS ret; + + if (!(key_object = allocate_object(KEY))) + { + ERR("Error allocating memory\n"); + return NULL; + } + + switch(algid) + { + case RSA: + { + ret = BCryptOpenAlgorithmProvider(&key_object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error opening algorithm provider\n"); + free(key_object); + return NULL; + } + + key_object->key.algid = RSA; + set_object_property(key_object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); + break; + } + default: + { + ERR("Invalid algid %#x\n", algid); + free(key_object); + return NULL; + } + } + + set_object_property(key_object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); + return key_object; +} + SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *handle, BYTE *data, DWORD datasize, DWORD flags) @@ -259,12 +290,6 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - if (!(object = allocate_object(KEY))) - { - ERR("Error allocating memory\n"); - return NTE_NO_MEMORY; - } - switch(header->Magic) { case BCRYPT_RSAFULLPRIVATE_MAGIC: @@ -273,13 +298,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H { NTSTATUS ret; BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; - ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); - if (ret != ERROR_SUCCESS) + + if (!(object = create_key_object(RSA, provider))) { - ERR("Error opening algorithm provider\n"); - free(object); - return NTE_INTERNAL_ERROR; + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; } + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); if (ret != ERROR_SUCCESS) { @@ -289,14 +314,11 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_DATA; } - set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: FIXME("Unhandled key magic %#lx\n", header->Magic); - free(object); return NTE_INVALID_PARAMETER; } @@ -304,6 +326,49 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return ERROR_SUCCESS; } +SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, + const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) +{ + struct object *key_object; + TRACE("(%#Ix, %p, %s, %s, %#lx, %#lx)\n", provider, key, wine_dbgstr_w(algid), + wine_dbgstr_w(name), keyspec, flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (name) FIXME("Persistant keys not supported\n"); + + if (!lstrcmpiW(algid, BCRYPT_RSA_ALGORITHM)) + { + NTSTATUS ret; + DWORD default_bitlength = 1024; + + if (!(key_object = create_key_object(RSA, provider))) + { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + ret = BCryptGenerateKeyPair(key_object->key.bcrypt_alg, &key_object->key.bcrypt_key, 1024, 0); + if (ret != ERROR_SUCCESS) + { + ERR("Error generating key pair\n"); + BCryptCloseAlgorithmProvider(key_object->key.bcrypt_alg, 0); + free(key_object); + return NTE_INTERNAL_ERROR; + } + + set_object_property(key_object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&default_bitlength, sizeof(default_bitlength)); + } + else + { + FIXME("Algorithm not handled %s\n", wine_dbgstr_w(algid)); + return NTE_NOT_SUPPORTED; + } + + *key = (NCRYPT_KEY_HANDLE)key_object; + return ERROR_SUCCESS; +} + SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index e5884c8871a..fb4dcd290b6 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -18,8 +18,29 @@ #include <bcrypt.h> +enum algid +{ + AES, + DES, + DESX, + DH, + DSA, + ECDH, + ECDH_P256, + ECDH_P384, + ECDH_P521, + ECDSA, + ECDSA_P256, + ECDSA_P384, + ECDSA_P521, + RC2, + RSA, + PBKDF2, +}; + struct key { + enum algid algid; BCRYPT_ALG_HANDLE bcrypt_alg; BCRYPT_KEY_HANDLE bcrypt_key; }; diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index cf434054428..ec69b236ac9 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -229,6 +229,7 @@ static void test_set_property(void) { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); + } NCryptFreeObject(key); key = 0; @@ -240,6 +241,8 @@ static void test_set_property(void) ret = NCryptSetProperty(key, NCRYPT_LENGTH_PROPERTY, (BYTE *)&keylength, sizeof(keylength), 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + todo_wine + { ret = NCryptSetProperty(key, NCRYPT_NAME_PROPERTY, (BYTE *)L"Key name", sizeof(L"Key name"), 0); ok(ret == NTE_NOT_SUPPORTED, "got %#lx\n", ret); @@ -261,7 +264,6 @@ static void test_create_persisted_key(void) ret = NCryptOpenStorageProvider(&prov, NULL, 0); ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); - todo_wine { key = 0; ret = NCryptCreatePersistedKey(0, &key, BCRYPT_RSA_ALGORITHM, NULL, 0, 0); ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); @@ -292,14 +294,16 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + todo_wine + { key = 0; ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); else ok(key, "got null handle\n"); + } NCryptFreeObject(prov); - } } START_TEST(ncrypt) -- 2.32.0

1 1

[PATCH] winegstreamer: Deliver samples in PTS order instead of alternating.
by Zebediah Figura 10 Mar '22

10 Mar '22

For the async reader, and when requesting stream 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/wm_asyncreader.c | 97 +++++++++++++---------------- dlls/winegstreamer/wm_reader.c | 97 ++++++++++++++++++++++++----- dlls/winegstreamer/wm_syncreader.c | 57 +++-------------- 4 files changed, 137 insertions(+), 118 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 2cbba09f9a7..a3f8c0ab5eb 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -180,8 +180,8 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number); -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags); +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 9dfe2380284..947b3307a3a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -72,11 +72,11 @@ static void open_stream(struct async_reader *reader, IWMReaderCallback *callback static DWORD WINAPI stream_thread(void *arg) { struct async_reader *reader = arg; - WORD i, stream_count = reader->reader.stream_count; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; static const DWORD zero; QWORD pts, duration; + WORD stream_number; INSSBuffer *sample; DWORD flags; HRESULT hr; @@ -87,71 +87,56 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { - bool all_eos = true; + hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); - for (i = 0; i < stream_count; ++i) + if (hr == S_OK) { - struct wm_stream *stream = &reader->reader.streams[i]; + struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, &sample, &pts, &duration, &flags); - if (hr == S_OK) + if (reader->user_clock) { - if (reader->user_clock) - { - QWORD user_time = reader->user_time; + QWORD user_time = reader->user_time; + + if (pts > user_time && reader->reader.callback_advanced) + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + while (pts > reader->user_time && reader->running) + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); + if (!reader->running) + { + INSSBuffer_Release(sample); + goto out; + } + } + else + { + for (;;) + { + REFERENCE_TIME current_time = get_current_time(reader); + + if (pts <= current_time - start_time) + break; + + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, + (pts - (current_time - start_time)) / 10000); - if (pts > user_time && reader->reader.callback_advanced) - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); - while (pts > reader->user_time && reader->running) - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); if (!reader->running) { INSSBuffer_Release(sample); goto out; } } - else - { - for (;;) - { - REFERENCE_TIME current_time = get_current_time(reader); - - if (pts <= current_time - start_time) - break; - - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, - (pts - (current_time - start_time)) / 10000); - - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } - } - } - - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, - i + 1, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, i, pts, duration, - flags, sample, reader->context); - TRACE("Callback returned %#lx.\n", hr); - INSSBuffer_Release(sample); - all_eos = false; - } - else if (hr != NS_E_NO_MORE_SAMPLES) - { - ERR("Failed to get sample, hr %#lx.\n", hr); - LeaveCriticalSection(&reader->stream_cs); - return 0; } + + if (stream->read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + stream_number, pts, duration, flags, sample, reader->context); + else + hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, + flags, sample, reader->context); + TRACE("Callback returned %#lx.\n", hr); + INSSBuffer_Release(sample); } - - if (all_eos) + else if (hr == NS_E_NO_MORE_SAMPLES) { IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -171,6 +156,12 @@ static DWORD WINAPI stream_thread(void *arg) LeaveCriticalSection(&reader->stream_cs); return 0; } + else + { + ERR("Failed to get sample, hr %#lx.\n", hr); + LeaveCriticalSection(&reader->stream_cs); + return 0; + } } out: diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index bfed0d1e0ca..c911cb59d1f 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1820,30 +1820,98 @@ static const char *get_major_type_string(enum wg_major_type type) return NULL; } -HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, - INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) +/* Find the earliest buffer by PTS. + * + * Native seems to behave similarly to this with the async reader, although our + * unit tests show that it's not entirely consistent—some frames are received + * slightly out of order. It's possible that one stream is being manually offset + * to account for decoding latency. + * + * The behaviour with the synchronous reader, when stream 0 is requested, seems + * consistent with this hypothesis, but with a much larger offset—the video + * stream seems to be "behind" by about 150 ms. + * + * The main reason for doing this is that the video and audio stream probably + * don't have quite the same "frame rate", and we don't want to force one stream + * to decode faster just to keep up with the other. Delivering samples in PTS + * order should avoid that problem. */ +static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffer *ret_buffer) { - IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; - struct wg_parser_stream *wg_stream = stream->wg_stream; + struct wg_parser_buffer buffer; + QWORD earliest_pts = UI64_MAX; + WORD stream_number = 0; + WORD i; + + for (i = 0; i < reader->stream_count; ++i) + { + struct wm_stream *stream = &reader->streams[i]; + + if (stream->selection == WMT_OFF) + continue; + + if (!wg_parser_stream_get_buffer(stream->wg_stream, &buffer)) + continue; + + if (buffer.has_pts && buffer.pts < earliest_pts) + { + stream_number = i + 1; + earliest_pts = buffer.pts; + *ret_buffer = buffer; + } + } + + return stream_number; +} + +HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, + INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) +{ + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; + struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; + struct wm_stream *stream; DWORD size, capacity; INSSBuffer *sample; HRESULT hr; BYTE *data; - if (stream->selection == WMT_OFF) - return NS_E_INVALID_REQUEST; - - if (stream->eos) - return NS_E_NO_MORE_SAMPLES; - for (;;) { - if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + if (!stream_number) { - stream->eos = true; - TRACE("End of stream.\n"); - return NS_E_NO_MORE_SAMPLES; + if (!(stream_number = get_earliest_buffer(reader, &wg_buffer))) + { + /* All streams are disabled or EOS. */ + return NS_E_NO_MORE_SAMPLES; + } + + stream = wm_reader_get_stream_by_stream_number(reader, stream_number); + wg_stream = stream->wg_stream; + } + else + { + if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + { + WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); + return E_INVALIDARG; + } + wg_stream = stream->wg_stream; + + if (stream->selection == WMT_OFF) + { + WARN("Stream %u is deselected; returning NS_E_INVALID_REQUEST.\n", stream_number); + return NS_E_INVALID_REQUEST; + } + + if (stream->eos) + return NS_E_NO_MORE_SAMPLES; + + if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + { + stream->eos = true; + TRACE("End of stream.\n"); + return NS_E_NO_MORE_SAMPLES; + } } TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); @@ -1920,6 +1988,7 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, *flags |= WM_SF_CLEANPOINT; *ret_sample = sample; + *ret_stream_number = stream_number; return S_OK; } } diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 55940e2b370..c7cccd52c4f 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -25,8 +25,6 @@ struct sync_reader struct wm_reader reader; IWMSyncReader2 IWMSyncReader2_iface; - - WORD last_read_stream; }; static struct sync_reader *impl_from_IWMSyncReader2(IWMSyncReader2 *iface) @@ -84,60 +82,21 @@ static HRESULT WINAPI WMSyncReader_GetNextSample(IWMSyncReader2 *iface, { struct sync_reader *reader = impl_from_IWMSyncReader2(iface); HRESULT hr = NS_E_NO_MORE_SAMPLES; - struct wm_stream *stream; - WORD i; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", reader, stream_number, sample, pts, duration, flags, output_number, ret_stream_number); + if (!stream_number && !output_number && !ret_stream_number) + return E_INVALIDARG; + EnterCriticalSection(&reader->reader.cs); - if (!stream_number) - { - if (!output_number && !ret_stream_number) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - for (i = 0; i < reader->reader.stream_count; ++i) - { - WORD index = (i + reader->last_read_stream + 1) % reader->reader.stream_count; - struct wm_stream *stream = &reader->reader.streams[index]; - - if (stream->selection == WMT_OFF) - continue; - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK) - { - if (output_number) - *output_number = index; - if (ret_stream_number) - *ret_stream_number = index + 1; - } - if (hr != NS_E_NO_MORE_SAMPLES) - { - reader->last_read_stream = index; - break; - } - } - } - else - { - if (!(stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number))) - { - LeaveCriticalSection(&reader->reader.cs); - return E_INVALIDARG; - } - - hr = wm_reader_get_stream_sample(stream, sample, pts, duration, flags); - if (hr == S_OK && output_number) - *output_number = stream->index; - if (ret_stream_number) - *ret_stream_number = stream->index + 1; - } + hr = wm_reader_get_stream_sample(&reader->reader, stream_number, sample, pts, duration, flags, &stream_number); + if (output_number && hr == S_OK) + *output_number = stream_number - 1; + if (ret_stream_number && (hr == S_OK || stream_number)) + *ret_stream_number = stream_number; LeaveCriticalSection(&reader->reader.cs); return hr; -- 2.35.1

1 0

[PATCH v4 1/3] winevulkan: Avoid zero-sized allocations.
by Georg Lehmann 09 Mar '22

09 Mar '22

Fixes some -Wmaybe-uninitialized warnings in the next patch. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..1d796289615 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2150,7 +2150,7 @@ class ConversionFunction(object): body += "#endif /* USE_STRUCT_CONVERSION */\n" body += " unsigned int i;\n\n" - body += " if (!in) return NULL;\n\n" + body += " if (!in || !count) return NULL;\n\n" body += " out = malloc(count * sizeof(*out));\n" -- 2.35.1

1 2

[PATCH v3 1/2] winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Georg Lehmann 09 Mar '22

09 Mar '22

We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 107 ++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c609bbfd151..2f3d647ef9b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -205,6 +205,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + "vkCreateComputePipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + "vkCreateGraphicsPipelines" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -250,6 +252,9 @@ FUNCTION_OVERRIDES = { "vkGetDeviceGroupSurfacePresentModesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, "vkGetPhysicalDevicePresentRectanglesKHR" : {"dispatch" : True, "driver" : True, "thunk" : ThunkType.PUBLIC}, + # VK_KHR_ray_tracing_pipeline + "vkCreateRayTracingPipelinesKHR" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, + # VK_EXT_calibrated_timestamps "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : ThunkType.NONE}, @@ -261,6 +266,9 @@ FUNCTION_OVERRIDES = { # VK_EXT_debug_report "vkCreateDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, "vkDestroyDebugReportCallbackEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.NONE}, + + # VK_NV_ray_tracing + "vkCreateRayTracingPipelinesNV" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } STRUCT_CHAIN_CONVERSIONS = { diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 19cc999433b..190f70f3616 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1758,6 +1758,113 @@ NTSTATUS wine_vkDestroyDebugReportCallbackEXT(void *args) return STATUS_SUCCESS; } +static void fixup_pipeline_feedback(VkPipelineCreationFeedback *feedback, uint32_t count) +{ +#if defined(USE_STRUCT_CONVERSION) + struct host_pipeline_feedback + { + VkPipelineCreationFeedbackFlags flags; + uint64_t duration; + } *host_feedback; + int64_t i; + + host_feedback = (void *) feedback; + + for (i = count - 1; i >= 0; i--) + { + memmove(&feedback[i].duration, &host_feedback[i].duration, sizeof(uint64_t)); + feedback[i].flags = host_feedback[i].flags; + } +#endif +} + +static void fixup_pipeline_feedback_info(const void *pipeline_info) +{ + VkPipelineCreationFeedbackCreateInfo *feedback; + + feedback = wine_vk_find_struct(pipeline_info, PIPELINE_CREATION_FEEDBACK_CREATE_INFO); + + if (!feedback) + return; + + fixup_pipeline_feedback(feedback->pPipelineCreationFeedback, 1); + fixup_pipeline_feedback(feedback->pPipelineStageCreationFeedbacks, + feedback->pipelineStageCreationFeedbackCount); +} + +NTSTATUS wine_vkCreateComputePipelines(void *args) +{ + struct vkCreateComputePipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateComputePipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateGraphicsPipelines(void *args) +{ + struct vkCreateGraphicsPipelines_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateGraphicsPipelines(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesKHR(void *args) +{ + struct vkCreateRayTracingPipelinesKHR_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, 0x%s, %u, %p, %p, %p\n", params->device, + wine_dbgstr_longlong(params->deferredOperation), wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesKHR(params->device, params->deferredOperation, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + +NTSTATUS wine_vkCreateRayTracingPipelinesNV(void *args) +{ + struct vkCreateRayTracingPipelinesNV_params *params = args; + VkResult res; + uint32_t i; + + TRACE("%p, 0x%s, %u, %p, %p, %p\n", params->device, wine_dbgstr_longlong(params->pipelineCache), + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + res = thunk_vkCreateRayTracingPipelinesNV(params->device, params->pipelineCache, + params->createInfoCount, params->pCreateInfos, params->pAllocator, params->pPipelines); + + for (i = 0; i < params->createInfoCount; i++) + fixup_pipeline_feedback_info(&params->pCreateInfos[i]); + + return res; +} + BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); -- 2.35.1

2 2

[tools] testbot/cgi: Move saving items to ItemPage::Save().
by Francois Gouget 09 Mar '22

09 Mar '22

A FormPage has no Collection field and no concept of what an Item object is so it should not be trying to save items. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ea7f0f5b2..3ac62239d5 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -388,10 +388,7 @@ sub Save($) { my ($self) = @_; - return !1 if (!$self->SaveProperties()); - - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return ! defined($self->{ErrMessage}); + return $self->SaveProperties(); } sub OnAction($$) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 3dab64cf71..940115475f 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,6 +134,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SUPER::Save()); + + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return !defined $self->{ErrMessage}; +} + sub OnAction($$) { my ($self, $Action) = @_; -- 2.30.2

1 0

[tools] testbot/web: Explicitly call exit on return from Redirect().
by Francois Gouget 09 Mar '22

09 Mar '22

Having Redirect() call exit() itself is confusing and requires documenting that it does not return in each call point and/or adding a defensive exit() call anyway. Using the exit(Redirect(...)) construct is more explicit, concise and robust. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 18 +++++++----------- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++------ testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 6 +++--- testbot/web/JobDetails.pl | 8 +++----- testbot/web/Login.pl | 3 +-- testbot/web/Submit.pl | 13 +++---------- testbot/web/admin/Log.pl | 4 ++-- testbot/web/admin/SpecialJobs.pl | 3 +-- testbot/web/admin/SpecialJobs2.pl | 3 +-- testbot/web/admin/UserDetails.pl | 9 +++------ 11 files changed, 29 insertions(+), 50 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index a5e8187009..9027b87758 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -539,20 +539,16 @@ sub OnAction($$) "=" . uri_escape($MasterColValues->[$ColIndex]); } } - $self->{EnclosingPage}->Redirect($Target); - return 1; + exit($self->{EnclosingPage}->Redirect($Target)); } - else + + my $Ok = 1; + foreach my $Key (@{$self->{Collection}->GetKeys()}) { - my $Ok = 1; - foreach my $Key (@{$self->{Collection}->GetKeys()}) + if (defined $self->{EnclosingPage}->GetParam($self->SelName($Key)) && $Ok) { - if (defined($self->{EnclosingPage}->GetParam($self->SelName($Key))) && - $Ok) - { - my $Item = $self->{Collection}->GetItem($Key); - $Ok = $self->CallOnItemAction($Item, $Action); - } + my $Item = $self->{Collection}->GetItem($Key); + $Ok = $self->CallOnItemAction($Item, $Action); } } } diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9b9f2ff7e5..3dab64cf71 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -141,13 +141,11 @@ sub OnAction($$) if ($Action eq "OK") { return !1 if (!$self->Save()); - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } - elsif ($Action eq "Cancel") + if ($Action eq "Cancel") { - $self->RedirectToList(); - exit; + exit($self->RedirectToList()); } return $self->SUPER::OnAction($Action); @@ -167,7 +165,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); # does not return + return $self->Redirect($Target); } 1; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 8abaaaa9d2..b0450d0e78 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -246,7 +246,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($self, $Location); } sub GetCurrentSession($) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index d38e8d96b6..b7edd8fcaa 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -56,7 +56,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - $self->Redirect($Page, MakeSecureURL($LoginURL)); + exit($self->Redirect($Page, MakeSecureURL($LoginURL))); } } @@ -75,7 +75,7 @@ sub CheckSecurePage($$) if ($UseSSL && ! SecureConnection()) { - $self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"})); + exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); } } @@ -415,7 +415,7 @@ sub Redirect($$$) } $self->{Request}->headers_out->set("Location", $Location); $self->{Request}->status(Apache2::Const::REDIRECT); - exit; + return 0; # a suitable exit code } sub GetCurrentSession($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 919c7a5e3b..8d93957ce6 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/"); # does not return + exit($self->Redirect("/")); } $self->{JobId} = $JobId; @@ -193,8 +193,7 @@ sub OnCancel($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnRestart($) @@ -215,8 +214,7 @@ sub OnRestart($) return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=" . $self->{JobId})); } sub OnAction($$$) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index d9757edb92..ac64fc28ea 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -135,8 +135,7 @@ sub OnLogIn($) { $Target = "/"; } - $self->Redirect(MakeSecureURL($Target)); # does not return - exit; + exit($self->Redirect(MakeSecureURL($Target))); } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 98d13381e0..79d1c8772d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1265,8 +1265,7 @@ sub _SubmitJob($$) return undef; } - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; + exit($self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey())); } sub OnSubmit($) @@ -1323,14 +1322,8 @@ sub OnOK($) { my ($self) = @_; - if (defined $self->{JobKey}) - { - $self->Redirect("/JobDetails.pl?Key=$self->{JobKey}"); # does not return - } - else - { - $self->Redirect("/"); # does not return - } + my $Target = defined $self->{JobKey} ? "/JobDetails.pl?Key=$self->{JobKey}" : "/"; + exit($self->Redirect($Target)); } sub OnAction($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index cb253bd03e..456e73f55d 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -71,8 +71,8 @@ sub GetActions($) sub OnDownload($) { my ($self) = @_; - $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return - exit; + + exit($self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours"))); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index 534336c483..02d9f8ea9d 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -237,8 +237,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/SpecialJobs2.pl b/testbot/web/admin/SpecialJobs2.pl index c5a8f6587f..3fa5ab11bb 100644 --- a/testbot/web/admin/SpecialJobs2.pl +++ b/testbot/web/admin/SpecialJobs2.pl @@ -240,8 +240,7 @@ sub OnSubmit($) return undef; } - $self->Redirect("/"); # does not return - exit; + exit($self->Redirect("/")); } sub OnAction($$) diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 2cf0f597fb..8c26930e8e 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -74,8 +74,7 @@ sub OnApprove($) return !1 if (!$self->Save()); $self->{ErrMessage} = $self->{Item}->Approve(); return !1 if (defined $self->{ErrMessage}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnReject($) @@ -87,8 +86,7 @@ sub OnReject($) return !1 if (defined $self->{ErrMessage}); # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnOK($) @@ -101,8 +99,7 @@ sub OnOK($) # Forcefully log out that user by deleting his web sessions DeleteSessions($self->{Item}); } - $self->RedirectToList(); # does not return - exit; + exit($self->RedirectToList()); } sub OnAction($$) -- 2.30.2

1 0

[PATCH 1/7] ws2_32: Manage shorter length for SO_KEEPALIVE.
by Paul Gofman 09 Mar '22

09 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 31e8be5b6b0..1a0d28c484e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1525,6 +1525,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_KEEPALIVE, optval, optlen ); case SO_LINGER: @@ -2827,7 +2833,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return -1; case SO_KEEPALIVE: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); + if (optlen <= 0 || !optval) + { + SetLastError( optlen ? WSAENOBUFS : WSAEFAULT ); + return SOCKET_ERROR; + } + value = *optval; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, (char *)&value, sizeof(value) ); case SO_LINGER: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3da68b0e4a8..a6505134d44 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1171,6 +1171,7 @@ static void test_set_getsockopt(void) { {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_KEEPALIVE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, -- 2.35.1

3 15

[PATCH 4/4] winealsa: Move release_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 29 +++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 31 +++++-------------------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 60ef49c4c1a..02063fd3374 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1752,6 +1752,34 @@ static NTSTATUS get_capture_buffer(void *args) return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 done = params->done; + + alsa_lock(stream); + + if(!done){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->getbuf_last != done) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + stream->written_frames += done; + stream->held_frames -= done; + stream->lcl_offs_frames += done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2086,6 +2114,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cecb358bab7..b50025aa77c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1398,37 +1398,16 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - alsa_lock(stream); - - if(!done){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(stream->getbuf_last != done){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } + params.stream = This->stream; + params.done = done; - stream->written_frames += done; - stream->held_frames -= done; - stream->lcl_offs_frames += done; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->getbuf_last = 0; + ALSA_CALL(release_capture_buffer, &params); - alsa_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c4efe5ad764..ddca1a3100c 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -141,6 +141,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct alsa_stream *stream; + UINT32 done; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -199,6 +206,7 @@ enum alsa_funcs alsa_get_render_buffer, alsa_release_render_buffer, alsa_get_capture_buffer, + alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 3/4] winealsa: Move get_capture_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 62 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 69 +++++------------------------------- dlls/winealsa.drv/unixlib.h | 12 +++++++ 3 files changed, 83 insertions(+), 60 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 302a525e52d..60ef49c4c1a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1691,6 +1691,67 @@ static NTSTATUS release_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 *frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(stream->held_frames < stream->mmdev_period_frames){ + *frames = 0; + return alsa_unlock_result(stream, &params->result, AUDCLNT_S_BUFFER_EMPTY); + } + *frames = stream->mmdev_period_frames; + + if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ + UINT32 chunk_bytes, offs_bytes, frames_bytes; + if(stream->tmp_buffer_frames < *frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = *frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = *frames; + } + + *params->data = stream->tmp_buffer; + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * + stream->fmt->nBlockAlign; + offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + frames_bytes = *frames * stream->fmt->nBlockAlign; + memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); + memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, + frames_bytes - chunk_bytes); + }else + *params->data = stream->local_buffer + + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *frames; + *params->flags = 0; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + LARGE_INTEGER stamp, freq; + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return alsa_unlock_result(stream, &params->result, *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -2024,6 +2085,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = timer_loop, get_render_buffer, release_render_buffer, + get_capture_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e5512880442..cecb358bab7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1369,8 +1369,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct alsa_stream *stream = This->stream; - SIZE_T size; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1383,66 +1382,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - /* hr = GetNextPacketSize(iface, frames); */ - if(stream->held_frames < stream->mmdev_period_frames){ - *frames = 0; - alsa_unlock(stream); - return AUDCLNT_S_BUFFER_EMPTY; - } - *frames = stream->mmdev_period_frames; - - if(stream->lcl_offs_frames + *frames > stream->bufsize_frames){ - UINT32 chunk_bytes, offs_bytes, frames_bytes; - if(stream->tmp_buffer_frames < *frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = *frames; - } - - *data = stream->tmp_buffer; - chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * - stream->fmt->nBlockAlign; - offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; - frames_bytes = *frames * stream->fmt->nBlockAlign; - memcpy(stream->tmp_buffer, stream->local_buffer + offs_bytes, chunk_bytes); - memcpy(stream->tmp_buffer + chunk_bytes, stream->local_buffer, - frames_bytes - chunk_bytes); - }else - *data = stream->local_buffer + - stream->lcl_offs_frames * stream->fmt->nBlockAlign; - - stream->getbuf_last = *frames; - *flags = 0; - - if(devpos) - *devpos = stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; - alsa_unlock(stream); + ALSA_CALL(get_capture_buffer, &params); - return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bef38c2a1a9..c4efe5ad764 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -130,6 +130,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct alsa_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + UINT *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct is_format_supported_params { const char *alsa_name; @@ -187,6 +198,7 @@ enum alsa_funcs alsa_timer_loop, alsa_get_render_buffer, alsa_release_render_buffer, + alsa_get_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 2/4] winealsa: Move release_render_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 58 ++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 73 +++--------------------------------- dlls/winealsa.drv/unixlib.h | 9 +++++ 3 files changed, 73 insertions(+), 67 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 57a605b6bdf..302a525e52d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1634,6 +1634,63 @@ static NTSTATUS get_render_buffer(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) +{ + snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; + UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; + snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; + UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; + + if(written_bytes <= chunk_bytes){ + memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); + }else{ + memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); + memcpy(stream->local_buffer, buffer + chunk_bytes, + written_bytes - chunk_bytes); + } +} + +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 written_frames = params->written_frames; + BYTE *buffer; + + alsa_lock(stream); + + if(!written_frames){ + stream->getbuf_last = 0; + return alsa_unlock_result(stream, &params->result, S_OK); + } + + if(!stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_INVALID_SIZE); + + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, written_frames); + + if(stream->getbuf_last < 0) + alsa_wrap_buffer(stream, buffer, written_frames); + + stream->wri_offs_frames += written_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += written_frames; + stream->written_frames += written_frames; + stream->getbuf_last = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1966,6 +2023,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, timer_loop, get_render_buffer, + release_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5d99ede8a4f..e5512880442 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -689,18 +689,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1314,70 +1302,21 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return params.result; } -static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) -{ - snd_pcm_uframes_t write_offs_frames = stream->wri_offs_frames; - UINT32 write_offs_bytes = write_offs_frames * stream->fmt->nBlockAlign; - snd_pcm_uframes_t chunk_frames = stream->bufsize_frames - write_offs_frames; - UINT32 chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; - UINT32 written_bytes = written_frames * stream->fmt->nBlockAlign; - - if(written_bytes <= chunk_bytes){ - memcpy(stream->local_buffer + write_offs_bytes, buffer, written_bytes); - }else{ - memcpy(stream->local_buffer + write_offs_bytes, buffer, chunk_bytes); - memcpy(stream->local_buffer, buffer + chunk_bytes, - written_bytes - chunk_bytes); - } -} - static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); - alsa_lock(stream); - - if(!written_frames){ - stream->getbuf_last = 0; - alsa_unlock(stream); - return S_OK; - } - - if(!stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(written_frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)){ - alsa_unlock(stream); - return AUDCLNT_E_INVALID_SIZE; - } - - if(stream->getbuf_last >= 0) - buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; - else - buffer = stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(stream, buffer, written_frames); - - if(stream->getbuf_last < 0) - alsa_wrap_buffer(stream, buffer, written_frames); - - stream->wri_offs_frames += written_frames; - stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += written_frames; - stream->written_frames += written_frames; - stream->getbuf_last = 0; + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; - alsa_unlock(stream); + ALSA_CALL(release_render_buffer, &params); - return S_OK; + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index fb137d6b9ff..bef38c2a1a9 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -122,6 +122,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 written_frames; + UINT flags; + HRESULT result; +}; + struct is_format_supported_params { const char *alsa_name; @@ -178,6 +186,7 @@ enum alsa_funcs alsa_reset, alsa_timer_loop, alsa_get_render_buffer, + alsa_release_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH 1/2] dlls/windowscodecs/tests: use correct integral type
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecs/tests/info.c | 7 ++++--- dlls/windowscodecs/tests/metadata.c | 9 +++++---- dlls/windowscodecs/tests/palette.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 339555f23fe..31416f3d8f1 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -114,7 +114,7 @@ static void test_decoder_info(void) IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; HRESULT hr; - ULONG len; + UINT len; WCHAR value[256]; CLSID clsid; GUID pixelformats[32]; @@ -292,7 +292,7 @@ static void test_pixelformat_info(void) IWICPixelFormatInfo *pixelformat_info; IWICPixelFormatInfo2 *pixelformat_info2; HRESULT hr; - ULONG len, known_len; + UINT len, known_len; WCHAR value[256]; GUID guid; WICComponentType componenttype; @@ -499,7 +499,8 @@ static void test_reader_info(void) HRESULT hr; CLSID clsid; GUID container_formats[10]; - UINT count, size, tid; + UINT count, size; + DWORD tid; HANDLE thread; WICMetadataPattern *patterns; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index bec8bb08c76..8eaf22a300c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -321,7 +321,8 @@ static void test_metadata_tEXt(void) IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; - ULONG items_returned, count; + ULONG items_returned; + UINT count; GUID format; PropVariantInit(&schema); @@ -438,7 +439,7 @@ static void test_metadata_gAMA(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; static const WCHAR ImageGamma[] = {'I','m','a','g','e','G','a','m','m','a',0}; @@ -483,7 +484,7 @@ static void test_metadata_cHRM(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; int i; static const WCHAR expected_names[8][12] = { @@ -799,7 +800,7 @@ static void test_metadata_IFD(void) IWICMetadataReader *reader; IWICMetadataBlockReader *blockreader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; char *IFD_data_swapped; #ifdef WORDS_BIGENDIAN diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 583fa66c80e..d07b936ca9e 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -205,7 +205,7 @@ static void test_custom_palette(void) } } -static void generate_gray16_palette(DWORD *entries, UINT count) +static void generate_gray16_palette(WICColor *entries, UINT count) { UINT i; @@ -218,7 +218,7 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } -static void generate_gray256_palette(DWORD *entries, UINT count) +static void generate_gray256_palette(WICColor *entries, UINT count) { UINT i; @@ -231,7 +231,7 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } -static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone8_palette(WICColor *entries, UINT count, BOOL add_transparent) { UINT i; @@ -260,7 +260,7 @@ static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_tran entries[i] = 0; } -static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone27_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; UINT i; @@ -283,7 +283,7 @@ static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone64_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; UINT i; @@ -313,7 +313,7 @@ static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone125_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[5] = { 0x00, 0x40, 0x80, 0xbf, 0xff }; UINT i; @@ -336,7 +336,7 @@ static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone216_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; UINT i; @@ -366,7 +366,7 @@ static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone252_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; @@ -389,7 +389,7 @@ static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone256_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone256_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff };

2 3

[PATCH 1/4] winealsa: Move get_render_buffer to the unixlib.
by Huw Davies 09 Mar '22

09 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 48 ++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 54 ++++-------------------------------- dlls/winealsa.drv/unixlib.h | 9 ++++++ 3 files changed, 63 insertions(+), 48 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index d7c6ae7779c..57a605b6bdf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1587,6 +1587,53 @@ static NTSTATUS timer_loop(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct alsa_stream *stream = params->stream; + UINT32 write_pos, frames = params->frames; + SIZE_T size; + + alsa_lock(stream); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_OUT_OF_ORDER); + + if(!frames) + return alsa_unlock_result(stream, &params->result, S_OK); + + /* held_frames == GetCurrentPadding_nolock(); */ + if(stream->held_frames + frames > stream->bufsize_frames) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_TOO_LARGE); + + write_pos = stream->wri_offs_frames; + if(write_pos + frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < frames){ + if(stream->tmp_buffer){ + size = 0; + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); + stream->tmp_buffer = NULL; + } + size = frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, + MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); + } + stream->tmp_buffer_frames = frames; + } + *params->data = stream->tmp_buffer; + stream->getbuf_last = -frames; + }else{ + *params->data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; + stream->getbuf_last = frames; + } + + silence_buffer(stream, *params->data, frames); + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1918,6 +1965,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, timer_loop, + get_render_buffer, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7a99a6b5d43..5d99ede8a4f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1297,9 +1297,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - struct alsa_stream *stream = This->stream; - UINT32 write_pos; - SIZE_T size; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1307,53 +1305,13 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - alsa_lock(stream); - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - alsa_unlock(stream); - return S_OK; - } - - /* held_frames == GetCurrentPadding_nolock(); */ - if(stream->held_frames + frames > stream->bufsize_frames){ - alsa_unlock(stream); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - write_pos = stream->wri_offs_frames; - if(write_pos + frames > stream->bufsize_frames){ - if(stream->tmp_buffer_frames < frames){ - if(stream->tmp_buffer){ - size = 0; - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); - stream->tmp_buffer = NULL; - } - size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ - stream->tmp_buffer_frames = 0; - alsa_unlock(stream); - return E_OUTOFMEMORY; - } - stream->tmp_buffer_frames = frames; - } - *data = stream->tmp_buffer; - stream->getbuf_last = -frames; - }else{ - *data = stream->local_buffer + write_pos * stream->fmt->nBlockAlign; - stream->getbuf_last = frames; - } - - silence_buffer(stream, *data, frames); + params.stream = This->stream; + params.frames = frames; + params.data = data; - alsa_unlock(stream); + ALSA_CALL(get_render_buffer, &params); - return S_OK; + return params.result; } static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 written_frames) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index bd3a1a4bc6a..fb137d6b9ff 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -114,6 +114,14 @@ struct timer_loop_params struct alsa_stream *stream; }; +struct get_render_buffer_params +{ + struct alsa_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct is_format_supported_params { const char *alsa_name; @@ -169,6 +177,7 @@ enum alsa_funcs alsa_stop, alsa_reset, alsa_timer_loop, + alsa_get_render_buffer, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH] dlls/windowscodecsext/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windowscodecsext/tests/Makefile.in | 1 - dlls/windowscodecsext/tests/transform.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in index 22c052f8384..d99067ef296 100644 --- a/dlls/windowscodecsext/tests/Makefile.in +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windowscodecsext.dll IMPORTS = windowscodecsext ole32 diff --git a/dlls/windowscodecsext/tests/transform.c b/dlls/windowscodecsext/tests/transform.c index e76f9fe8a4f..01f0d8a289e 100644 --- a/dlls/windowscodecsext/tests/transform.c +++ b/dlls/windowscodecsext/tests/transform.c @@ -32,28 +32,28 @@ static void test_WICCreateColorTransform_Proxy(void) IWICColorTransform *transform; hr = WICCreateColorTransform_Proxy( NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); }

2 1

[PATCH vkd3d v2] vkd3d: Handle D3D12_APPEND_ALIGNED_ELEMENT for <4 byte wide elements.
by Conor McCarthy 09 Mar '22

09 Mar '22

In d3d12, input element alignment needs to be the _minimum_ of 4 and the size of the type. See the D3D11 spec, section 4.4.6, which behaves similarly: https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… This is correctly taken into account when generating, e.g., the vertex_buffer_stride_align_mask used for validation, but is not taken into account when D3D12_APPEND_ALIGNED_ELEMENT is used to automatically place input elements. Currently, vkd3d always assumes the alignment is 4. This means that, for example, bytes or shorts should be packed tightly together when D3D12_APPEND_ALIGNED_ELEMENT is used, but are instead padded to 4 bytes. Fixing this makes units appear in Age of Empires IV. (CrossOver bug 19924 --CM). From: David Gow <david(a)ingeniumdigital.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Fix patch issue. --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0e7800a4..72422897 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2430,9 +2430,9 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, if (e->AlignedByteOffset != D3D12_APPEND_ALIGNED_ELEMENT) offsets[i] = e->AlignedByteOffset; else - offsets[i] = input_slot_offsets[e->InputSlot]; + offsets[i] = align(input_slot_offsets[e->InputSlot], min(4, format->byte_count)); - input_slot_offsets[e->InputSlot] = align(offsets[i] + format->byte_count, 4); + input_slot_offsets[e->InputSlot] = offsets[i] + format->byte_count; } return S_OK; -- 2.34.1

3 2

[PATCH v3 1/6] windows.media.speech: Create private header.
by Bernhard Kölbl 09 Mar '22

09 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/main.c | 17 ++---------- dlls/windows.media.speech/private.h | 41 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 dlls/windows.media.speech/private.h diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..94e6e5f9b2c 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,23 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" +#include "private.h" -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..0af024d0a72 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,41 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#endif -- 2.35.1

2 11

[PATCH 08/10] win32u: Move GetWindowRect implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

3 2

[PATCH v2] wined3d: Allow changing settings using a new WINE_D3D_CONFIG environment variable.
by Zebediah Figura 09 Mar '22

09 Mar '22

This can be significantly more convenient than modifying the registry. config_list_get_value() is based on vkd3d_debug_list_has_member() by Józef Kucia. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 104 ++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5bddc2587f4..524dc7508f9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -150,17 +150,67 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return object; } -static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size) +static bool is_option_separator(char c) { + return c == ',' || c == ';' || c == '\0'; +} + +static const char *config_list_get_value(const char *string, const char *key, size_t *len) +{ + const char *p, *end; + char prev_char; + + p = string; + while (p) + { + if ((p = strstr(p, key))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(key); + + if (is_option_separator(prev_char) && *p == '=') + { + if ((end = strpbrk(p + 1, ",;"))) + *len = end - p + 1; + else + *len = strlen(p + 1); + return p + 1; + } + } + } + + return NULL; +} + +static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const char *name, char *buffer, DWORD size) +{ + const char *env_value; + size_t env_len; + + if ((env_value = config_list_get_value(env, name, &env_len)) && env_len < size) + { + memcpy(buffer, env_value, env_len); + buffer[env_len] = 0; + return 0; + } if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) { DWORD type, data, size; + const char *env_value; + size_t env_len; + char *end; + if ((env_value = config_list_get_value(env, name, &env_len))) + { + *value = strtoul(env_value, &end, 0); + if (end != env_value) + return 0; + } size = sizeof(data); if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; size = sizeof(data); @@ -202,6 +252,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD wined3d_context_tls_idx; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); + const char *env; HKEY hkey = 0; HKEY appkey = 0; DWORD tmpvalue; @@ -259,17 +310,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } } - if (hkey || appkey) + /* Allow modifying settings using the WINE_D3D_CONFIG environment variable, + * which takes precedence over registry keys. An example is as follows: + * + * WINE_D3D_CONFIG=csmt=0x1,shader_backend=glsl + */ + env = getenv("WINE_D3D_CONFIG"); + + if (hkey || appkey || env) { - if (!get_config_key_dword(hkey, appkey, "csmt", &wined3d_settings.cs_multithreaded)) + if (!get_config_key_dword(hkey, appkey, env, "csmt", &wined3d_settings.cs_multithreaded)) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); - if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MaxVersionGL", &tmpvalue)) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) + if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { if (!_strnicmp(buffer, "glsl", -1)) { @@ -293,10 +351,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled.\n"); } - if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) + if (!get_config_key(hkey, appkey, env, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { int pci_device_id = tmpvalue; @@ -311,7 +369,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_device_id = pci_device_id; } } - if ( !get_config_key_dword( hkey, appkey, "VideoPciVendorID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciVendorID", &tmpvalue)) { int pci_vendor_id = tmpvalue; @@ -326,7 +384,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_vendor_id = pci_vendor_id; } } - if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "VideoMemorySize", buffer, size)) { int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) @@ -339,7 +397,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); } - if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "WineLogo", buffer, size)) { size_t len = strlen(buffer) + 1; @@ -348,32 +406,32 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else memcpy(wined3d_settings.logo, buffer, len); } - if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &wined3d_settings.multisample_textures)) + if (!get_config_key_dword(hkey, appkey, env, "MultisampleTextures", &wined3d_settings.multisample_textures)) ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); - if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + if (!get_config_key_dword(hkey, appkey, env, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + if (!get_config_key(hkey, appkey, env, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } - if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + if (!get_config_key_dword(hkey, appkey, env, "strict_shader_math", &wined3d_settings.strict_shader_math)) ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) TRACE("Limiting HS shader model to %u.\n", wined3d_settings.max_sm_hs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) TRACE("Limiting DS shader model to %u.\n", wined3d_settings.max_sm_ds); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size)) + if (!get_config_key(hkey, appkey, env, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) { @@ -391,7 +449,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } - if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + if (!get_config_key_dword(hkey, appkey, env, "cb_access_map_w", &tmpvalue) && tmpvalue) { TRACE("Forcing all constant buffers to be write-mappable.\n"); wined3d_settings.cb_access_map_w = TRUE; -- 2.35.1

2 1

[PATCH 00/20] Enabling compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

FWIW, I split user32/tests in 3 sub-patches in order to ease review A+ --- Eric Pouech (20): dlls/kernel32/tests/sync.c: enable compilation with long types dlls/kernel32/tests/thread.c: enable compilation with long types dlls/kernel32/tests/virtual.c: enable compilation with long types dlls/kernel32/tests/volume.c: enable compilation with long types dlls/urlmon/tests: enable compilation with long types dlls/userenv/tests: enable compilation with long types dlls/uxtheme/tests: enable compilation with long types dlls/user32/tests: use correct integral type dlls/user32/tests: wrap helper macro inside function dlls/user32/tests/[a-i]*.c: enable compilation with long types dlls/user32/tests/[j-u]*.c: enable compilation with long types dlls/user32/tests: enable compilation with long types dlls/vbscript/tests: enable compilation with long types dlls/vcomp110/tests: enable compilation with long types dlls/vcomp/tests: enable compilation with long types dlls/version/tests: enable compilation with long types dlls/virtdisk/tests: enable compilation with long types dlls/vulkan-1/tests: enable compilation with long types dlls/wer/tests: enable compilation with long types dlls/wevtapi/tests: enable compilation with long types dlls/kernel32/tests/sync.c | 463 ++++---- dlls/kernel32/tests/thread.c | 405 +++---- dlls/kernel32/tests/virtual.c | 1839 ++++++++++++++++--------------- dlls/kernel32/tests/volume.c | 423 +++---- dlls/urlmon/tests/Makefile.in | 1 - dlls/urlmon/tests/misc.c | 668 +++++------ dlls/urlmon/tests/protocol.c | 606 +++++----- dlls/urlmon/tests/sec_mgr.c | 382 +++---- dlls/urlmon/tests/stream.c | 32 +- dlls/urlmon/tests/uri.c | 1086 +++++++++--------- dlls/urlmon/tests/url.c | 558 +++++----- dlls/user32/tests/Makefile.in | 1 - dlls/user32/tests/broadcast.c | 60 +- dlls/user32/tests/class.c | 84 +- dlls/user32/tests/clipboard.c | 400 +++---- dlls/user32/tests/combo.c | 58 +- dlls/user32/tests/cursoricon.c | 300 ++--- dlls/user32/tests/dce.c | 24 +- dlls/user32/tests/dde.c | 481 ++++---- dlls/user32/tests/dialog.c | 108 +- dlls/user32/tests/edit.c | 207 ++-- dlls/user32/tests/input.c | 444 ++++---- dlls/user32/tests/listbox.c | 210 ++-- dlls/user32/tests/menu.c | 332 +++--- dlls/user32/tests/monitor.c | 434 ++++---- dlls/user32/tests/msg.c | 972 ++++++++-------- dlls/user32/tests/resource.c | 20 +- dlls/user32/tests/scroll.c | 92 +- dlls/user32/tests/static.c | 16 +- dlls/user32/tests/sysparams.c | 592 +++++----- dlls/user32/tests/text.c | 72 +- dlls/user32/tests/uitools.c | 4 +- dlls/user32/tests/win.c | 1498 ++++++++++++------------- dlls/user32/tests/winstation.c | 158 +-- dlls/user32/tests/wsprintf.c | 8 +- dlls/userenv/tests/Makefile.in | 1 - dlls/userenv/tests/userenv.c | 46 +- dlls/uxtheme/tests/Makefile.in | 1 - dlls/uxtheme/tests/msg.h | 16 +- dlls/uxtheme/tests/system.c | 404 +++---- dlls/uxtheme/tests/v6util.h | 4 +- dlls/vbscript/tests/Makefile.in | 1 - dlls/vbscript/tests/createobj.c | 84 +- dlls/vbscript/tests/run.c | 380 +++---- dlls/vbscript/tests/vbscript.c | 738 ++++++------- dlls/vcomp/tests/Makefile.in | 1 - dlls/vcomp/tests/vcomp.c | 156 +-- dlls/vcomp110/tests/Makefile.in | 1 - dlls/vcomp110/tests/vcomp110.c | 4 +- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 138 +-- dlls/version/tests/install.c | 76 +- dlls/virtdisk/tests/Makefile.in | 1 - dlls/virtdisk/tests/virtdisk.c | 16 +- dlls/vulkan-1/tests/Makefile.in | 1 - dlls/vulkan-1/tests/vulkan.c | 4 +- dlls/wer/tests/Makefile.in | 1 - dlls/wer/tests/main.c | 82 +- dlls/wevtapi/tests/Makefile.in | 1 - dlls/wevtapi/tests/wevtapi.c | 16 +- 60 files changed, 7604 insertions(+), 7608 deletions(-)

3 26

[PATCH 04/10] win32u: Move GetDesktopWindow implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 3 +- dlls/user32/win.c | 82 +------------------------- dlls/win32u/message.c | 9 +++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/winstation.c | 110 ++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 6 files changed, 123 insertions(+), 85 deletions(-)

3 2

[PATCH 00/25] migration to long types
by Eric Pouech 09 Mar '22

09 Mar '22

migrating dlls/oleaut32/tests required lot more effort than usual <g> - the current code didn't use the generic integer scheme of the rest of the file (likely because of LONG64 printf limitations) => test code is now converted to the generic integer scheme (making it a bit simpler) (I found it more straightforward to do it that way than trying to maintain a scheme that was meant to disapear at some time) - the long/LONG/int mixup showed up in automation as well. => most of the tests routines have been converted int => LONG (I didn't include the migration to long, which needs to be done *after* enabling LONG as long, please let me know if it's to be done) No regressions have been seen here with winetest. Tested also on testbot without regression. But review is more than welcomed! The rest of the changes are "as usual". A+ --- Eric Pouech (25): dlls/kernel32/tests/path.c: enable compilation with long types dlls/kernel32/tests/pipe.c: enable compilation with long types dlls/kernel32/tests/process.c: enable compilation with long types dlls/kernel32/tests/profile.c: enable compilation with long types dlls/oleaut32/tests: get rid of EXPECTI864 macro (vartype.c) dlls/oleaut32/tests: convert I8 to current integer test scheme (vartype.c) dlls/oleau32/tests: convert I8Copy to existing integer test scheme (vartype.c) dlls/oleaut32/tests: convert UI8 to existing integer test scheme (vartype.c) dlls/oleaut32/tests: convert UI8Copy to existing integer test scheme (vartype.c) dlls/oleaut32/tests: ensure (re)definition of EXPECTRES for all integer types (vartype.c) dlls/oleaut32/tests: use correct integral type dlls/oleaut32/tests: enable compilation with long types dlls/shdocvw/tests: enable compilation with long types dlls/shell32/tests: use correct integral type dlls/shell32/tests: enable compilation with long types dlls/shlwapi/tests: enable compilation with long types dlls/slc/tests: enable compilation with long types dlls/spoolss/tests: enable compilation with long types dlls/sti/tests: enable compilation with long types dlls/sxs/tests: enable compilation with long types dlls/tapi32/tests: enable compilation with long types dlls/taskschd/tests: enable compilation with long types dlls/twain_32/tests: enable compilation with long types dlls/uianimation/tests: enable compilation with long types dlls/uiautomationcore/tests: enable compilation with long types dlls/kernel32/tests/path.c | 401 ++--- dlls/kernel32/tests/pipe.c | 949 ++++++------ dlls/kernel32/tests/process.c | 939 ++++++------ dlls/kernel32/tests/profile.c | 347 ++--- dlls/oleaut32/tests/Makefile.in | 1 - dlls/oleaut32/tests/dispatch.c | 52 +- dlls/oleaut32/tests/olefont.c | 124 +- dlls/oleaut32/tests/olepicture.c | 268 ++-- dlls/oleaut32/tests/safearray.c | 426 +++--- dlls/oleaut32/tests/tmarshal.c | 503 +++--- dlls/oleaut32/tests/tmarshal.idl | 12 +- dlls/oleaut32/tests/typelib.c | 1596 ++++++++++---------- dlls/oleaut32/tests/usrmarshal.c | 324 ++-- dlls/oleaut32/tests/varformat.c | 60 +- dlls/oleaut32/tests/vartest.c | 336 ++--- dlls/oleaut32/tests/vartype.c | 648 ++++---- dlls/shdocvw/tests/Makefile.in | 1 - dlls/shdocvw/tests/shdocvw.c | 46 +- dlls/shdocvw/tests/shortcut.c | 12 +- dlls/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/appbar.c | 18 +- dlls/shell32/tests/assoc.c | 80 +- dlls/shell32/tests/autocomplete.c | 76 +- dlls/shell32/tests/brsfolder.c | 34 +- dlls/shell32/tests/ebrowser.c | 314 ++-- dlls/shell32/tests/msg.h | 8 +- dlls/shell32/tests/recyclebin.c | 6 +- dlls/shell32/tests/shelldispatch.c | 438 +++--- dlls/shell32/tests/shelllink.c | 274 ++-- dlls/shell32/tests/shellole.c | 74 +- dlls/shell32/tests/shellpath.c | 260 ++-- dlls/shell32/tests/shfldr_special.c | 66 +- dlls/shell32/tests/shlexec.c | 202 +-- dlls/shell32/tests/shlfileop.c | 287 ++-- dlls/shell32/tests/shlfolder.c | 1086 ++++++------- dlls/shell32/tests/shlview.c | 194 +-- dlls/shlwapi/tests/Makefile.in | 1 - dlls/shlwapi/tests/assoc.c | 50 +- dlls/shlwapi/tests/clist.c | 4 +- dlls/shlwapi/tests/clsid.c | 10 +- dlls/shlwapi/tests/istream.c | 258 ++-- dlls/shlwapi/tests/ordinal.c | 306 ++-- dlls/shlwapi/tests/path.c | 210 +-- dlls/shlwapi/tests/shreg.c | 104 +- dlls/shlwapi/tests/string.c | 52 +- dlls/shlwapi/tests/thread.c | 34 +- dlls/shlwapi/tests/url.c | 276 ++-- dlls/slc/tests/Makefile.in | 1 - dlls/slc/tests/slc.c | 18 +- dlls/spoolss/tests/Makefile.in | 1 - dlls/spoolss/tests/spoolss.c | 6 +- dlls/sti/tests/Makefile.in | 1 - dlls/sti/tests/sti.c | 20 +- dlls/sxs/tests/Makefile.in | 1 - dlls/sxs/tests/cache.c | 70 +- dlls/sxs/tests/name.c | 66 +- dlls/sxs/tests/sxs.c | 38 +- dlls/tapi32/tests/Makefile.in | 1 - dlls/tapi32/tests/tapi.c | 14 +- dlls/taskschd/tests/Makefile.in | 1 - dlls/taskschd/tests/scheduler.c | 618 ++++---- dlls/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 42 +- dlls/uianimation/tests/Makefile.in | 1 - dlls/uianimation/tests/uianimation.c | 26 +- dlls/uiautomationcore/tests/Makefile.in | 1 - dlls/uiautomationcore/tests/uiautomation.c | 80 +- 67 files changed, 6347 insertions(+), 6428 deletions(-)

4 32

[PATCH 01/20] dlls/kernel32/tests/heap.c: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/heap.c | 179 ++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8558bd7f1b3..a910645e666 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -19,6 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdlib.h> @@ -107,7 +108,7 @@ static void test_heap(void) mem = HeapAlloc(GetProcessHeap(), 0, size); heap_size = HeapSize(GetProcessHeap(), 0, mem); ok(heap_size == size || heap_size == resize_9x(size), - "HeapSize returned %lu instead of %lu or %lu\n", heap_size, size, resize_9x(size)); + "HeapSize returned %Iu instead of %Iu or %Iu\n", heap_size, size, resize_9x(size)); HeapFree(GetProcessHeap(), 0, mem); } @@ -126,7 +127,7 @@ static void test_heap(void) ok(msecond != NULL, "HeapReAlloc(0) should have succeeded\n"); size = HeapSize(GetProcessHeap(), 0, msecond); ok(size == 0 || broken(size == 1) /* some vista and win7 */, - "HeapSize should have returned 0 instead of %lu\n", size); + "HeapSize should have returned 0 instead of %Iu\n", size); HeapFree(GetProcessHeap(), 0, msecond); /* large blocks must be 16-byte aligned */ @@ -143,16 +144,16 @@ static void test_heap(void) gbl = GlobalReAlloc(gbl, 10, GMEM_MOVEABLE); ok(gbl != NULL, "Can't realloc global memory\n"); size = GlobalSize(gbl); - ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); + ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%Id\n", size); gbl = GlobalReAlloc(gbl, 0, GMEM_MOVEABLE); ok(gbl != NULL, "GlobalReAlloc should not fail on size 0\n"); size = GlobalSize(gbl); - ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size); + ok(size == 0, "Memory not resized to size 0, instead size=%Id\n", size); ok(GlobalFree(gbl) == NULL, "Memory not freed\n"); size = GlobalSize(gbl); - ok(size == 0, "Memory should have been freed, size=%ld\n", size); + ok(size == 0, "Memory should have been freed, size=%Id\n", size); gbl = GlobalReAlloc(0, 10, GMEM_MOVEABLE); ok(gbl == NULL, "global realloc allocated memory\n"); @@ -162,39 +163,39 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); mem = GlobalLock(gbl); /* #1 */ - ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError()); + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n", + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); msecond = GlobalLock(gbl); /* #2 */ - ok( msecond == mem, "returned %p with %d (expected '%p')\n", + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n", + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); /* #1 */ - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( flags , "returned 0x%04x with %d (expected '!= 0')\n", + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); - ok( !flags , "returned 0x%04x with %d (expected '0')\n", + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ @@ -203,7 +204,7 @@ static void test_heap(void) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); GlobalFree(gbl); @@ -211,35 +212,35 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), LongToHandle(0xdeadbeef)); SetLastError(MAGIC_DEAD); hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ ok( (hsecond == LongToHandle(0xdeadbee0)) && ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), - "returned %p with 0x%08x (expected %p with ERROR_NOACCESS)\n", + "returned %p with 0x%08lx (expected %p with ERROR_NOACCESS)\n", hsecond, GetLastError(), LongToHandle(0xdeadbee0)); SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " + "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = GlobalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %ld with 0x%08x (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); SetLastError(MAGIC_DEAD); mem = GlobalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected NULL with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* documented on MSDN: GlobalUnlock() return FALSE on failure. @@ -249,7 +250,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); res = GlobalUnlock(gbl); ok(GetLastError() == ERROR_INVALID_HANDLE, - "returned %d with %d (expected ERROR_INVALID_HANDLE)\n", + "returned %ld with %ld (expected ERROR_INVALID_HANDLE)\n", res, GetLastError()); gbl = GlobalAlloc(GMEM_DDESHARE, 100); @@ -267,7 +268,7 @@ static void test_heap(void) if (mem == gbl) ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } /* GMEM_FIXED block expands in place only without flags */ @@ -276,7 +277,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); GlobalFree(gbl); } @@ -286,9 +287,9 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = GlobalReAlloc(gbl, size + init_size, GMEM_MOVEABLE); ok(hsecond != NULL, - "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); mem = GlobalLock(hsecond); - ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + ok(mem == hsecond, "got %p (expected %p) @%Id\n", mem, hsecond, size); GlobalFree(hsecond); } @@ -297,12 +298,12 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); + "Expected 1 or 0, got %ld\n", res); res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); + "Expected 1 or 0, got %ld\n", res); GlobalFree(gbl); @@ -312,8 +313,8 @@ static void test_heap(void) res = GlobalUnlock(gbl); ok(res == 1 || broken(res == 0), /* win9x */ - "Expected 1 or 0, got %d\n", res); - ok(GetLastError() == 0xdeadbeef, "got %d\n", GetLastError()); + "Expected 1 or 0, got %ld\n", res); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); GlobalFree(gbl); @@ -322,16 +323,16 @@ static void test_heap(void) { SetLastError(MAGIC_DEAD); size = GlobalSize((HGLOBAL)0xc042); - ok(size == 0, "Expected 0, got %ld\n", size); + ok(size == 0, "Expected 0, got %Id\n", size); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_PARAMETER, /* win9x */ - "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE or ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } gbl = GlobalAlloc( GMEM_FIXED, 0 ); SetLastError(0xdeadbeef); size = GlobalSize( gbl ); - ok( size == 1, "wrong size %lu\n", size ); + ok( size == 1, "wrong size %Iu\n", size ); GlobalFree( gbl ); /* ####################################### */ @@ -342,16 +343,16 @@ static void test_heap(void) gbl = LocalReAlloc(gbl, 10, LMEM_MOVEABLE); ok(gbl != NULL, "Can't realloc local memory\n"); size = LocalSize(gbl); - ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%ld\n", size); + ok(size >= 10 && size <= 16, "Memory not resized to size 10, instead size=%Id\n", size); gbl = LocalReAlloc(gbl, 0, LMEM_MOVEABLE); ok(gbl != NULL, "LocalReAlloc should not fail on size 0\n"); size = LocalSize(gbl); - ok(size == 0, "Memory not resized to size 0, instead size=%ld\n", size); + ok(size == 0, "Memory not resized to size 0, instead size=%Id\n", size); ok(LocalFree(gbl) == NULL, "Memory not freed\n"); size = LocalSize(gbl); - ok(size == 0, "Memory should have been freed, size=%ld\n", size); + ok(size == 0, "Memory should have been freed, size=%Id\n", size); gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ok(gbl == NULL, "local realloc allocated memory\n"); @@ -360,39 +361,39 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_MOVEABLE, 256); SetLastError(MAGIC_DEAD); mem = LocalLock(gbl); /* #1 */ - ok(mem != NULL, "returned %p with %d (expected '!= NULL')\n", mem, GetLastError()); + ok(mem != NULL, "returned %p with %ld (expected '!= NULL')\n", mem, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags == 1, "returned 0x%04x with %d (expected '0x0001')\n", + ok( flags == 1, "returned 0x%04x with %ld (expected '0x0001')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); msecond = LocalLock(gbl); /* #2 */ - ok( msecond == mem, "returned %p with %d (expected '%p')\n", + ok( msecond == mem, "returned %p with %ld (expected '%p')\n", msecond, GetLastError(), mem); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags == 2, "returned 0x%04x with %d (expected '0x0002')\n", + ok( flags == 2, "returned 0x%04x with %ld (expected '0x0002')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); /* #1 */ - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( flags , "returned 0x%04x with %d (expected '!= 0')\n", + ok( flags , "returned 0x%04x with %ld (expected '!= 0')\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); /* #0 */ /* NT: ERROR_SUCCESS (documented on MSDN), 9x: untouched */ ok(!res && ((GetLastError() == ERROR_SUCCESS) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_SUCCESS or " + "returned %ld with %ld (expected '0' with: ERROR_SUCCESS or " "MAGIC_DEAD)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); - ok( !flags , "returned 0x%04x with %d (expected '0')\n", + ok( !flags , "returned 0x%04x with %ld (expected '0')\n", flags, GetLastError()); /* Unlock an already unlocked Handle */ @@ -401,7 +402,7 @@ static void test_heap(void) /* NT: ERROR_NOT_LOCKED, 9x: untouched */ ok( !res && ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), - "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " + "returned %ld with %ld (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); LocalFree(gbl); @@ -409,30 +410,30 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); flags = LocalFlags(gbl); ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned 0x%04x with 0x%08x (expected LMEM_INVALID_HANDLE with " + "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); SetLastError(MAGIC_DEAD); size = LocalSize(gbl); ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %ld with 0x%08x (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %Id with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", size, GetLastError()); SetLastError(MAGIC_DEAD); mem = LocalLock(gbl); ok( (mem == NULL) && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %p with 0x%08x (expected NULL with ERROR_INVALID_HANDLE)\n", + "returned %p with 0x%08lx (expected NULL with ERROR_INVALID_HANDLE)\n", mem, GetLastError()); /* This Test works the same on all Systems (GlobalUnlock() is different) */ SetLastError(MAGIC_DEAD); res = LocalUnlock(gbl); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), - "returned %d with %d (expected '0' with ERROR_INVALID_HANDLE)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_HANDLE)\n", res, GetLastError()); /* LMEM_FIXED block expands in place only without flags */ @@ -441,7 +442,7 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, 0); ok(hsecond == gbl || (hsecond == NULL && GetLastError() == ERROR_NOT_ENOUGH_MEMORY), - "got %p with %x (expected %p or NULL) @%ld\n", hsecond, GetLastError(), gbl, size); + "got %p with %lx (expected %p or NULL) @%Id\n", hsecond, GetLastError(), gbl, size); LocalFree(gbl); } @@ -451,9 +452,9 @@ static void test_heap(void) SetLastError(MAGIC_DEAD); hsecond = LocalReAlloc(gbl, size + init_size, LMEM_MOVEABLE); ok(hsecond != NULL, - "got %p with %x (expected non-NULL) @%ld\n", hsecond, GetLastError(), size); + "got %p with %lx (expected non-NULL) @%Id\n", hsecond, GetLastError(), size); mem = LocalLock(hsecond); - ok(mem == hsecond, "got %p (expected %p) @%ld\n", mem, hsecond, size); + ok(mem == hsecond, "got %p (expected %p) @%Id\n", mem, hsecond, size); LocalFree(hsecond); } @@ -461,16 +462,16 @@ static void test_heap(void) gbl = LocalAlloc(LMEM_FIXED, 100); SetLastError(0xdeadbeef); res = LocalUnlock(gbl); - ok(res == 0, "Expected 0, got %d\n", res); + ok(res == 0, "Expected 0, got %ld\n", res); ok(GetLastError() == ERROR_NOT_LOCKED || - broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %d\n", GetLastError()); + broken(GetLastError() == 0xdeadbeef) /* win9x */, "got %ld\n", GetLastError()); LocalFree(gbl); gbl = LocalAlloc( LMEM_FIXED, 0 ); SetLastError(0xdeadbeef); size = LocalSize( gbl ); ok( !size || broken(size == 1), /* vistau64 */ - "wrong size %lu\n", size ); + "wrong size %Iu\n", size ); LocalFree( gbl ); /* trying to lock empty memory should give an error */ @@ -481,7 +482,7 @@ static void test_heap(void) /* NT: ERROR_DISCARDED, 9x: untouched */ ok( (mem == NULL) && ((GetLastError() == ERROR_DISCARDED) || (GetLastError() == MAGIC_DEAD)), - "returned %p with 0x%x/%d (expected 'NULL' with: ERROR_DISCARDED or " + "returned %p with 0x%lx/%ld (expected 'NULL' with: ERROR_DISCARDED or " "MAGIC_DEAD)\n", mem, GetLastError(), GetLastError()); GlobalFree(gbl); @@ -495,8 +496,8 @@ static void test_heap(void) size = GlobalSize(gbl); size2 = GlobalSize(mem); - ok(size == 0x123, "got %lu\n", size); - ok(size2 == 0x123, "got %lu\n", size2); + ok(size == 0x123, "got %Iu\n", size); + ok(size2 == 0x123, "got %Iu\n", size2); GlobalFree(gbl); @@ -508,12 +509,12 @@ static void test_heap(void) ok(gbl == mem, "got %p, %p.\n", gbl, mem); size = GlobalSize(gbl); - ok(size == 0x123, "got %lu\n", size); + ok(size == 0x123, "got %Iu\n", size); GlobalFree(gbl); size = GlobalSize((void *)0xdeadbee0); - ok(size == 0, "got %lu\n", size); + ok(size == 0, "got %Iu\n", size); } @@ -646,7 +647,7 @@ static void test_GlobalAlloc(void) /* Check that a 'zeroing' alloc works */ mem2=GlobalAlloc(GMEM_ZEROINIT,memchunk); - ok(mem2!=NULL,"GlobalAlloc failed: error=%d\n",GetLastError()); + ok(mem2!=NULL,"GlobalAlloc failed: error=%ld\n",GetLastError()); if(mem2) { ok(GlobalSize(mem2)>=memchunk,"GlobalAlloc should return a big enough memory block\n"); mem2ptr=GlobalLock(mem2); @@ -720,18 +721,18 @@ static void test_LocalAlloc(void) /* Check that a normal alloc works */ mem1=LocalAlloc(0,memchunk); - ok(mem1!=NULL,"LocalAlloc failed: error=%d\n",GetLastError()); + ok(mem1!=NULL,"LocalAlloc failed: error=%ld\n",GetLastError()); if(mem1) { ok(LocalSize(mem1)>=memchunk, "LocalAlloc should return a big enough memory block\n"); } /* Check that a 'zeroing' and lock alloc works */ mem2=LocalAlloc(LMEM_ZEROINIT|LMEM_MOVEABLE,memchunk); - ok(mem2!=NULL,"LocalAlloc failed: error=%d\n",GetLastError()); + ok(mem2!=NULL,"LocalAlloc failed: error=%ld\n",GetLastError()); if(mem2) { ok(LocalSize(mem2)>=memchunk,"LocalAlloc should return a big enough memory block\n"); mem2ptr=LocalLock(mem2); - ok(mem2ptr!=NULL,"LocalLock: error=%d\n",GetLastError()); + ok(mem2ptr!=NULL,"LocalLock: error=%ld\n",GetLastError()); if(mem2ptr) { error=FALSE; for(i=0;i<memchunk;i++) { @@ -743,7 +744,7 @@ static void test_LocalAlloc(void) SetLastError(0); error=LocalUnlock(mem2); ok(!error && GetLastError()==NO_ERROR, - "LocalUnlock Failed: rc=%d err=%d\n",error,GetLastError()); + "LocalUnlock Failed: rc=%d err=%ld\n",error,GetLastError()); } } mem2a=LocalFree(mem2); @@ -751,11 +752,11 @@ static void test_LocalAlloc(void) /* Reallocate mem2 as moveable memory */ mem2=LocalAlloc(LMEM_MOVEABLE | LMEM_ZEROINIT,memchunk); - ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%d\n",GetLastError()); + ok(mem2!=NULL, "LocalAlloc failed to create moveable memory, error=%ld\n",GetLastError()); /* Check that ReAllocing memory works as expected */ mem2a=LocalReAlloc(mem2,2*memchunk,LMEM_MOVEABLE | LMEM_ZEROINIT); - ok(mem2a!=NULL,"LocalReAlloc failed, error=%d\n",GetLastError()); + ok(mem2a!=NULL,"LocalReAlloc failed, error=%ld\n",GetLastError()); if(mem2a) { ok(LocalSize(mem2a)>=2*memchunk,"LocalReAlloc failed\n"); mem2ptr=LocalLock(mem2a); @@ -830,7 +831,7 @@ static void test_obsolete_flags(void) ok( resultflags == test_global_flags[i].globalflags || broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ - "%u: expected 0x%08x, but returned 0x%08x with %d\n", + "%u: expected 0x%08x, but returned 0x%08x with %ld\n", i, test_global_flags[i].globalflags, resultflags, GetLastError() ); GlobalFree(gbl); @@ -869,8 +870,8 @@ static void test_HeapQueryInformation(void) NULL, 0, &size); ok(!ret, "HeapQueryInformation should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); - ok(size == sizeof(ULONG), "expected 4, got %lu\n", size); + "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); + ok(size == sizeof(ULONG), "expected 4, got %Iu\n", size); SetLastError(0xdeadbeef); ret = pHeapQueryInformation(GetProcessHeap(), @@ -878,15 +879,15 @@ static void test_HeapQueryInformation(void) NULL, 0, NULL); ok(!ret, "HeapQueryInformation should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError()); info = 0xdeadbeaf; SetLastError(0xdeadbeef); ret = pHeapQueryInformation(GetProcessHeap(), HeapCompatibilityInformation, &info, sizeof(info) + 1, NULL); - ok(ret, "HeapQueryInformation error %u\n", GetLastError()); - ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); + ok(ret, "HeapQueryInformation error %lu\n", GetLastError()); + ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %lu\n", info); } static void test_heap_checks( DWORD flags ) @@ -896,7 +897,7 @@ static void test_heap_checks( DWORD flags ) SIZE_T i, size, large_size = 3000 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ - trace( "testing heap flags %08x\n", flags ); + trace( "testing heap flags %08lx\n", flags ); p = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 17 ); ok( p != NULL, "HeapAlloc failed\n" ); @@ -905,7 +906,7 @@ static void test_heap_checks( DWORD flags ) ok( ret, "HeapValidate failed\n" ); size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == 17, "Wrong size %lu\n", size ); + ok( size == 17, "Wrong size %Iu\n", size ); ok( p[14] == 0, "wrong data %x\n", p[14] ); ok( p[15] == 0, "wrong data %x\n", p[15] ); @@ -952,7 +953,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_VALIDATE) { size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0 || broken(size == ~0u), "Wrong size %lu\n", size ); + ok( size == ~(SIZE_T)0 || broken(size == ~0u), "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, 14 ); ok( p2 == NULL, "HeapReAlloc succeeded\n" ); @@ -964,7 +965,7 @@ static void test_heap_checks( DWORD flags ) p[17] = old; size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == 17, "Wrong size %lu\n", size ); + ok( size == 17, "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, 14 ); ok( p2 != NULL, "HeapReAlloc failed\n" ); @@ -1010,7 +1011,7 @@ static void test_heap_checks( DWORD flags ) ok( ret, "HeapValidate failed\n" ); size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == large_size, "Wrong size %lu\n", size ); + ok( size == large_size, "Wrong size %Iu\n", size ); ok( p[large_size - 2] == 0, "wrong data %x\n", p[large_size - 2] ); ok( p[large_size - 1] == 0, "wrong data %x\n", p[large_size - 1] ); @@ -1031,7 +1032,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_VALIDATE) { size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0, "Wrong size %lu\n", size ); + ok( size == ~(SIZE_T)0, "Wrong size %Iu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, large_size - 3 ); ok( p2 == NULL, "HeapReAlloc succeeded\n" ); @@ -1053,7 +1054,7 @@ static void test_heap_checks( DWORD flags ) { p = HeapAlloc( GetProcessHeap(), 0, size ); for (i = 0; i < 32; i++) if (p[size + i] != 0xab) break; - ok( i >= 8, "only %lu tail bytes for size %lu\n", i, size ); + ok( i >= 8, "only %Iu tail bytes for size %Iu\n", i, size ); HeapFree( GetProcessHeap(), 0, p ); } } @@ -1083,7 +1084,7 @@ static void test_debug_heap( const char *argv0, DWORD flags ) skip("Not authorized to change the image file execution options\n"); return; } - ok( !err, "failed to create '%s' error %u\n", keyname, err ); + ok( !err, "failed to create '%s' error %lu\n", keyname, err ); if (err) return; if (flags == 0xdeadbeef) /* magic value for unsetting it */ @@ -1094,9 +1095,9 @@ static void test_debug_heap( const char *argv0, DWORD flags ) memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); - sprintf( buffer, "%s heap.c 0x%x", argv0, flags ); + sprintf( buffer, "%s heap.c 0x%lx", argv0, flags ); ret = CreateProcessA( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); - ok( ret, "failed to create child process error %u\n", GetLastError() ); + ok( ret, "failed to create child process error %lu\n", GetLastError() ); if (ret) { wait_child_process( info.hProcess ); @@ -1157,13 +1158,13 @@ static void test_child_heap( const char *arg ) } ok( pRtlGetNtGlobalFlags() == expected, - "%s: got global flags %08x expected %08x\n", arg, pRtlGetNtGlobalFlags(), expected ); + "%s: got global flags %08lx expected %08lx\n", arg, pRtlGetNtGlobalFlags(), expected ); expect_heap = heap_flags_from_global_flag( expected ); if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee) /* vista layout */ { - ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08x\n", arg, heap->flags ); + ok( (heap->flags & ~HEAP_GROWABLE) == 0, "%s: got heap flags %08lx\n", arg, heap->flags ); } else if (heap->pattern == 0xeeeeeeee && heap->flags == 0xeeeeeeee) { @@ -1172,9 +1173,9 @@ static void test_child_heap( const char *arg ) else { ok( heap->flags == (expect_heap | HEAP_GROWABLE), - "%s: got heap flags %08x expected %08x\n", arg, heap->flags, expect_heap ); + "%s: got heap flags %08lx expected %08lx\n", arg, heap->flags, expect_heap ); ok( heap->force_flags == (expect_heap & ~0x18000080), - "%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expect_heap ); + "%s: got heap force flags %08lx expected %08lx\n", arg, heap->force_flags, expect_heap ); expect_heap = heap->flags; } @@ -1199,11 +1200,11 @@ static void test_GetPhysicallyInstalledSystemMemory(void) ret = pGetPhysicallyInstalledSystemMemory(NULL); ok(!ret, "GetPhysicallyInstalledSystemMemory should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); total_memory = 0; ret = pGetPhysicallyInstalledSystemMemory(&total_memory); - ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%u)\n", GetLastError()); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%lu)\n", GetLastError()); ok(total_memory != 0, "expected total_memory != 0\n"); memstatus.dwLength = sizeof(memstatus);

8 35

[PATCH 10/10] win32u: Move GetClientRect implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 8 ++++++++ include/ntuser.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)

2 1

[PATCH 09/10] win32u: Move GetWindowInfo implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 21 ++------------------- dlls/win32u/input.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 32 insertions(+), 19 deletions(-)

2 1

[PATCH 07/10] win32u: Move GetDpiForWindow from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/sysparams.c | 9 +++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 5 files changed, 48 insertions(+), 29 deletions(-)

2 1

[PATCH 06/10] win32u: Move GetWindowDpiAwarenessContext from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 25 +------------------------ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 33 ++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 3 ++- 5 files changed, 37 insertions(+), 28 deletions(-)

2 1

[PATCH 05/10] win32u: Move IsWindowUnicode implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 23 +---------------------- dlls/win32u/window.c | 29 +++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-)

2 1

[PATCH 03/10] win32u: Move load_driver implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

2 1

[PATCH 02/10] win32u: Introduce get_desktop_window.
by Jacek Caban 09 Mar '22

09 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 8 ++++---- dlls/win32u/driver.c | 3 +-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 14 ++++++-------- dlls/win32u/winstation.c | 9 +++++++++ 5 files changed, 21 insertions(+), 14 deletions(-)

2 1

[PATCH 01/10] win32u: Move NtUserFlashWindowEx implementation from user32.
by Jacek Caban 09 Mar '22

09 Mar '22

2 1

[PATCH] dlls/winspool.drv/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/winspool.drv/tests/Makefile.in | 1 dlls/winspool.drv/tests/info.c | 508 ++++++++++++++++++----------------- 2 files changed, 254 insertions(+), 255 deletions(-) diff --git a/dlls/winspool.drv/tests/Makefile.in b/dlls/winspool.drv/tests/Makefile.in index df9a6320e11..3a8c6fece1c 100644 --- a/dlls/winspool.drv/tests/Makefile.in +++ b/dlls/winspool.drv/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winspool.drv IMPORTS = winspool advapi32 diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a9fbe727453..eaf3a92c623 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -235,9 +235,9 @@ static void find_local_server(VOID) SetLastError(0xdeadbeef); res = GetComputerNameA(&buffer[2], &size); - trace("returned %d with %d and %d: '%s'\n", res, GetLastError(), size, buffer); + trace("returned %ld with %ld and %ld: '%s'\n", res, GetLastError(), size, buffer); - ok( res != 0, "returned %d with %d and %d: '%s' (expected '!= 0')\n", + ok( res != 0, "returned %ld with %ld and %ld: '%s' (expected '!= 0')\n", res, GetLastError(), size, buffer); if (res) local_server = buffer; @@ -258,24 +258,24 @@ static void find_tempfile(VOID) buffer_dirA[MAX_PATH - 1] = '\0'; SetLastError(0xdeadbeef); res = GetTempPathA(MAX_PATH, buffer_dirA); - ok(res, "returned %u with %u and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_dirA); + ok(res, "returned %lu with %lu and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_dirA); if (res == 0) return; memset(buffer_fileA, 0, MAX_PATH - 1); buffer_fileA[MAX_PATH - 1] = '\0'; SetLastError(0xdeadbeef); res = GetTempFileNameA(buffer_dirA, winetest, 0, buffer_fileA); - ok(res, "returned %u with %u and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_fileA); + ok(res, "returned %lu with %lu and '%s' (expected '!= 0')\n", res, GetLastError(), buffer_fileA); if (res == 0) return; SetLastError(0xdeadbeef); resint = MultiByteToWideChar(CP_ACP, 0, buffer_dirA, -1, buffer_dirW, MAX_PATH); - ok(res, "returned %u with %u (expected '!= 0')\n", resint, GetLastError()); + ok(res, "returned %u with %lu (expected '!= 0')\n", resint, GetLastError()); if (resint == 0) return; SetLastError(0xdeadbeef); resint = MultiByteToWideChar(CP_ACP, 0, buffer_fileA, -1, buffer_fileW, MAX_PATH); - ok(res, "returned %u with %u (expected '!= 0')\n", resint, GetLastError()); + ok(res, "returned %u with %lu (expected '!= 0')\n", resint, GetLastError()); if (resint == 0) return; tempdirA = buffer_dirA; @@ -298,13 +298,13 @@ static void test_AddMonitor(void) SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 1, NULL); ok(!res && (GetLastError() == ERROR_INVALID_LEVEL), - "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 3, NULL); ok(!res && (GetLastError() == ERROR_INVALID_LEVEL), - "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); /* This test crashes win9x on vmware (works with win9x on qemu 0.8.1) */ @@ -314,7 +314,7 @@ static void test_AddMonitor(void) ok(!res && ((GetLastError() == MAGIC_DEAD) || (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), - "returned %d with %d (expected '0' with: MAGIC_DEAD or " + "returned %ld with %ld (expected '0' with: MAGIC_DEAD or " "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); ZeroMemory(&mi2a, sizeof(MONITOR_INFO_2A)); @@ -326,7 +326,7 @@ static void test_AddMonitor(void) /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_INVALID_ENVIRONMENT */ ok(!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || (GetLastError() == ERROR_INVALID_ENVIRONMENT)), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or " + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " "ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); if (!entry) { @@ -344,7 +344,7 @@ static void test_AddMonitor(void) mi2a.pEnvironment = entry->env; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); - ok(res, "AddMonitor error %d\n", GetLastError()); + ok(res, "AddMonitor error %ld\n", GetLastError()); /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_PRIVILEGE_NOT_HELD */ } @@ -356,7 +356,7 @@ static void test_AddMonitor(void) ok( !res && ((GetLastError() == ERROR_INVALID_PARAMETER) || (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or " + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); @@ -367,7 +367,7 @@ static void test_AddMonitor(void) ok( !res && ((GetLastError() == ERROR_INVALID_PARAMETER) || (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or " + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); @@ -375,7 +375,7 @@ static void test_AddMonitor(void) SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); mi2a.pDLLName = does_not_exist_dll; @@ -385,7 +385,7 @@ static void test_AddMonitor(void) ok( !res && ((GetLastError() == ERROR_MOD_NOT_FOUND) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with: ERROR_MOD_NOT_FOUND or " + "returned %ld with %ld (expected '0' with: ERROR_MOD_NOT_FOUND or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); mi2a.pDLLName = version_dll; @@ -395,7 +395,7 @@ static void test_AddMonitor(void) ok( !res && ((GetLastError() == ERROR_PROC_NOT_FOUND) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with: ERROR_PROC_NOT_FOUND or " + "returned %ld with %ld (expected '0' with: ERROR_PROC_NOT_FOUND or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeleteMonitorA(NULL, entry->env, winetest); @@ -405,7 +405,7 @@ static void test_AddMonitor(void) res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); /* Some apps depend on the result of GetLastError() also on success of AddMonitor */ ok(res && (GetLastError() == ERROR_SUCCESS), - "returned %d with %d (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError()); + "returned %ld with %ld (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError()); /* add a monitor twice */ SetLastError(MAGIC_DEAD); @@ -414,14 +414,14 @@ static void test_AddMonitor(void) ok( !res && ((GetLastError() == ERROR_PRINT_MONITOR_ALREADY_INSTALLED) || (GetLastError() == ERROR_ALREADY_EXISTS)), - "returned %d with %d (expected '0' with: " + "returned %ld with %ld (expected '0' with: " "ERROR_PRINT_MONITOR_ALREADY_INSTALLED or ERROR_ALREADY_EXISTS)\n", res, GetLastError()); DeleteMonitorA(NULL, entry->env, winetest); SetLastError(MAGIC_DEAD); res = AddMonitorA(empty, 2, (LPBYTE) &mi2a); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); /* cleanup */ DeleteMonitorA(NULL, entry->env, winetest); @@ -440,7 +440,7 @@ static void test_AddPort(void) /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -452,7 +452,7 @@ static void test_AddPort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -461,7 +461,7 @@ static void test_AddPort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -493,13 +493,13 @@ static void test_AddPortEx(void) skip("ACCESS_DENIED (ERROR_INVALID_PARAMETER)\n"); return; } - ok( res, "got %u with %u (expected '!= 0')\n", res, GetLastError()); + ok( res, "got %lu with %lu (expected '!= 0')\n", res, GetLastError()); /* add a port that already exists */ SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, (LPBYTE) &pi, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); DeletePortA(NULL, 0, tempfileA); @@ -508,21 +508,21 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, (LPBYTE) &pi, NULL); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeletePortA(NULL, 0, tempfileA); SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, (LPBYTE) &pi, empty); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeletePortA(NULL, 0, tempfileA); SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, (LPBYTE) &pi, does_not_exist); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeletePortA(NULL, 0, tempfileA); @@ -531,14 +531,14 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, NULL, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); pi.pPortName = NULL; SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 1, (LPBYTE) &pi, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if (res) DeletePortA(NULL, 0, tempfileA); @@ -555,7 +555,7 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 2, (LPBYTE) &pi, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); if (res) DeletePortA(NULL, 0, tempfileA); @@ -564,13 +564,13 @@ static void test_AddPortEx(void) SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 0, (LPBYTE) &pi, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pAddPortExA(NULL, 3, (LPBYTE) &pi, LocalPortA); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); @@ -592,7 +592,7 @@ static void test_ConfigurePort(void) /* NT: RPC_X_NULL_REF_POINTER, 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(0xdeadbeef); @@ -603,7 +603,7 @@ static void test_ConfigurePort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -612,7 +612,7 @@ static void test_ConfigurePort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -629,15 +629,15 @@ static void test_ConfigurePort(void) if (winetest_interactive > 0) { SetLastError(0xdeadbeef); res = ConfigurePortA(NULL, 0, portname_com1); - trace("'%s' returned %d with %d\n", portname_com1, res, GetLastError()); + trace("'%s' returned %ld with %ld\n", portname_com1, res, GetLastError()); SetLastError(0xdeadbeef); res = ConfigurePortA(NULL, 0, portname_lpt1); - trace("'%s' returned %d with %d\n", portname_lpt1, res, GetLastError()); + trace("'%s' returned %ld with %ld\n", portname_lpt1, res, GetLastError()); SetLastError(0xdeadbeef); res = ConfigurePortA(NULL, 0, portname_file); - trace("'%s' returned %d with %d\n", portname_file, res, GetLastError()); + trace("'%s' returned %ld with %ld\n", portname_file, res, GetLastError()); } } @@ -652,7 +652,7 @@ static void test_ClosePrinter(void) SetLastError(0xdeadbeef); res = ClosePrinter(NULL); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), - "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + "got %d with %ld (expected FALSE with ERROR_INVALID_HANDLE)\n", res, GetLastError()); /* A random value as HANDLE is handled */ @@ -660,7 +660,7 @@ static void test_ClosePrinter(void) res = ClosePrinter( (void *) -1); if (is_spooler_deactivated(res, GetLastError())) return; ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), - "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + "got %d with %ld (expected FALSE with ERROR_INVALID_HANDLE)\n", res, GetLastError()); @@ -672,14 +672,14 @@ static void test_ClosePrinter(void) { SetLastError(0xdeadbeef); res = ClosePrinter(printer); - ok(res, "got %d with %d (expected TRUE)\n", res, GetLastError()); + ok(res, "got %d with %ld (expected TRUE)\n", res, GetLastError()); /* double free is handled */ SetLastError(0xdeadbeef); res = ClosePrinter(printer); ok(!res && (GetLastError() == ERROR_INVALID_HANDLE), - "got %d with %d (expected FALSE with ERROR_INVALID_HANDLE)\n", + "got %d with %ld (expected FALSE with ERROR_INVALID_HANDLE)\n", res, GetLastError()); } @@ -710,7 +710,7 @@ static void test_DeleteMonitor(void) SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, entry->env, winetest); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!= 0')\n", res, GetLastError()); /* Delete the Monitor twice */ SetLastError(MAGIC_DEAD); @@ -719,25 +719,25 @@ static void test_DeleteMonitor(void) ok( !res && ((GetLastError() == ERROR_UNKNOWN_PRINT_MONITOR) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with: ERROR_UNKNOWN_PRINT_MONITOR" + "returned %ld with %ld (expected '0' with: ERROR_UNKNOWN_PRINT_MONITOR" " or ERROR_INVALID_PARAMETER)\n", res, GetLastError()); /* the environment */ AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, NULL, winetest); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, empty, winetest); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(NULL, invalid_env, winetest); ok( res || GetLastError() == ERROR_INVALID_ENVIRONMENT /* Vista/W2K8 */, - "returned %d with %d\n", res, GetLastError()); + "returned %ld with %ld\n", res, GetLastError()); /* the monitor-name */ AddMonitorA(NULL, 2, (LPBYTE) &mi2a); @@ -747,7 +747,7 @@ static void test_DeleteMonitor(void) ok( !res && ((GetLastError() == ERROR_INVALID_PARAMETER) || (GetLastError() == ERROR_INVALID_NAME)), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or " + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " "ERROR_INVALID_NAME)\n", res, GetLastError()); AddMonitorA(NULL, 2, (LPBYTE) &mi2a); @@ -757,13 +757,13 @@ static void test_DeleteMonitor(void) ok( !res && ((GetLastError() == ERROR_INVALID_PARAMETER) || (GetLastError() == ERROR_INVALID_NAME)), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or " + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or " "ERROR_INVALID_NAME)\n", res, GetLastError()); AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); res = DeleteMonitorA(empty, entry->env, winetest); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); /* cleanup */ DeleteMonitorA(NULL, entry->env, winetest); @@ -787,7 +787,7 @@ static void test_DeletePort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -796,7 +796,7 @@ static void test_DeletePort(void) /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with ERROR_NOT_SUPPORTED or " + "returned %ld with %ld (expected '0' with ERROR_NOT_SUPPORTED or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); } @@ -848,14 +848,14 @@ static void test_EnumForms(LPSTR pName) if(!level || (level > 2)) { ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || (res && (pcReturned == 0)), - "(%d) returned %d with %d and 0x%08x (expected '0' with " + "(%ld) returned %ld with %ld and 0x%08lx (expected '0' with " "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", level, res, GetLastError(), pcReturned); continue; } ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf *2); @@ -863,7 +863,7 @@ static void test_EnumForms(LPSTR pName) SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "(%d) returned %d with %d (expected '!=0')\n", + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); pFI_1a = (PFORM_INFO_1A)buffer; @@ -885,21 +885,21 @@ static void test_EnumForms(LPSTR pName) /* output additional FORM_INFO_2 fields */ if (winetest_debug > 1) - trace("\tkeyword=%s strtype=%u muidll=%s resid=%u dispname=%s langid=%u\n", + trace("\tkeyword=%s strtype=%lu muidll=%s resid=%lu dispname=%s langid=%u\n", pFI_2a->pKeyword, pFI_2a->StringType, pFI_2a->pMuiDll, pFI_2a->dwResourceId, pFI_2a->pDisplayName, pFI_2a->wLangId); if (pName && i == 0) /* GetForm() appears only to work on a printer handle */ { res = GetFormA( hprinter, pFI_1a->pName, level, NULL, 0, &get_needed ); - ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d gle %d\n", res, GetLastError() ); + ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %ld gle %ld\n", res, GetLastError() ); if (get_needed <= sizeof(get_buffer)) { res = GetFormA( hprinter, pFI_1a->pName, level, get_buffer, get_needed, &get_needed ); - ok( res, "got %d\n", res ); + ok( res, "got %ld\n", res ); ok( !strcmp( pFI_2a->pName, get_form->pName ), "name mismatch\n" ); res = GetFormA( hprinter, pFI_1a->pName, level, get_buffer, get_needed - 1, &get_needed ); - ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d gle %d\n", res, GetLastError() ); + ok( !res && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %ld gle %ld\n", res, GetLastError() ); } } /* offset pointer pFI_1a by 1*sizeof(FORM_INFO_2A) Bytes */ @@ -910,39 +910,39 @@ static void test_EnumForms(LPSTR pName) SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); - ok( res, "(%d) returned %d with %d (expected '!=0')\n", + ok( res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, NULL, cbBuf, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INVALID_USER_BUFFER)\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf, NULL, &pcReturned); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, NULL); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(0, level, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INVALID_HANDLE) , - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INVALID_HANDLE)\n", level, res, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); @@ -977,7 +977,7 @@ static void test_EnumMonitors(void) if(!level || (level > 2)) { ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || (res && (pcReturned == 0)), - "(%d) returned %d with %d and 0x%08x (expected '0' with " + "(%ld) returned %ld with %ld and 0x%08lx (expected '0' with " "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", level, res, GetLastError(), pcReturned); continue; @@ -985,12 +985,12 @@ static void test_EnumMonitors(void) /* Level 2 is not supported on win9x */ if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { - skip("Level %d not supported\n", level); + skip("Level %ld not supported\n", level); continue; } ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); if (!cbBuf) { @@ -1004,9 +1004,9 @@ static void test_EnumMonitors(void) SetLastError(MAGIC_DEAD); pcbNeeded = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "(%d) returned %d with %d (expected '!=0')\n", + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); /* We can validate the returned Data with the Registry here */ @@ -1015,19 +1015,19 @@ static void test_EnumMonitors(void) pcReturned = MAGIC_DEAD; pcbNeeded = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); - ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); SetLastError(MAGIC_DEAD); pcbNeeded = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); /* @@ -1044,7 +1044,7 @@ static void test_EnumMonitors(void) pcReturned = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, - "(%d) returned %d with %d (expected '!=0' or '0' with " + "(%ld) returned %ld with %ld (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); pcbNeeded = MAGIC_DEAD; @@ -1052,7 +1052,7 @@ static void test_EnumMonitors(void) SetLastError(MAGIC_DEAD); res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, - "(%d) returned %d with %d (expected '!=0' or '0' with " + "(%ld) returned %ld with %ld (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); @@ -1084,7 +1084,7 @@ static void test_EnumPorts(void) /* NT: ERROR_INVALID_LEVEL, 9x: success */ ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || (res && (pcReturned == 0)), - "(%d) returned %d with %d and 0x%08x (expected '0' with " + "(%ld) returned %ld with %ld and 0x%08lx (expected '0' with " "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", level, res, GetLastError(), pcReturned); continue; @@ -1093,12 +1093,12 @@ static void test_EnumPorts(void) /* Level 2 is not supported on NT 3.x */ if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { - skip("Level %d not supported\n", level); + skip("Level %ld not supported\n", level); continue; } ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf *2); @@ -1107,24 +1107,24 @@ static void test_EnumPorts(void) pcbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPortsA(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); /* ToDo: Compare the returned Data with the Registry / "win.ini",[Ports] here */ pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPortsA(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); - ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + ok(res, "(%ld) returned %ld with %ld (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); pcbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPortsA(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); /* Do not add this test: @@ -1139,7 +1139,7 @@ static void test_EnumPorts(void) /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || ( res && (GetLastError() == ERROR_SUCCESS) ), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", level, res, GetLastError()); @@ -1149,7 +1149,7 @@ static void test_EnumPorts(void) /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || ( res && (GetLastError() == ERROR_SUCCESS) ), - "(%d) returned %d with %d (expected '0' with " + "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", level, res, GetLastError()); @@ -1183,7 +1183,7 @@ static void test_EnumPrinterDrivers(void) ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || (res && (pcReturned == 0)), - "(%d) got %u with %u and 0x%x " + "(%ld) got %lu with %lu and 0x%lx " "(expected '0' with ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", level, res, GetLastError(), pcReturned); continue; @@ -1191,13 +1191,13 @@ static void test_EnumPrinterDrivers(void) /* some levels are not supported on all windows versions */ if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { - skip("Level %d not supported\n", level); + skip("Level %ld not supported\n", level); continue; } ok( ((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) || (res && (default_printer == NULL)), - "(%u) got %u with %u for %s (expected '0' with " + "(%lu) got %lu with %lu for %s (expected '0' with " "ERROR_INSUFFICIENT_BUFFER or '!= 0' without a printer)\n", level, res, GetLastError(), default_printer); @@ -1212,7 +1212,7 @@ static void test_EnumPrinterDrivers(void) DWORD double_needed; DWORD double_returned; pEnumPrinterDriversW(NULL, NULL, level, NULL, 0, &double_needed, &double_returned); - ok(double_needed == cbBuf, "level %d: EnumPrinterDriversA returned different size %d than EnumPrinterDriversW (%d)\n", level, cbBuf, double_needed); + ok(double_needed == cbBuf, "level %ld: EnumPrinterDriversA returned different size %ld than EnumPrinterDriversW (%ld)\n", level, cbBuf, double_needed); } buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); @@ -1221,15 +1221,15 @@ static void test_EnumPrinterDrivers(void) SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "(%u) got %u with %u (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + ok(res, "(%lu) got %lu with %lu (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%ld) returned %ld (expected %ld)\n", level, pcbNeeded, cbBuf); /* validate the returned data here */ if (level > 1) { LPDRIVER_INFO_2A di = (LPDRIVER_INFO_2A) buffer; ok( strrchr(di->pDriverPath, '\\') != NULL, - "(%u) got %s for %s (expected a full path)\n", + "(%lu) got %s for %s (expected a full path)\n", level, di->pDriverPath, di->pName); } @@ -1238,16 +1238,16 @@ static void test_EnumPrinterDrivers(void) pcReturned = 0xdeadbeef; pcbNeeded = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); - ok(res, "(%u) got %u with %u (expected '!=0')\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%u) returned %u (expected %u)\n", level, pcbNeeded, cbBuf); + ok(res, "(%lu) got %lu with %lu (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%lu) returned %lu (expected %lu)\n", level, pcbNeeded, cbBuf); SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "(%u) got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "(%lu) got %lu with %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); - ok(pcbNeeded == cbBuf, "(%u) returned %u (expected %u)\n", level, pcbNeeded, cbBuf); + ok(pcbNeeded == cbBuf, "(%lu) returned %lu (expected %lu)\n", level, pcbNeeded, cbBuf); /* Do not add the next test: @@ -1262,7 +1262,7 @@ static void test_EnumPrinterDrivers(void) pcReturned = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, NULL, &pcReturned); ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, - "(%u) got %u with %u (expected '!=0' or '0' with " + "(%lu) got %lu with %lu (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); pcbNeeded = 0xdeadbeef; @@ -1270,7 +1270,7 @@ static void test_EnumPrinterDrivers(void) SetLastError(0xdeadbeef); res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, NULL); ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, - "(%u) got %u with %u (expected '!=0' or '0' with " + "(%lu) got %lu with %lu (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); @@ -1290,11 +1290,11 @@ static void test_EnumPrinterDrivers(void) win_skip("NT4 and below don't support the 'all' environment value\n"); return; } - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "unexpected error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "unexpected error %lu\n", GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, pcbNeeded); res = EnumPrinterDriversA(NULL, env_all, 1, buffer, pcbNeeded, &pcbNeeded, &pcReturned); - ok(res, "EnumPrinterDriversA failed %u\n", GetLastError()); + ok(res, "EnumPrinterDriversA failed %lu\n", GetLastError()); if (res && pcReturned > 0) { DRIVER_INFO_1A *di_1 = (DRIVER_INFO_1A *)buffer; @@ -1330,7 +1330,7 @@ static void test_EnumPrintProcessors(void) } ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "got %lu with %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); @@ -1340,7 +1340,7 @@ static void test_EnumPrintProcessors(void) SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + ok(res, "got %lu with %lu (expected '!=0')\n", res, GetLastError()); /* validate the returned data here. */ @@ -1348,13 +1348,13 @@ static void test_EnumPrintProcessors(void) pcReturned = 0xdeadbeef; pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf+1, &pcbNeeded, &pcReturned); - ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + ok(res, "got %lu with %lu (expected '!=0')\n", res, GetLastError()); SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "got %lu with %lu (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); /* only level 1 is valid */ @@ -1365,14 +1365,14 @@ static void test_EnumPrintProcessors(void) pcReturned = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 0, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded, &pcReturned); ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); } @@ -1380,7 +1380,7 @@ static void test_EnumPrintProcessors(void) SetLastError(0xdeadbeef); pcbNeeded = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, empty, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); - ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + ok(res, "got %lu with %lu (expected '!=0')\n", res, GetLastError()); /* the environment is checked */ SetLastError(0xdeadbeef); @@ -1390,7 +1390,7 @@ static void test_EnumPrintProcessors(void) ok( broken(res) || /* NT4 */ (GetLastError() == ERROR_INVALID_ENVIRONMENT) || (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_ENVIRONMENT or " + "got %lu with %lu (expected '0' with ERROR_INVALID_ENVIRONMENT or " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -1401,7 +1401,7 @@ static void test_EnumPrintProcessors(void) res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, cbBuf, &pcbNeeded, &pcReturned); todo_wine { ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , - "got %u with %u (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + "got %lu with %lu (expected '0' with ERROR_INVALID_USER_BUFFER)\n", res, GetLastError()); } @@ -1411,7 +1411,7 @@ static void test_EnumPrintProcessors(void) res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, NULL, &pcReturned); /* the NULL is ignored on win9x */ ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), - "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + "got %lu with %lu (expected '0' with RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); pcbNeeded = 0xdeadbeef; @@ -1420,7 +1420,7 @@ static void test_EnumPrintProcessors(void) res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, NULL); /* the NULL is ignored on win9x */ ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), - "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + "got %lu with %lu (expected '0' with RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); @@ -1449,8 +1449,8 @@ static void test_GetDefaultPrinter(void) else { ok( 0, "function call GetDefaultPrinterA failed unexpected!\n" "function returned %s\n" - "last error 0x%08x\n" - "returned buffer size 0x%08x\n" + "last error 0x%08lx\n" + "returned buffer size 0x%08lx\n" "returned buffer content %s\n", retval ? "true" : "false", GetLastError(), exact, buffer); } @@ -1460,14 +1460,14 @@ static void test_GetDefaultPrinter(void) retval = pGetDefaultPrinterA(NULL, NULL); ok( !retval, "function result wrong! False expected\n"); ok( ERROR_INVALID_PARAMETER == GetLastError(), - "Last error wrong! ERROR_INVALID_PARAMETER expected, got 0x%08x\n", + "Last error wrong! ERROR_INVALID_PARAMETER expected, got 0x%08lx\n", GetLastError()); SetLastError(ERROR_SUCCESS); retval = pGetDefaultPrinterA(buffer, NULL); ok( !retval, "function result wrong! False expected\n"); ok( ERROR_INVALID_PARAMETER == GetLastError(), - "Last error wrong! ERROR_INVALID_PARAMETER expected, got 0x%08x\n", + "Last error wrong! ERROR_INVALID_PARAMETER expected, got 0x%08lx\n", GetLastError()); SetLastError(ERROR_SUCCESS); @@ -1475,9 +1475,9 @@ static void test_GetDefaultPrinter(void) retval = pGetDefaultPrinterA(NULL, &size); ok( !retval, "function result wrong! False expected\n"); ok( ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08x\n", + "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08lx\n", GetLastError()); - ok( size == exact, "Parameter size wrong! %d expected got %d\n", + ok( size == exact, "Parameter size wrong! %ld expected got %ld\n", exact, size); SetLastError(ERROR_SUCCESS); @@ -1485,24 +1485,24 @@ static void test_GetDefaultPrinter(void) retval = pGetDefaultPrinterA(NULL, &size); ok( !retval, "function result wrong! False expected\n"); ok( ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08x\n", + "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08lx\n", GetLastError()); - ok( size == exact, "Parameter size wrong! %d expected got %d\n", + ok( size == exact, "Parameter size wrong! %ld expected got %ld\n", exact, size); size = 0; retval = pGetDefaultPrinterA(buffer, &size); ok( !retval, "function result wrong! False expected\n"); ok( ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08x\n", + "Last error wrong! ERROR_INSUFFICIENT_BUFFER expected, got 0x%08lx\n", GetLastError()); - ok( size == exact, "Parameter size wrong! %d expected got %d\n", + ok( size == exact, "Parameter size wrong! %ld expected got %ld\n", exact, size); size = exact; retval = pGetDefaultPrinterA(buffer, &size); ok( retval, "function result wrong! True expected\n"); - ok( size == exact, "Parameter size wrong! %d expected got %d\n", + ok( size == exact, "Parameter size wrong! %ld expected got %ld\n", exact, size); } @@ -1517,11 +1517,11 @@ static void test_GetPrinterDriverDirectory(void) res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, 0, &cbBuf); if (is_spooler_deactivated(res, GetLastError())) return; - trace("first call returned 0x%04x, with %d: buffer size 0x%08x\n", + trace("first call returned 0x%04x, with %ld: buffer size 0x%08lx\n", res, GetLastError(), cbBuf); ok((res == 0) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with lasterror=%d (expected '0' with " + "returned %d with lasterror=%ld (expected '0' with " "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); if (!cbBuf) { @@ -1534,22 +1534,22 @@ static void test_GetPrinterDriverDirectory(void) res = GetPrinterDriverDirectoryA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded); ok( res, "expected result != 0, got %d\n", res); - ok( cbBuf == pcbNeeded, "pcbNeeded set to %d instead of %d\n", + ok( cbBuf == pcbNeeded, "pcbNeeded set to %ld instead of %ld\n", pcbNeeded, cbBuf); res = GetPrinterDriverDirectoryA(NULL, NULL, 1, buffer, cbBuf*2, &pcbNeeded); ok( res, "expected result != 0, got %d\n", res); - ok( cbBuf == pcbNeeded, "pcbNeeded set to %d instead of %d\n", + ok( cbBuf == pcbNeeded, "pcbNeeded set to %ld instead of %ld\n", pcbNeeded, cbBuf); SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); ok( !res , "expected result == 0, got %d\n", res); - ok( cbBuf == pcbNeeded, "pcbNeeded set to %d instead of %d\n", + ok( cbBuf == pcbNeeded, "pcbNeeded set to %ld instead of %ld\n", pcbNeeded, cbBuf); ok( ERROR_INSUFFICIENT_BUFFER == GetLastError(), - "last error set to %d instead of ERROR_INSUFFICIENT_BUFFER\n", + "last error set to %ld instead of ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); /* @@ -1569,7 +1569,7 @@ static void test_GetPrinterDriverDirectory(void) NT: RPC_X_NULL_REF_POINTER */ ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " + "returned %d with %ld (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " "or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(MAGIC_DEAD); @@ -1578,7 +1578,7 @@ static void test_GetPrinterDriverDirectory(void) NT: RPC_X_NULL_REF_POINTER */ ok( res || (GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " + "returned %d with %ld (expected '!=0' or '0' with RPC_X_NULL_REF_POINTER " "or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); /* with a valid buffer, but level is too large */ @@ -1594,7 +1594,7 @@ static void test_GetPrinterDriverDirectory(void) else { ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), - "returned %d with lasterror=%d (expected '0' with " + "returned %d with lasterror=%ld (expected '0' with " "ERROR_INVALID_LEVEL)\n", res, GetLastError()); } @@ -1616,7 +1616,7 @@ static void test_GetPrinterDriverDirectory(void) } ok(res && buffer[0], "returned %d with " - "lasterror=%d and len=%d (expected '1' with 'len > 0')\n", + "lasterror=%ld and len=%d (expected '1' with 'len > 0')\n", res, GetLastError(), lstrlenA((char *)buffer)); buffer[0] = '\0'; @@ -1638,22 +1638,22 @@ static void test_GetPrinterDriverDirectory(void) /* "Windows NT x86" is invalid for win9x */ ok( (res && buffer[0]) || (!res && (GetLastError() == ERROR_INVALID_ENVIRONMENT)), - "returned %d with lasterror=%d and len=%d (expected '!= 0' with " + "returned %d with lasterror=%ld and len=%d (expected '!= 0' with " "'len > 0' or '0' with ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError(), lstrlenA((char *)buffer)); /* A setup program (PDFCreator_0.8.0) use empty strings */ SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA(empty, empty, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError() ); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA(NULL, empty, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError() ); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA(empty, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError() ); + ok(res, "returned %d with %ld (expected '!=0')\n", res, GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer); } @@ -1673,7 +1673,7 @@ static void test_GetPrintProcessorDirectory(void) if (is_spooler_deactivated(res, GetLastError())) return; ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with %d (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "returned %d with %ld (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf*2); @@ -1682,19 +1682,19 @@ static void test_GetPrintProcessorDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); SetLastError(0xdeadbeef); buffer[0] = '\0'; res = GetPrintProcessorDirectoryA(NULL, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* Buffer too small */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "returned %d with %d (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + "returned %d with %ld (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); if (0) @@ -1707,7 +1707,7 @@ static void test_GetPrintProcessorDirectory(void) /* NT: ERROR_INVALID_USER_BUFFER, 9x: res != 0 */ ok( (!res && (GetLastError() == ERROR_INVALID_USER_BUFFER)) || broken(res), - "returned %d with %d (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + "returned %d with %ld (expected '0' with ERROR_INVALID_USER_BUFFER)\n", res, GetLastError()); } @@ -1718,7 +1718,7 @@ static void test_GetPrintProcessorDirectory(void) NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER " + "returned %d with %ld (expected '0' with RPC_X_NULL_REF_POINTER " "or with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); buffer[0] = '\0'; @@ -1728,7 +1728,7 @@ static void test_GetPrintProcessorDirectory(void) NT: RPC_X_NULL_REF_POINTER, 9x: res != 0 */ ok( !res && ((GetLastError() == RPC_X_NULL_REF_POINTER) || (GetLastError() == ERROR_INVALID_PARAMETER)), - "returned %d with %d (expected '0' with RPC_X_NULL_REF_POINTER " + "returned %d with %ld (expected '0' with RPC_X_NULL_REF_POINTER " "or with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); /* with a valid buffer, but level is invalid */ @@ -1738,7 +1738,7 @@ static void test_GetPrintProcessorDirectory(void) /* Level is ignored in win9x*/ ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || broken(res && buffer[0]), - "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + "returned %d with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); buffer[0] = '\0'; @@ -1747,20 +1747,20 @@ static void test_GetPrintProcessorDirectory(void) /* Level is ignored on win9x*/ ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || broken(res && buffer[0]), - "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", + "returned %d with %ld (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); /* Empty environment is the same as the default environment */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, empty, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* "Windows 4.0" is valid for win9x and NT */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, env_win9x_case, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* "Windows NT x86" is invalid for win9x */ @@ -1768,7 +1768,7 @@ static void test_GetPrintProcessorDirectory(void) SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, env_x86, 1, buffer, cbBuf*2, &pcbNeeded); ok( res || (GetLastError() == ERROR_INVALID_ENVIRONMENT), - "returned %d with %d (expected '!= 0' or '0' with " + "returned %d with %ld (expected '!= 0' or '0' with " "ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); /* invalid on all systems */ @@ -1776,14 +1776,14 @@ static void test_GetPrintProcessorDirectory(void) SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, invalid_env, 1, buffer, cbBuf*2, &pcbNeeded); ok( !res && (GetLastError() == ERROR_INVALID_ENVIRONMENT), - "returned %d with %d (expected '0' with ERROR_INVALID_ENVIRONMENT)\n", + "returned %d with %ld (expected '0' with ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); /* Empty servername is the same as the local computer */ buffer[0] = '\0'; SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(empty, NULL, 1, buffer, cbBuf*2, &pcbNeeded); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %ld (expected '!= 0')\n", res, GetLastError()); /* invalid on all systems */ buffer[0] = '\0'; @@ -1793,7 +1793,7 @@ static void test_GetPrintProcessorDirectory(void) ok( GetLastError() == RPC_S_SERVER_UNAVAILABLE || /* NT */ GetLastError() == ERROR_INVALID_PARAMETER || /* 9x */ GetLastError() == RPC_S_INVALID_NET_ADDR, /* Some Vista */ - "unexpected last error %d\n", GetLastError()); + "unexpected last error %ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buffer); } @@ -1811,7 +1811,7 @@ static void test_OpenPrinter(void) if (is_spooler_deactivated(res, GetLastError())) return; ok(!res && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '0' with ERROR_INVALID_PARAMETER)\n", + "returned %ld with %ld (expected '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); @@ -1821,7 +1821,7 @@ static void test_OpenPrinter(void) res = OpenPrinterA(NULL, &hprinter, NULL); if (is_spooler_deactivated(res, GetLastError())) return; ok(res || GetLastError() == ERROR_INVALID_PARAMETER, - "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", + "returned %ld with %ld (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) { ClosePrinter(hprinter); @@ -1833,7 +1833,7 @@ static void test_OpenPrinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinterA(NULL, &hprinter, &defaults); - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); if (res) ClosePrinter(hprinter); defaults.DesiredAccess=-1; @@ -1842,7 +1842,7 @@ static void test_OpenPrinter(void) res = OpenPrinterA(NULL, &hprinter, &defaults); todo_wine { ok(!res && GetLastError() == ERROR_ACCESS_DENIED, - "returned %d with %d (expected '0' with ERROR_ACCESS_DENIED)\n", + "returned %ld with %ld (expected '0' with ERROR_ACCESS_DENIED)\n", res, GetLastError()); } if (res) ClosePrinter(hprinter); @@ -1855,7 +1855,7 @@ static void test_OpenPrinter(void) SetLastError(0xdeadbeef); res = OpenPrinterA(local_server, &hprinter, NULL); ok(res || GetLastError() == ERROR_INVALID_PARAMETER, - "returned %d with %d (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", + "returned %ld with %ld (expected '!=0' or '0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); } @@ -1866,7 +1866,7 @@ static void test_OpenPrinter(void) res = OpenPrinterA(illegal_name, &hprinter, NULL); ok(!res && ((GetLastError() == ERROR_INVALID_PRINTER_NAME) || (GetLastError() == ERROR_INVALID_PARAMETER) ), - "returned %d with %d (expected '0' with: ERROR_INVALID_PARAMETER or" + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PARAMETER or" "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1877,7 +1877,7 @@ static void test_OpenPrinter(void) ok( !res && ((GetLastError() == ERROR_INVALID_PRINTER_NAME) || (GetLastError() == ERROR_INVALID_PARAMETER) ), - "returned %d with %d (expected '0' with: ERROR_INVALID_PRINTER_NAME" + "returned %ld with %ld (expected '0' with: ERROR_INVALID_PRINTER_NAME" " or ERROR_INVALID_PARAMETER)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1893,14 +1893,14 @@ static void test_OpenPrinter(void) trace("The service 'Spooler' is required for '%s'\n", default_printer); return; } - ok(res, "returned %d with %d (expected '!=0')\n", res, GetLastError()); + ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); if(res) ClosePrinter(hprinter); SetLastError(MAGIC_DEAD); res = OpenPrinterA(default_printer, NULL, NULL); /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ ok(res || (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); defaults.pDatatype=NULL; @@ -1911,7 +1911,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinterA(default_printer, &hprinter, &defaults); ok(res || GetLastError() == ERROR_ACCESS_DENIED, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1924,7 +1924,7 @@ static void test_OpenPrinter(void) if (is_spooler_deactivated(res, GetLastError())) return; ok(res || ((GetLastError() == ERROR_INVALID_DATATYPE) || (GetLastError() == ERROR_ACCESS_DENIED)), - "returned %d with %d (expected '!=0' or '0' with: " + "returned %ld with %ld (expected '!=0' or '0' with: " "ERROR_INVALID_DATATYPE or ERROR_ACCESS_DENIED)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1937,7 +1937,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinterA(default_printer, &hprinter, &defaults); ok(res || GetLastError() == ERROR_ACCESS_DENIED, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -1947,7 +1947,7 @@ static void test_OpenPrinter(void) SetLastError(MAGIC_DEAD); res = OpenPrinterA(default_printer, &hprinter, &defaults); ok(res || GetLastError() == ERROR_ACCESS_DENIED, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_ACCESS_DENIED)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); } @@ -1975,7 +1975,7 @@ static void test_SetDefaultPrinter(void) org_value[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, org_value, size); - ok(res, "GetProfileString error %d\n", GetLastError()); + ok(res, "GetProfileString error %ld\n", GetLastError()); /* first part: with the default Printer */ SetLastError(MAGIC_DEAD); @@ -1989,28 +1989,28 @@ static void test_SetDefaultPrinter(void) } ok(!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME), - "returned %d with %d (expected '0' with " + "returned %ld with %ld (expected '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(""); ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(NULL); ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", org_value); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); @@ -2020,7 +2020,7 @@ static void test_SetDefaultPrinter(void) res = pSetDefaultPrinterA("no_printer_with_this_name"); ok(!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME), - "returned %d with %d (expected '0' with " + "returned %ld with %ld (expected '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", NULL); @@ -2031,7 +2031,7 @@ static void test_SetDefaultPrinter(void) /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", NULL); @@ -2039,26 +2039,26 @@ static void test_SetDefaultPrinter(void) res = pSetDefaultPrinterA(NULL); /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); WriteProfileStringA("windows", "device", NULL); SetLastError(MAGIC_DEAD); res = pSetDefaultPrinterA(default_printer); ok(res || GetLastError() == ERROR_INVALID_PRINTER_NAME, - "returned %d with %d (expected '!=0' or '0' with " + "returned %ld with %ld (expected '!=0' or '0' with " "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); /* restore the original value */ restore_old_printer: res = pSetDefaultPrinterA(default_printer); /* the nice way */ - ok(res, "SetDefaultPrinter error %d\n", GetLastError()); + ok(res, "SetDefaultPrinter error %ld\n", GetLastError()); WriteProfileStringA("windows", "device", org_value); /* the old way */ buffer[0] = '\0'; SetLastError(MAGIC_DEAD); res = GetProfileStringA("windows", "device", NULL, buffer, size); - ok(res, "GetProfileString error %d\n", GetLastError()); + ok(res, "GetProfileString error %ld\n", GetLastError()); ok(!lstrcmpA(org_value, buffer), "'%s' (expected '%s')\n", buffer, org_value); } @@ -2088,7 +2088,7 @@ static void test_XcvDataW_MonitorUI(void) if (is_spooler_deactivated(res, GetLastError())) return; if (is_access_denied(res, GetLastError())) return; - ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); + ok(res, "returned %ld with %lu and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); if (!res) return; /* ask for needed size */ @@ -2097,13 +2097,13 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), - "returned %d with %u and %u for status %u (expected '!= 0' and " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' and " "'<= MAX_PATH' for status ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), needed, status); if (needed > MAX_PATH) { ClosePrinter(hXcv); - skip("buffer overflow (%u)\n", needed); + skip("buffer overflow (%lu)\n", needed); return; } len = needed; /* Size is in bytes */ @@ -2114,7 +2114,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INVALID_PARAMETER), - "returned %d with %u and %u for status %u (expected '!= 0' with " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2122,7 +2122,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed, &status); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %u and %u for status %u (expected '0' with " + "returned %ld with %lu and %lu for status %lu (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); /* "PDWORD needed" is checked before RPC-Errors */ @@ -2131,7 +2131,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %u and %u for status %u (expected '0' with " + "returned %ld with %lu and %lu for status %lu (expected '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2139,7 +2139,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, len, &needed, &status); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %u and %u for status %u (expected '0' with " + "returned %ld with %lu and %lu for status %lu (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2147,7 +2147,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, NULL); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), - "returned %d with %u and %u for status %u (expected '0' with " + "returned %ld with %lu and %lu for status %lu (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); /* off by one: larger */ @@ -2156,7 +2156,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len+1, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for status " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); /* off by one: smaller */ @@ -2166,7 +2166,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len-1, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER), - "returned %d with %u and %u for status %u (expected '!= 0' for status " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for status " "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), needed, status); @@ -2177,7 +2177,7 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for status " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); ClosePrinter(hXcv); @@ -2206,7 +2206,7 @@ static void test_XcvDataW_PortIsValid(void) if (is_spooler_deactivated(res, GetLastError())) return; if (is_access_denied(res, GetLastError())) return; - ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); + ok(res, "returned %ld with %lu and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); if (!res) return; @@ -2216,7 +2216,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_INVALID_PARAMETER)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); /* an empty name is not allowed */ @@ -2225,7 +2225,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"", sizeof(L""), NULL, 0, &needed, &status); ok( res && ((status == ERROR_FILE_NOT_FOUND) || (status == ERROR_PATH_NOT_FOUND)), - "returned %d with %u and %u for status %u (expected '!= 0' for status: " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for status: " "ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND)\n", res, GetLastError(), needed, status); @@ -2237,7 +2237,7 @@ static void test_XcvDataW_PortIsValid(void) NULL, 0, &needed, &status); /* XP: ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */ ok( res && ((status == ERROR_PATH_NOT_FOUND) || (status == ERROR_ACCESS_DENIED)), - "returned %d with %u and %u for status %u (expected '!= 0' for status: " + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for status: " "ERROR_PATH_NOT_FOUND or ERROR_ACCESS_DENIED)\n", res, GetLastError(), needed, status); @@ -2247,7 +2247,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2255,7 +2255,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT2:", sizeof(L"LPT2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2263,7 +2263,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM1:", sizeof(L"COM1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2271,7 +2271,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM2:", sizeof(L"COM2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); needed = (DWORD) 0xdeadbeef; @@ -2279,7 +2279,7 @@ static void test_XcvDataW_PortIsValid(void) SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"FILE:", sizeof(L"FILE:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2290,7 +2290,7 @@ static void test_XcvDataW_PortIsValid(void) res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), - "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", + "returned %ld with %lu and %lu for status %lu (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); ClosePrinter(hXcv); @@ -2329,8 +2329,8 @@ static void test_GetPrinter(void) if (ret) { win_skip("Level %d is not supported on Win9x/WinMe\n", level); - ok(GetLastError() == ERROR_SUCCESS, "wrong error %d\n", GetLastError()); - ok(needed == 0,"Expected 0, got %d\n", needed); + ok(GetLastError() == ERROR_SUCCESS, "wrong error %ld\n", GetLastError()); + ok(needed == 0,"Expected 0, got %ld\n", needed); continue; } ok(!ret, "level %d: GetPrinter should fail\n", level); @@ -2341,16 +2341,16 @@ static void test_GetPrinter(void) skip("Level %d not supported\n", level); continue; } - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); - ok(needed > 0,"not expected needed buffer size %d\n", needed); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %ld\n", GetLastError()); + ok(needed > 0,"not expected needed buffer size %ld\n", needed); /* GetPrinterA returns the same number of bytes as GetPrinterW */ if (!ret && pGetPrinterW && level != 6 && level != 7) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); - ok(!ret, "level %d: GetPrinter error %d\n", level, GetLastError()); - ok(double_needed == needed, "level %d: GetPrinterA returned different size %d than GetPrinterW (%d)\n", level, needed, double_needed); + ok(!ret, "level %d: GetPrinter error %ld\n", level, GetLastError()); + ok(double_needed == needed, "level %d: GetPrinterA returned different size %ld than GetPrinterW (%ld)\n", level, needed, double_needed); } buf = HeapAlloc(GetProcessHeap(), 0, needed); @@ -2358,8 +2358,8 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); filled = -1; ret = GetPrinterA(hprn, level, buf, needed, &filled); - ok(ret, "level %d: GetPrinter error %d\n", level, GetLastError()); - ok(needed == filled, "needed %d != filled %d\n", needed, filled); + ok(ret, "level %d: GetPrinter error %ld\n", level, GetLastError()); + ok(needed == filled, "needed %ld != filled %ld\n", needed, filled); if (level == 2) { @@ -2377,7 +2377,7 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); ret = ClosePrinter(hprn); - ok(ret, "ClosePrinter error %d\n", GetLastError()); + ok(ret, "ClosePrinter error %ld\n", GetLastError()); } /* ########################### */ @@ -2410,20 +2410,20 @@ static void test_GetPrinterData(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + "got %ld, type %ld, needed: %ld and '%s' (expected ERROR_SUCCESS, REG_SZ and %ld)\n", res, type, needed, buffer, len); needed = 0xdeadbeef; SetLastError(0xdeadbeef); res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed); ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); + "got %ld, needed: %ld (expected ERROR_MORE_DATA and %ld)\n", res, needed, len); /* ToDo: test SPLREG_* */ SetLastError(0xdeadbeef); res = ClosePrinter(hprn); - ok(res, "ClosePrinter error %d\n", GetLastError()); + ok(res, "ClosePrinter error %ld\n", GetLastError()); } /* ########################### */ @@ -2449,7 +2449,7 @@ static void test_GetPrinterDataEx(void) res = OpenPrinterA(NULL, &hprn, NULL); if (!res) { - win_skip("Unable to open the printserver: %d\n", GetLastError()); + win_skip("Unable to open the printserver: %ld\n", GetLastError()); return; } @@ -2465,7 +2465,7 @@ static void test_GetPrinterDataEx(void) len = lstrlenA(buffer) + sizeof(CHAR); /* NT4 and w2k require a buffer to save the UNICODE result also for the ANSI function */ ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + "got %ld, type %ld, needed: %ld and '%s' (expected ERROR_SUCCESS, REG_SZ and %ld)\n", res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); @@ -2477,7 +2477,7 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + "got %ld, type %ld, needed: %ld and '%s' (expected ERROR_SUCCESS, REG_SZ and %ld)\n", res, type, needed, buffer, len); memset(buffer, '#', sizeof(buffer)); @@ -2490,7 +2490,7 @@ static void test_GetPrinterDataEx(void) &type, (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + "got %ld, type %ld, needed: %ld and '%s' (expected ERROR_SUCCESS, REG_SZ and %ld)\n", res, type, needed, buffer, len); @@ -2503,7 +2503,7 @@ static void test_GetPrinterDataEx(void) (LPBYTE) buffer, sizeof(buffer), &needed); len = lstrlenA(buffer) + sizeof(CHAR); ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d)\n", + "got %ld, type %ld, needed: %ld and '%s' (expected ERROR_SUCCESS, REG_SZ and %ld)\n", res, type, needed, buffer, len); needed = 0xdeadbeef; @@ -2513,18 +2513,18 @@ static void test_GetPrinterDataEx(void) res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeadbeef)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); + "got %ld, needed: %ld (expected ERROR_MORE_DATA and %ld)\n", res, needed, len); needed = 0xdeadbeef; SetLastError(0xdeaddead); res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); ok( ((res == ERROR_MORE_DATA) || broken(res == 0xdeaddead)) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), - "got %d, needed: %d (expected ERROR_MORE_DATA and %d)\n", res, needed, len); + "got %ld, needed: %ld (expected ERROR_MORE_DATA and %ld)\n", res, needed, len); SetLastError(0xdeadbeef); res = ClosePrinter(hprn); - ok(res, "ClosePrinter error %d\n", GetLastError()); + ok(res, "ClosePrinter error %ld\n", GetLastError()); } /* ########################### */ @@ -2562,15 +2562,15 @@ static void test_GetPrinterDriver(void) { /* Not all levels are supported on all Windows-Versions */ if(GetLastError() == ERROR_INVALID_LEVEL) continue; - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); - ok(needed > 0,"not expected needed buffer size %d\n", needed); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %ld\n", GetLastError()); + ok(needed > 0,"not expected needed buffer size %ld\n", needed); } else { /* ERROR_OUTOFMEMORY found on win9x */ ok( ((GetLastError() == ERROR_INVALID_LEVEL) || (GetLastError() == ERROR_OUTOFMEMORY)), - "%d: returned %d with %d (expected '0' with: " + "%d: returned %d with %ld (expected '0' with: " "ERROR_INVALID_LEVEL or ERROR_OUTOFMEMORY)\n", level, ret, GetLastError()); /* needed is modified in win9x. The modified Value depends on the @@ -2583,8 +2583,8 @@ static void test_GetPrinterDriver(void) { DWORD double_needed; ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); - ok(!ret, "level %d: GetPrinterDriver error %d\n", level, GetLastError()); - ok(double_needed == needed, "GetPrinterDriverA returned different size %d than GetPrinterDriverW (%d)\n", needed, double_needed); + ok(!ret, "level %d: GetPrinterDriver error %ld\n", level, GetLastError()); + ok(double_needed == needed, "GetPrinterDriverA returned different size %ld than GetPrinterDriverW (%ld)\n", needed, double_needed); } buf = HeapAlloc(GetProcessHeap(), 0, needed); @@ -2592,8 +2592,8 @@ static void test_GetPrinterDriver(void) SetLastError(0xdeadbeef); filled = -1; ret = GetPrinterDriverA(hprn, NULL, level, buf, needed, &filled); - ok(ret, "level %d: GetPrinterDriver error %d\n", level, GetLastError()); - ok(needed == filled, "needed %d != filled %d\n", needed, filled); + ok(ret, "level %d: GetPrinterDriver error %ld\n", level, GetLastError()); + ok(needed == filled, "needed %ld != filled %ld\n", needed, filled); if (level == 2) { @@ -2604,14 +2604,14 @@ static void test_GetPrinterDriver(void) /* MSDN is wrong: The Drivers on the win9x-CD's have cVersion=0x0400 NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k-win7(Usermode): 3, win8 and above(Usermode): 4 */ ok( (di_2->cVersion <= 4) || - (di_2->cVersion == 0x0400), "di_2->cVersion = %d\n", di_2->cVersion); + (di_2->cVersion == 0x0400), "di_2->cVersion = %ld\n", di_2->cVersion); ok(di_2->pName != NULL, "not expected NULL ptr\n"); ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n"); ok(di_2->pDriverPath != NULL, "not expected NULL ptr\n"); ok(di_2->pDataFile != NULL, "not expected NULL ptr\n"); ok(di_2->pConfigFile != NULL, "not expected NULL ptr\n"); - trace("cVersion %d\n", di_2->cVersion); + trace("cVersion %ld\n", di_2->cVersion); trace("pName %s\n", di_2->pName); calculated += strlen(di_2->pName) + 1; trace("pEnvironment %s\n", di_2->pEnvironment); @@ -2639,7 +2639,7 @@ static void test_GetPrinterDriver(void) ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pConfigFile); /* XP allocates memory for both ANSI and unicode names */ - ok(filled >= calculated,"calculated %d != filled %d\n", calculated, filled); + ok(filled >= calculated,"calculated %ld != filled %ld\n", calculated, filled); /* Obscure test - demonstrate that Windows zero fills the buffer, even on failure */ ret = GetPrinterDriverA(hprn, NULL, level, buf, needed - 2, &filled); @@ -2654,7 +2654,7 @@ static void test_GetPrinterDriver(void) SetLastError(0xdeadbeef); ret = ClosePrinter(hprn); - ok(ret, "ClosePrinter error %d\n", GetLastError()); + ok(ret, "ClosePrinter error %ld\n", GetLastError()); } static void test_DEVMODEA(const DEVMODEA *dm, LONG dmSize, LPCSTR exp_prn_name) @@ -2668,9 +2668,9 @@ static void test_DEVMODEA(const DEVMODEA *dm, LONG dmSize, LPCSTR exp_prn_name) !strncmp(exp_prn_name, (LPCSTR)dm->dmDeviceName, CCHDEVICENAME -2), /* XP+ */ "expected '%s', got '%s'\n", exp_prn_name, dm->dmDeviceName); ok(dm->dmSize + dm->dmDriverExtra == dmSize, - "%u != %d\n", dm->dmSize + dm->dmDriverExtra, dmSize); + "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); } - trace("dmFields %08x\n", dm->dmFields); + trace("dmFields %08lx\n", dm->dmFields); } static void test_DocumentProperties(void) @@ -2696,16 +2696,16 @@ static void test_DocumentProperties(void) ok(hprn != 0, "wrong hprn %p\n", hprn); dm_size = DocumentPropertiesA(0, hprn, NULL, NULL, NULL, 0); - trace("DEVMODEA required size %d\n", dm_size); - ok(dm_size >= sizeof(DEVMODEA), "unexpected DocumentPropertiesA ret value %d\n", dm_size); + trace("DEVMODEA required size %ld\n", dm_size); + ok(dm_size >= sizeof(DEVMODEA), "unexpected DocumentPropertiesA ret value %ld\n", dm_size); dm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dm_size); ret = DocumentPropertiesA(0, hprn, NULL, dm, dm, DM_OUT_BUFFER); - ok(ret == IDOK, "DocumentPropertiesA ret value %d != expected IDOK\n", ret); + ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); - ok(ret == IDOK, "DocumentPropertiesA ret value %d != expected IDOK\n", ret); + ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); test_DEVMODEA(dm, dm_size, default_printer); @@ -2713,7 +2713,7 @@ static void test_DocumentProperties(void) SetLastError(0xdeadbeef); ret = ClosePrinter(hprn); - ok(ret, "ClosePrinter error %d\n", GetLastError()); + ok(ret, "ClosePrinter error %ld\n", GetLastError()); } static void test_EnumPrinters(void) @@ -2728,16 +2728,16 @@ static void test_EnumPrinters(void) if (!ret) { /* We have 1 or more printers */ - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %ld\n", GetLastError()); ok(neededA > 0, "Expected neededA to show the number of needed bytes\n"); } else { /* We don't have any printers defined */ - ok(GetLastError() == S_OK, "gle %d\n", GetLastError()); + ok(GetLastError() == S_OK, "gle %ld\n", GetLastError()); ok(neededA == 0, "Expected neededA to be zero\n"); } - ok(num == 0, "num %d\n", num); + ok(num == 0, "num %ld\n", num); SetLastError(0xdeadbeef); neededW = -1; @@ -2752,20 +2752,20 @@ static void test_EnumPrinters(void) if (!ret) { /* We have 1 or more printers */ - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %ld\n", GetLastError()); ok(neededW > 0, "Expected neededW to show the number of needed bytes\n"); } else { /* We don't have any printers defined */ - ok(GetLastError() == S_OK, "gle %d\n", GetLastError()); + ok(GetLastError() == S_OK, "gle %ld\n", GetLastError()); ok(neededW == 0, "Expected neededW to be zero\n"); } - ok(num == 0, "num %d\n", num); + ok(num == 0, "num %ld\n", num); /* Outlook2003 relies on the buffer size returned by EnumPrintersA being big enough to hold the buffer returned by EnumPrintersW */ - ok(neededA == neededW, "neededA %d neededW %d\n", neededA, neededW); + ok(neededA == neededW, "neededA %ld neededW %ld\n", neededA, neededW); } static void test_DeviceCapabilities(void) @@ -2879,7 +2879,7 @@ static void test_DeviceCapabilities(void) ok(fields == (dm->dmFields | DM_FORMNAME) || fields == ((dm->dmFields | DM_FORMNAME | DM_PAPERSIZE) & ~(DM_PAPERLENGTH|DM_PAPERWIDTH)) || broken(fields == dm->dmFields), /* Win9x/WinMe */ - "fields %x, dm->dmFields %x\n", fields, dm->dmFields); + "fields %lx, dm->dmFields %lx\n", fields, dm->dmFields); GlobalUnlock(prn_dlg.hDevMode); GlobalFree(prn_dlg.hDevMode); @@ -2919,7 +2919,7 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); + ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); default_size = pi->pDevMode->u1.s1.dmPaperSize; HeapFree( GetProcessHeap(), 0, pi ); @@ -2933,17 +2933,17 @@ static void test_OpenPrinter_defaults(void) ClosePrinter( printer ); return; } - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError() ); - ok( needed > sizeof(ADDJOB_INFO_1A), "AddJob needs %u bytes\n", needed); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError() ); + ok( needed > sizeof(ADDJOB_INFO_1A), "AddJob needs %lu bytes\n", needed); add_job = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); + ok( ret, "AddJobA() failed le=%ld\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); + ok( ret, "GetJobA() failed le=%ld\n", GetLastError() ); todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); @@ -2968,14 +2968,14 @@ static void test_OpenPrinter_defaults(void) prn_def.DesiredAccess = PRINTER_ACCESS_USE; ret = OpenPrinterA( default_printer, &printer, &prn_def ); - ok( ret, "OpenPrinterA() failed le=%d\n", GetLastError() ); + ok( ret, "OpenPrinterA() failed le=%ld\n", GetLastError() ); /* GetPrinter stills returns default size */ ret = GetPrinterA( printer, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); pi = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetPrinterA( printer, 2, (BYTE *)pi, needed, &needed ); - ok( ret, "GetPrinterA() failed le=%d\n", GetLastError() ); + ok( ret, "GetPrinterA() failed le=%ld\n", GetLastError() ); ok( pi->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", pi->pDevMode->u1.s1.dmPaperSize, default_size ); @@ -2986,15 +2986,15 @@ static void test_OpenPrinter_defaults(void) ok( !ret, "got %d\n", ret ); add_job = HeapAlloc( GetProcessHeap(), 0, needed ); ret = AddJobA( printer, 1, (BYTE *)add_job, needed, &needed ); - ok( ret, "AddJobA() failed le=%d\n", GetLastError() ); + ok( ret, "AddJobA() failed le=%ld\n", GetLastError() ); ret = GetJobA( printer, add_job->JobId, 2, NULL, 0, &needed ); ok( !ret, "got %d\n", ret ); job_info = HeapAlloc( GetProcessHeap(), 0, needed ); ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); - ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); + ok( ret, "GetJobA() failed le=%ld\n", GetLastError() ); - ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08x\n", + ok( job_info->pDevMode->dmFields == DM_PAPERSIZE, "got %08lx\n", job_info->pDevMode->dmFields ); ok( job_info->pDevMode->u1.s1.dmPaperSize == my_dm.u1.s1.dmPaperSize, "got %d new size %d\n",

2 1

[PATCH vkd3d v4 8/8] vkd3d-shader/hlsl: Treat all braceless initializers as assignments.
by Francisco Casas 09 Mar '22

09 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 91 +++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fecb45ae..efed7e13 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1599,61 +1599,66 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (v->initializer.args_count) { - unsigned int size = initializer_size(&v->initializer); - struct hlsl_ir_load *load; - - if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces - && type->dimx * type->dimy != size) + if (v->initializer.braces) { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, v->initializer.args_count); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + unsigned int size = initializer_size(&v->initializer); - if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) - && hlsl_type_component_count(type) != size) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if (type->type <= HLSL_CLASS_LAST_NUMERIC && type->dimx * type->dimy != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) - { - FIXME("Initializers for non scalar/struct variables not supported yet.\n"); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && hlsl_type_component_count(type) != size) + { + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), size); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) + { + FIXME("Initializers for non scalar/struct variables not supported yet.\n"); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } + + if (type->type == HLSL_CLASS_STRUCT) + { + struct_var_initializer(ctx, statements_list, var, &v->initializer); + vkd3d_free(v); + continue; + } + else + { + hlsl_fixme(ctx, &v->loc, "Complex initializer."); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; + } } - if (v->initializer.args_count > 1) + else { - hlsl_fixme(ctx, &v->loc, "Complex initializer."); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + struct hlsl_ir_load *load = hlsl_new_var_load(ctx, var, var->loc); - load = hlsl_new_var_load(ctx, var, var->loc); - list_add_tail(v->initializer.instrs, &load->node.entry); - add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); - vkd3d_free(v->initializer.args); + assert(v->initializer.args_count == 1); + list_add_tail(v->initializer.instrs, &load->node.entry); + add_assignment(ctx, v->initializer.instrs, &load->node, ASSIGN_OP_ASSIGN, v->initializer.args[0]); + } if (modifiers & HLSL_STORAGE_STATIC) list_move_tail(&ctx->static_initializers, v->initializer.instrs); else list_move_tail(statements_list, v->initializer.instrs); + vkd3d_free(v->initializer.args); vkd3d_free(v->initializer.instrs); } vkd3d_free(v); -- 2.25.1

1 0

[PATCH vkd3d v4 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas 09 Mar '22

09 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ced58c9..fecb45ae 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1623,23 +1623,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v4 6/8] vkd3d-shader/hlsl: Don't check exact number of components for braceless initialization of numeric types.
by Francisco Casas 09 Mar '22

09 Mar '22

The implicit conversion in add_assignment() takes responsability now. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3989c7dd..4ced58c9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1602,19 +1602,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t unsigned int size = initializer_size(&v->initializer); struct hlsl_ir_load *load; - if (type->type <= HLSL_CLASS_LAST_NUMERIC - && type->dimx * type->dimy != size && size != 1) + if (type->type <= HLSL_CLASS_LAST_NUMERIC && v->initializer.braces + && type->dimx * type->dimy != size) { - if (size < type->dimx * type->dimy) - { - hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Expected %u components in numeric initializer, but got %u.", - type->dimx * type->dimy, size); - free_parse_initializer(&v->initializer); - vkd3d_free(v); - continue; - } + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Expected %u components in numeric initializer, but got %u.", + type->dimx * type->dimy, v->initializer.args_count); + free_parse_initializer(&v->initializer); + vkd3d_free(v); + continue; } + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) && hlsl_type_component_count(type) != size) { -- 2.25.1

1 0

[PATCH vkd3d v4 5/8] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 09 Mar '22

09 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e7c4c307..3989c7dd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); + free_parse_variable_def(v); return list; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,7 +729,10 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + { + free_parse_variable_def(v); return false; + } } else { @@ -729,8 +742,12 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + { + free_parse_variable_def(v); return false; + } } + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +764,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1470,15 +1488,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1510,6 +1519,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1569,6 +1579,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1581,6 +1592,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

1 0

[PATCH vkd3d v4 4/8] vkd3d-shader/hlsl: Add 'braces' flag to parse initializers.
by Francisco Casas 09 Mar '22

09 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 365d433f..e7c4c307 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -48,6 +48,7 @@ struct parse_initializer struct hlsl_ir_node **args; unsigned int args_count; struct list *instrs; + bool braces; }; struct parse_array_sizes @@ -3218,14 +3219,17 @@ complex_initializer: } $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | '{' complex_initializer_list '}' { $$ = $2; + $$.braces = true; } | '{' complex_initializer_list ',' '}' { $$ = $2; + $$.braces = true; } complex_initializer_list: @@ -3256,6 +3260,7 @@ initializer_expr_list: YYABORT; $$.args[0] = node_from_list($1); $$.instrs = $1; + $$.braces = false; } | initializer_expr_list ',' initializer_expr { @@ -3389,6 +3394,7 @@ func_arguments: $$.args_count = 0; if (!($$.instrs = make_empty_list(ctx))) YYABORT; + $$.braces = false; } | initializer_expr_list -- 2.25.1

1 0

[PATCH vkd3d v4 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 09 Mar '22

09 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v4: - Avoiding leak in case hlsl_realloc fails, also in "initializer_expr_list:". Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 8c66a33c..365d433f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2411,6 +2411,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3218,15 +3219,32 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + $$ = $1; + if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + { + free_parse_initializer(&$$); + free_parse_initializer(&$3); + YYABORT; + } + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

1 0

[PATCH vkd3d v4 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 09 Mar '22

09 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: - No changes from v3. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..1fd5dc58 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 62dbce5e..6da2b3a9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; -- 2.25.1

1 0

[PATCH 1/2] dlls/wininet/tests: use correct integral type
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..706b8fa623b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -363,7 +363,7 @@ static void _test_http_version(unsigned line, HINTERNET req) ok_(__FILE__,line)(v.dwMinorVersion == 1, "dwMinorVersion = %d\n", v.dwMinorVersion); } -static int close_handle_cnt; +static LONG close_handle_cnt; static VOID WINAPI callback( HINTERNET hInternet,

2 3

[PATCH] mscms: make the correct value for bmformat.
by 赵意 09 Mar '22

09 Mar '22

Log: for driver "SHARP DX-2008UC", the wrong value for bmformat causes incorrect color picture data to be printed. Signed-off-by: zhaoyi <zhaoyi(a)uniontech.com> Change-Id: I9818dbd86f8a58777e185a76f027fd1c30b7f7ff ---  dlls/mscms/liblcms.c | 10 +++++-----  1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c index 1f43c359c4..522e1dc3d0 100644 --- a/dlls/mscms/liblcms.c +++ b/dlls/mscms/liblcms.c @@ -49,12 +49,12 @@ static DWORD from_bmformat( BMFORMAT format )        switch (format)      { -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break; -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break; +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;      case BM_GRAY:        ret = TYPE_GRAY_8; break; -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break; -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break; -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break; +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break; +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break; +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;      default:          if (!quietfixme)          { --  2.20.1

3 2

[PATCH] mshtml: implement the IsNoCacheReponse method
by Pat Leamon 09 Mar '22

09 Mar '22

Implements IsNoCacheReponse based on IsNoStoreReponse implementation. Signed-off-by: Pat Leamon <pleamonhp(a)yahoo.com.au> --- dlls/mshtml/nsio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fc6602eddf4..33d26670e4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1501,10 +1501,15 @@ static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, cpp_boo static nsresult NSAPI nsChannel_IsNoCacheResponse(nsIHttpChannel *iface, cpp_bool *_retval) { nsChannel *This = impl_from_nsIHttpChannel(iface); + http_header_t *header; - FIXME("(%p)->(%p)\n", This, _retval); + static const WCHAR cache_controlW[] = {'C','a','c','h','e','-','C','o','n','t','r','o','l'}; - return NS_ERROR_NOT_IMPLEMENTED; + TRACE("(%p)->(%p)\n", This, _retval); + + header = find_http_header(&This->response_headers, cache_controlW, ARRAY_SIZE(cache_controlW)); + *_retval = header && !wcsicmp(header->data, L"no-cache"); + return NS_OK; } static nsresult NSAPI nsChannel_IsPrivateResponse(nsIHttpChannel *iface, cpp_bool *_retval) -- 2.25.1

1 0

[PATCH] dlls/kernel32/tests/change.c, time.c: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/change.c | 159 +++++++++++++++++++++--------------------- dlls/kernel32/tests/time.c | 139 ++++++++++++++++++------------------- 2 files changed, 150 insertions(+), 148 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index c0fcf00ba68..97578fe68bd 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ /* TODO: - security attribute changes * - compound filter and multiple notifications @@ -51,7 +52,7 @@ static DWORD CALLBACK NotificationThread(LPVOID arg) } ret = FindCloseChangeNotification(change); - ok( ret, "FindCloseChangeNotification error: %d\n", + ok( ret, "FindCloseChangeNotification error: %ld\n", GetLastError()); ExitThread((DWORD)notified); @@ -63,10 +64,10 @@ static HANDLE StartNotificationThread(LPCSTR path, BOOL subtree, DWORD flags) DWORD threadId; change = FindFirstChangeNotificationA(path, subtree, flags); - ok(change != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %d\n", GetLastError()); + ok(change != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %ld\n", GetLastError()); thread = CreateThread(NULL, 0, NotificationThread, change, 0, &threadId); - ok(thread != NULL, "CreateThread error: %d\n", GetLastError()); + ok(thread != NULL, "CreateThread error: %ld\n", GetLastError()); return thread; } @@ -76,7 +77,7 @@ static DWORD FinishNotificationThread(HANDLE thread) DWORD status, exitcode; status = WaitForSingleObject(thread, 5000); - ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %d error %d\n", status, GetLastError()); + ok(status == WAIT_OBJECT_0, "WaitForSingleObject status %ld error %ld\n", status, GetLastError()); ok(GetExitCodeThread(thread, &exitcode), "Could not retrieve thread exit code\n"); CloseHandle(thread); @@ -100,46 +101,46 @@ static void test_FindFirstChangeNotification(void) change = FindFirstChangeNotificationA("not-a-file", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); ok(GetLastError() == ERROR_FILE_NOT_FOUND, - "FindFirstChangeNotification error: %d\n", GetLastError()); + "FindFirstChangeNotification error: %ld\n", GetLastError()); change = FindFirstChangeNotificationA(NULL, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(change == INVALID_HANDLE_VALUE || broken(change == NULL) /* < win7 */, "Expected INVALID_HANDLE_VALUE, got %p\n", change); ok(GetLastError() == ERROR_PATH_NOT_FOUND, - "FindFirstChangeNotification error: %u\n", GetLastError()); + "FindFirstChangeNotification error: %lu\n", GetLastError()); ret = FindNextChangeNotification(NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %d\n", + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindNextChangeNotification error: %ld\n", GetLastError()); ret = FindCloseChangeNotification(NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindCloseChangeNotification error: %d\n", + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "FindCloseChangeNotification error: %ld\n", GetLastError()); ret = GetTempPathA(MAX_PATH, dirname1); - ok(ret, "GetTempPathA error: %d\n", GetLastError()); + ok(ret, "GetTempPathA error: %ld\n", GetLastError()); ret = GetTempFileNameA(dirname1, "ffc", 0, workdir); - ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ok(ret, "GetTempFileNameA error: %ld\n", GetLastError()); DeleteFileA( workdir ); ret = CreateDirectoryA(workdir, NULL); - ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); ret = GetTempFileNameA(workdir, prefix, 0, filename1); - ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ok(ret, "GetTempFileNameA error: %ld\n", GetLastError()); file = CreateFileA(filename1, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError()); ret = CloseHandle(file); - ok( ret, "CloseHandle error: %d\n", GetLastError()); + ok( ret, "CloseHandle error: %ld\n", GetLastError()); /* Try to register notification for a file */ change = FindFirstChangeNotificationA(filename1, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(change == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", change); ok(GetLastError() == ERROR_DIRECTORY, - "FindFirstChangeNotification error: %d\n", GetLastError()); + "FindFirstChangeNotification error: %ld\n", GetLastError()); lstrcpyA(dirname1, filename1); lstrcatA(dirname1, "dir"); @@ -148,18 +149,18 @@ static void test_FindFirstChangeNotification(void) lstrcatA(dirname2, "new"); ret = CreateDirectoryA(dirname1, NULL); - ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); /* What if we move the directory we registered notification for? */ thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); - ok(ret, "MoveFileA error: %d\n", GetLastError()); + ok(ret, "MoveFileA error: %ld\n", GetLastError()); ok(!FinishNotificationThread(thread), "Got notification\n"); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); - ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); ret = FinishNotificationThread(thread); todo_wine ok(ret, "Missed notification\n"); @@ -168,19 +169,19 @@ static void test_FindFirstChangeNotification(void) /* Create a directory */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = CreateDirectoryA(dirname1, NULL); - ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Rename a directory */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); - ok(ret, "MoveFileA error: %d\n", GetLastError()); + ok(ret, "MoveFileA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Delete a directory */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = RemoveDirectoryA(dirname2); - ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); lstrcpyA(filename2, filename1); @@ -189,64 +190,64 @@ static void test_FindFirstChangeNotification(void) /* Rename a file */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ret = MoveFileA(filename1, filename2); - ok(ret, "MoveFileA error: %d\n", GetLastError()); + ok(ret, "MoveFileA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Delete a file */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); ret = DeleteFileA(filename2); - ok(ret, "DeleteFileA error: %d\n", GetLastError()); + ok(ret, "DeleteFileA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Create a file */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); file = CreateFileA(filename2, GENERIC_WRITE|GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError()); ret = CloseHandle(file); - ok( ret, "CloseHandle error: %d\n", GetLastError()); + ok( ret, "CloseHandle error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); attributes = GetFileAttributesA(filename2); - ok(attributes != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA error: %d\n", GetLastError()); + ok(attributes != INVALID_FILE_ATTRIBUTES, "GetFileAttributesA error: %ld\n", GetLastError()); attributes &= FILE_ATTRIBUTE_READONLY; /* Change file attributes */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_ATTRIBUTES); ret = SetFileAttributesA(filename2, attributes); - ok(ret, "SetFileAttributesA error: %d\n", GetLastError()); + ok(ret, "SetFileAttributesA error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Change last write time by writing to a file */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_LAST_WRITE); file = CreateFileA(filename2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError()); memset(buffer, 0, sizeof(buffer)); ret = WriteFile(file, buffer, sizeof(buffer), &count, NULL); - ok(ret && count == sizeof(buffer), "WriteFile error: %d\n", GetLastError()); + ok(ret && count == sizeof(buffer), "WriteFile error: %ld\n", GetLastError()); ret = CloseHandle(file); - ok( ret, "CloseHandle error: %d\n", GetLastError()); + ok( ret, "CloseHandle error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* Change file size by truncating a file */ thread = StartNotificationThread(workdir, FALSE, FILE_NOTIFY_CHANGE_SIZE); file = CreateFileA(filename2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %ld\n", GetLastError()); ret = WriteFile(file, buffer, sizeof(buffer) / 2, &count, NULL); - ok(ret && count == sizeof(buffer) / 2, "WriteFileA error: %d\n", GetLastError()); + ok(ret && count == sizeof(buffer) / 2, "WriteFileA error: %ld\n", GetLastError()); ret = CloseHandle(file); - ok( ret, "CloseHandle error: %d\n", GetLastError()); + ok( ret, "CloseHandle error: %ld\n", GetLastError()); ok(FinishNotificationThread(thread), "Missed notification\n"); /* clean up */ ret = DeleteFileA(filename2); - ok(ret, "DeleteFileA error: %d\n", GetLastError()); + ok(ret, "DeleteFileA error: %ld\n", GetLastError()); ret = RemoveDirectoryA(workdir); - ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); } /* this test concentrates more on the wait behaviour of the handle */ @@ -287,7 +288,7 @@ static void test_ffcn(void) file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); - ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %lu\n", GetLastError() ); CloseHandle(file); r = WaitForSingleObject( handle, 0 ); @@ -364,20 +365,20 @@ static void test_ffcnMultipleThreads(void) char tmp[MAX_PATH], path[MAX_PATH]; r = GetTempPathA(MAX_PATH, tmp); - ok(r, "GetTempPathA error: %d\n", GetLastError()); + ok(r, "GetTempPathA error: %ld\n", GetLastError()); r = GetTempFileNameA(tmp, "ffc", 0, path); - ok(r, "GetTempFileNameA error: %d\n", GetLastError()); + ok(r, "GetTempFileNameA error: %ld\n", GetLastError()); DeleteFileA( path ); r = CreateDirectoryA(path, NULL); - ok(r, "CreateDirectoryA error: %d\n", GetLastError()); + ok(r, "CreateDirectoryA error: %ld\n", GetLastError()); filter = FILE_NOTIFY_CHANGE_FILE_NAME; filter |= FILE_NOTIFY_CHANGE_DIR_NAME; handles[0] = FindFirstChangeNotificationA(path, FALSE, filter); - ok(handles[0] != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %d\n", GetLastError()); + ok(handles[0] != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %ld\n", GetLastError()); /* Test behavior if a waiting thread holds the last reference to a change * directory object with an empty wine user APC queue for this thread (bug #7286) */ @@ -385,10 +386,10 @@ static void test_ffcnMultipleThreads(void) /* Create our notification thread */ handles[1] = CreateThread(NULL, 0, NotificationThread, handles[0], 0, &threadId); - ok(handles[1] != NULL, "CreateThread error: %d\n", GetLastError()); + ok(handles[1] != NULL, "CreateThread error: %ld\n", GetLastError()); status = WaitForMultipleObjects(2, handles, FALSE, 5000); - ok(status == WAIT_OBJECT_0 || status == WAIT_OBJECT_0+1, "WaitForMultipleObjects status %d error %d\n", status, GetLastError()); + ok(status == WAIT_OBJECT_0 || status == WAIT_OBJECT_0+1, "WaitForMultipleObjects status %ld error %ld\n", status, GetLastError()); ok(GetExitCodeThread(handles[1], &exitcode), "Could not retrieve thread exit code\n"); /* Clean up */ @@ -614,18 +615,18 @@ static void test_readdirectorychanges(void) /* we may get a notification for the parent dir too */ if (pfni->Action == FILE_ACTION_MODIFIED && pfni->NextEntryOffset) { - ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( pfni->FileNameLength == 3*sizeof(WCHAR), "len wrong %lu\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],3*sizeof(WCHAR)), "name wrong\n" ); pfni = (PFILE_NOTIFY_INFORMATION)((char *)pfni + pfni->NextEntryOffset); } - ok( pfni->NextEntryOffset == 0, "offset wrong %u\n", pfni->NextEntryOffset ); - ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong %u\n", pfni->Action ); - ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); + ok( pfni->NextEntryOffset == 0, "offset wrong %lu\n", pfni->NextEntryOffset ); + ok( pfni->Action == FILE_ACTION_REMOVED, "action wrong %lu\n", pfni->Action ); + ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %lu\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; - ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); + ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %Iu/%lu\n",ov.InternalHigh, dwCount ); CloseHandle(hdir); @@ -799,7 +800,7 @@ static void test_readdirectorychanges_filedir(void) static void CALLBACK readdirectorychanges_cr(DWORD error, DWORD len, LPOVERLAPPED ov) { - ok(error == 0, "ReadDirectoryChangesW error %d\n", error); + ok(error == 0, "ReadDirectoryChangesW error %ld\n", error); ok(ov->hEvent == (void*)0xdeadbeef, "hEvent should not have changed\n"); } @@ -853,9 +854,9 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive file creation event\n"); ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); @@ -873,9 +874,9 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive file move event\n"); ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_REMOVED, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); @@ -889,9 +890,9 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive file move event\n"); ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); @@ -905,9 +906,9 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive file removal event\n"); ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_REMOVED, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); @@ -929,17 +930,17 @@ static void test_readdirectorychanges_cr(void) ok(r != 0, "failed to receive directory move event\n"); if (fni->Action == FILE_ACTION_RENAMED_OLD_NAME) { - ok(fni->Action == FILE_ACTION_RENAMED_OLD_NAME, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_RENAMED_OLD_NAME, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); ok(fni->NextEntryOffset != 0, "no next entry in movement event\n"); fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni_next->Action == FILE_ACTION_RENAMED_NEW_NAME, "Action = %d\n", fni_next->Action); + ok(fni_next->Action == FILE_ACTION_RENAMED_NEW_NAME, "Action = %ld\n", fni_next->Action); ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), - "FileNameLength = %d\n", fni_next->FileNameLength); + "FileNameLength = %ld\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); } @@ -970,9 +971,9 @@ static void test_readdirectorychanges_cr(void) r = SleepEx(1000, TRUE); ok(r != 0, "failed to receive directory creation event\n"); - ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %ld\n", fni->Action); ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), - "FileNameLength = %d\n", fni->FileNameLength); + "FileNameLength = %ld\n", fni->FileNameLength); ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni->FileName, fni->FileNameLength/sizeof(WCHAR))); if (fni->NextEntryOffset) @@ -988,9 +989,9 @@ static void test_readdirectorychanges_cr(void) fni_next = fni; } ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); - ok(fni_next->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni_next->Action); + ok(fni_next->Action == FILE_ACTION_REMOVED, "Action = %ld\n", fni_next->Action); ok(fni_next->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), - "FileNameLength = %d\n", fni_next->FileNameLength); + "FileNameLength = %ld\n", fni_next->FileNameLength); ok(!memcmp(fni_next->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), "FileName = %s\n", wine_dbgstr_wn(fni_next->FileName, fni_next->FileNameLength/sizeof(WCHAR))); @@ -1010,21 +1011,21 @@ static void test_ffcn_directory_overlap(void) /* Setup directory hierarchy */ ret = GetTempPathA(MAX_PATH, workdir); ok((ret > 0) && (ret <= MAX_PATH), - "GetTempPathA error: %d\n", GetLastError()); + "GetTempPathA error: %ld\n", GetLastError()); ret = GetTempFileNameA(workdir, "fcn", 0, tempfile); - ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ok(ret, "GetTempFileNameA error: %ld\n", GetLastError()); ret = DeleteFileA(tempfile); - ok(ret, "DeleteFileA error: %d\n", GetLastError()); + ok(ret, "DeleteFileA error: %ld\n", GetLastError()); lstrcpyA(parentdir, tempfile); ret = CreateDirectoryA(parentdir, NULL); - ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); lstrcpyA(childdir, parentdir); lstrcatA(childdir, "\\c"); ret = CreateDirectoryA(childdir, NULL); - ok(ret, "CreateDirectoryA error: %d\n", GetLastError()); + ok(ret, "CreateDirectoryA error: %ld\n", GetLastError()); /* When recursively watching overlapping directories, changes in child @@ -1036,7 +1037,7 @@ static void test_ffcn_directory_overlap(void) /* Create a file in child */ ret = GetTempFileNameA(childdir, "fcn", 0, tempfile); - ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ok(ret, "GetTempFileNameA error: %ld\n", GetLastError()); /* Both watches should trigger */ ret = FinishNotificationThread(parent_thread); @@ -1045,7 +1046,7 @@ static void test_ffcn_directory_overlap(void) ok(ret, "Missed child notification\n"); ret = DeleteFileA(tempfile); - ok(ret, "DeleteFileA error: %d\n", GetLastError()); + ok(ret, "DeleteFileA error: %ld\n", GetLastError()); /* Removing a recursive parent watch should not affect child watches. Doing @@ -1053,22 +1054,22 @@ static void test_ffcn_directory_overlap(void) parent_watch = FindFirstChangeNotificationA(parentdir, TRUE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(parent_watch != INVALID_HANDLE_VALUE, - "FindFirstChangeNotification error: %d\n", GetLastError()); + "FindFirstChangeNotification error: %ld\n", GetLastError()); child_watch = FindFirstChangeNotificationA(childdir, TRUE, FILE_NOTIFY_CHANGE_FILE_NAME); ok(child_watch != INVALID_HANDLE_VALUE, - "FindFirstChangeNotification error: %d\n", GetLastError()); + "FindFirstChangeNotification error: %ld\n", GetLastError()); ret = FindCloseChangeNotification(parent_watch); - ok(ret, "FindCloseChangeNotification error: %d\n", GetLastError()); + ok(ret, "FindCloseChangeNotification error: %ld\n", GetLastError()); child_thread = CreateThread(NULL, 0, NotificationThread, child_watch, 0, &threadId); - ok(child_thread != NULL, "CreateThread error: %d\n", GetLastError()); + ok(child_thread != NULL, "CreateThread error: %ld\n", GetLastError()); /* Create a file in child */ ret = GetTempFileNameA(childdir, "fcn", 0, tempfile); - ok(ret, "GetTempFileNameA error: %d\n", GetLastError()); + ok(ret, "GetTempFileNameA error: %ld\n", GetLastError()); /* Child watch should trigger */ ret = FinishNotificationThread(child_thread); @@ -1076,13 +1077,13 @@ static void test_ffcn_directory_overlap(void) /* clean up */ ret = DeleteFileA(tempfile); - ok(ret, "DeleteFileA error: %d\n", GetLastError()); + ok(ret, "DeleteFileA error: %ld\n", GetLastError()); ret = RemoveDirectoryA(childdir); - ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); ret = RemoveDirectoryA(parentdir); - ok(ret, "RemoveDirectoryA error: %d\n", GetLastError()); + ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); } START_TEST(change) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 0ae272311bb..147413402e5 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -18,6 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "wine/test.h" #include "winbase.h" @@ -122,14 +123,14 @@ static void test_conversions(void) SETUP_ZEROTIME(st) ok (SystemTimeToFileTime(&st, &ft), "Conversion failed ZERO_TIME\n"); ok( (!((ft.dwHighDateTime != 0) || (ft.dwLowDateTime != 0))), - "Wrong time for ATIME: %08x %08x (correct %08x %08x)\n", + "Wrong time for ATIME: %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime, ft.dwHighDateTime, 0, 0); SETUP_ATIME(st) ok (SystemTimeToFileTime(&st,&ft), "Conversion Failed ATIME\n"); ok( (!((ft.dwHighDateTime != ATIME_HI) || (ft.dwLowDateTime!=ATIME_LOW))), - "Wrong time for ATIME: %08x %08x (correct %08x %08x)\n", + "Wrong time for ATIME: %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime, ft.dwHighDateTime, ATIME_LOW, ATIME_HI); @@ -138,7 +139,7 @@ static void test_conversions(void) ok( (!((ft.dwHighDateTime != MAYDAY_2002_HI) || (ft.dwLowDateTime!=MAYDAY_2002_LO))), - "Wrong time for 2002 %08x %08x (correct %08x %08x)\n", ft.dwLowDateTime, + "Wrong time for 2002 %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime, ft.dwHighDateTime, MAYDAY_2002_LO, MAYDAY_2002_HI); @@ -147,7 +148,7 @@ static void test_conversions(void) ok( (!((ft.dwHighDateTime!=NEWYEAR_1980_HI) || (ft.dwLowDateTime!=NEWYEAR_1980_LO))) , - "Wrong time for 1980 %08x %08x (correct %08x %08x)\n", ft.dwLowDateTime, + "Wrong time for 1980 %08lx %08lx (correct %08x %08x)\n", ft.dwLowDateTime, ft.dwHighDateTime, NEWYEAR_1980_LO,NEWYEAR_1980_HI ); ok(DosDateTimeToFileTime(DOS_DATE(1980,1,1),DOS_TIME(0,0,0),&ft), @@ -155,7 +156,7 @@ static void test_conversions(void) ok( (!((ft.dwHighDateTime!=NEWYEAR_1980_HI) || (ft.dwLowDateTime!=NEWYEAR_1980_LO))), - "Wrong time DosDateTimeToFileTime %08x %08x (correct %08x %08x)\n", + "Wrong time DosDateTimeToFileTime %08lx %08lx (correct %08x %08x)\n", ft.dwHighDateTime, ft.dwLowDateTime, NEWYEAR_1980_HI, NEWYEAR_1980_LO); } @@ -173,7 +174,7 @@ static void test_invalid_arg(void) "DosDateTimeToFileTime() failed\n"); ok( (ft.dwHighDateTime==NEWYEAR_1980_HI) && (ft.dwLowDateTime==NEWYEAR_1980_LO), - "filetime for 1/1/80 00:00:00 was %08x %08x\n", ft.dwHighDateTime, ft.dwLowDateTime); + "filetime for 1/1/80 00:00:00 was %08lx %08lx\n", ft.dwHighDateTime, ft.dwLowDateTime); /* now check SystemTimeToFileTime */ memset(&ft,0,sizeof ft); @@ -206,7 +207,7 @@ static LONGLONG system_time_to_minutes(const SYSTEMTIME *st) SetLastError(0xdeadbeef); ret = SystemTimeToFileTime(st, &ft); - ok(ret, "SystemTimeToFileTime error %u\n", GetLastError()); + ok(ret, "SystemTimeToFileTime error %lu\n", GetLastError()); minutes = ((LONGLONG)ft.dwHighDateTime << 32) + ft.dwLowDateTime; minutes /= (LONGLONG)600000000; /* convert to minutes */ @@ -226,7 +227,7 @@ static LONG get_tz_bias(const TIME_ZONE_INFORMATION *tzinfo, DWORD tz_id) return tzinfo->StandardBias; default: - trace("unknown time zone id %d\n", tz_id); + trace("unknown time zone id %ld\n", tz_id); /* fall through */ case TIME_ZONE_ID_UNKNOWN: return 0; @@ -249,19 +250,19 @@ static void test_GetTimeZoneInformation(void) SetLastError(0xdeadbeef); res = SystemTimeToFileTime(&st, &s_ft); - ok(res, "SystemTimeToFileTime error %u\n", GetLastError()); + ok(res, "SystemTimeToFileTime error %lu\n", GetLastError()); SetLastError(0xdeadbeef); res = FileTimeToLocalFileTime(&s_ft, &l_ft); - ok(res, "FileTimeToLocalFileTime error %u\n", GetLastError()); + ok(res, "FileTimeToLocalFileTime error %lu\n", GetLastError()); SetLastError(0xdeadbeef); res = FileTimeToSystemTime(&l_ft, &local); - ok(res, "FileTimeToSystemTime error %u\n", GetLastError()); + ok(res, "FileTimeToSystemTime error %lu\n", GetLastError()); l_time = system_time_to_minutes(&local); tz_id = GetTimeZoneInformation(&tzinfo); ok(tz_id != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n"); - trace("tz_id %u (%s)\n", tz_id, + trace("tz_id %lu (%s)\n", tz_id, tz_id == TIME_ZONE_ID_DAYLIGHT ? "TIME_ZONE_ID_DAYLIGHT" : (tz_id == TIME_ZONE_ID_STANDARD ? "TIME_ZONE_ID_STANDARD" : (tz_id == TIME_ZONE_ID_UNKNOWN ? "TIME_ZONE_ID_UNKNOWN" : @@ -269,14 +270,14 @@ static void test_GetTimeZoneInformation(void) WideCharToMultiByte(CP_ACP, 0, tzinfo.StandardName, -1, std_name, sizeof(std_name), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, tzinfo.DaylightName, -1, dlt_name, sizeof(dlt_name), NULL, NULL); - trace("bias %d, %s - %s\n", tzinfo.Bias, std_name, dlt_name); - trace("standard (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", + trace("bias %ld, %s - %s\n", tzinfo.Bias, std_name, dlt_name); + trace("standard (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %ld\n", tzinfo.StandardDate.wDay, tzinfo.StandardDate.wMonth, tzinfo.StandardDate.wYear, tzinfo.StandardDate.wDayOfWeek, tzinfo.StandardDate.wHour, tzinfo.StandardDate.wMinute, tzinfo.StandardDate.wSecond, tzinfo.StandardDate.wMilliseconds, tzinfo.StandardBias); - trace("daylight (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", + trace("daylight (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %ld\n", tzinfo.DaylightDate.wDay, tzinfo.DaylightDate.wMonth, tzinfo.DaylightDate.wYear, tzinfo.DaylightDate.wDayOfWeek, tzinfo.DaylightDate.wHour, tzinfo.DaylightDate.wMinute, @@ -285,7 +286,7 @@ static void test_GetTimeZoneInformation(void) diff = (LONG)(s_time - l_time); ok(diff == tzinfo.Bias + get_tz_bias(&tzinfo, tz_id), - "system/local diff %d != tz bias %d\n", + "system/local diff %ld != tz bias %ld\n", diff, tzinfo.Bias + get_tz_bias(&tzinfo, tz_id)); ok(SetEnvironmentVariableA("TZ","GMT0") != 0, @@ -317,16 +318,16 @@ static void test_GetTimeZoneInformation(void) return; } - ok(res, "SystemTimeToTzSpecificLocalTime error %u\n", GetLastError()); + ok(res, "SystemTimeToTzSpecificLocalTime error %lu\n", GetLastError()); s_time = system_time_to_minutes(&current); tzinfo.StandardBias -= 123; tzinfo.DaylightBias += 456; res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &local); - ok(res, "SystemTimeToTzSpecificLocalTime error %u\n", GetLastError()); + ok(res, "SystemTimeToTzSpecificLocalTime error %lu\n", GetLastError()); l_time = system_time_to_minutes(&local); - ok(l_time - s_time == diff - get_tz_bias(&tzinfo, tz_id), "got %d, expected %d\n", + ok(l_time - s_time == diff - get_tz_bias(&tzinfo, tz_id), "got %ld, expected %ld\n", (LONG)(l_time - s_time), diff - get_tz_bias(&tzinfo, tz_id)); /* pretend that there is no transition dates */ @@ -338,9 +339,9 @@ static void test_GetTimeZoneInformation(void) tzinfo.StandardDate.wYear = 0; res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &local); - ok(res, "SystemTimeToTzSpecificLocalTime error %u\n", GetLastError()); + ok(res, "SystemTimeToTzSpecificLocalTime error %lu\n", GetLastError()); l_time = system_time_to_minutes(&local); - ok(l_time - s_time == diff, "got %d, expected %d\n", + ok(l_time - s_time == diff, "got %ld, expected %ld\n", (LONG)(l_time - s_time), diff); /* test 23:01, 31st of December date */ @@ -361,7 +362,7 @@ static void test_GetTimeZoneInformation(void) utc.wHour = 23; utc.wMinute = 1; res = pSystemTimeToTzSpecificLocalTime(&tzinfo, &utc, &local); - ok(res, "SystemTimeToTzSpecificLocalTime error %u\n", GetLastError()); + ok(res, "SystemTimeToTzSpecificLocalTime error %lu\n", GetLastError()); ok(local.wYear==2012 && local.wMonth==12 && local.wDay==31 && local.wHour==23 && local.wMinute==1, "got (%d-%d-%d %02d:%02d), expected (2012-12-31 23:01)\n", local.wYear, local.wMonth, local.wDay, local.wHour, local.wMinute); @@ -378,7 +379,7 @@ static void test_FileTimeToSystemTime(void) ft.dwLowDateTime = 0; ret = FileTimeToSystemTime(&ft, &st); ok( ret, - "FileTimeToSystemTime() failed with Error %d\n",GetLastError()); + "FileTimeToSystemTime() failed with Error %ld\n",GetLastError()); ok(((st.wYear == 1601) && (st.wMonth == 1) && (st.wDay == 1) && (st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 0) && (st.wMilliseconds == 0)), @@ -388,7 +389,7 @@ static void test_FileTimeToSystemTime(void) ft.dwLowDateTime = (UINT)time; ret = FileTimeToSystemTime(&ft, &st); ok( ret, - "FileTimeToSystemTime() failed with Error %d\n",GetLastError()); + "FileTimeToSystemTime() failed with Error %ld\n",GetLastError()); ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) && (st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) && (st.wMilliseconds == 0)), @@ -415,7 +416,7 @@ static void test_FileTimeToLocalFileTime(void) ft.dwLowDateTime = (UINT)time; ret = FileTimeToLocalFileTime(&ft, &lft); ok( ret, - "FileTimeToLocalFileTime() failed with Error %d\n",GetLastError()); + "FileTimeToLocalFileTime() failed with Error %ld\n",GetLastError()); FileTimeToSystemTime(&lft, &st); ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) && (st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) && @@ -429,7 +430,7 @@ static void test_FileTimeToLocalFileTime(void) ok(res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n"); ret = FileTimeToLocalFileTime(&ft, &lft); ok( ret, - "FileTimeToLocalFileTime() failed with Error %d\n",GetLastError()); + "FileTimeToLocalFileTime() failed with Error %ld\n",GetLastError()); FileTimeToSystemTime(&lft, &st); ok(((st.wYear == 1970) && (st.wMonth == 1) && (st.wDay == 1) && (st.wHour == 0) && (st.wMinute == 0) && (st.wSecond == 1) && @@ -647,25 +648,25 @@ static void test_FileTimeToDosDateTime(void) ret = FileTimeToDosDateTime(&ft, NULL, NULL); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = FileTimeToDosDateTime(&ft, &fatdate, NULL); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = FileTimeToDosDateTime(&ft, NULL, &fattime); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = FileTimeToDosDateTime(&ft, &fatdate, &fattime); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } static void test_GetCalendarInfo(void) @@ -683,57 +684,57 @@ static void test_GetCalendarInfo(void) ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, 0, &val1 ); - ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoA failed err %lu\n", GetLastError() ); ok( ret == sizeof(val1), "wrong size %u\n", ret ); - ok( val1 >= 2000 && val1 < 2100, "wrong value %u\n", val1 ); + ok( val1 >= 2000 && val1 < 2100, "wrong value %lu\n", val1 ); ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, 0, &val2 ); - ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoW failed err %lu\n", GetLastError() ); ok( ret == sizeof(val2)/sizeof(WCHAR), "wrong size %u\n", ret ); - ok( val1 == val2, "A/W mismatch %u/%u\n", val1, val2 ); + ok( val1 == val2, "A/W mismatch %lu/%lu\n", val1, val2 ); ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferA, sizeof(bufferA), NULL ); - ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoA failed err %lu\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); - ok( atoi( bufferA ) == val1, "wrong value %s/%u\n", bufferA, val1 ); + ok( atoi( bufferA ) == val1, "wrong value %s/%lu\n", bufferA, val1 ); ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferW, ARRAY_SIZE(bufferW), NULL ); - ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoW failed err %lu\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); memset( bufferA, 0x55, sizeof(bufferA) ); WideCharToMultiByte( CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL ); - ok( atoi( bufferA ) == val1, "wrong value %s/%u\n", bufferA, val1 ); + ok( atoi( bufferA ) == val1, "wrong value %s/%lu\n", bufferA, val1 ); ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, 0, NULL ); ok( !ret, "GetCalendarInfoA succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); - ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoA failed err %lu\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, NULL, 0, NULL ); ok( !ret, "GetCalendarInfoW succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); - ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoW failed err %lu\n", GetLastError() ); ok( ret == 5, "wrong size %u\n", ret ); ret = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, bufferA, sizeof(bufferA), NULL); - ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret, "GetCalendarInfoA failed err %lu\n", GetLastError() ); ret2 = pGetCalendarInfoA( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, bufferA, 0, NULL); - ok( ret2, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret2, "GetCalendarInfoA failed err %lu\n", GetLastError() ); ok( ret == ret2, "got %d, expected %d\n", ret2, ret ); ret2 = pGetCalendarInfoW( LANG_SYSTEM_DEFAULT, CAL_GREGORIAN, CAL_SDAYNAME1, bufferW, ARRAY_SIZE(bufferW), NULL); - ok( ret2, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret2, "GetCalendarInfoW failed err %lu\n", GetLastError() ); ret2 = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); ok( ret == ret2, "got %d, expected %d\n", ret, ret2 ); } @@ -752,13 +753,13 @@ static void test_GetDynamicTimeZoneInformation(void) ret = pGetDynamicTimeZoneInformation(&dyninfo); ret2 = GetTimeZoneInformation(&tzinfo); - ok(ret == ret2, "got %d, %d\n", ret, ret2); + ok(ret == ret2, "got %ld, %ld\n", ret, ret2); - ok(dyninfo.Bias == tzinfo.Bias, "got %d, %d\n", dyninfo.Bias, tzinfo.Bias); + ok(dyninfo.Bias == tzinfo.Bias, "got %ld, %ld\n", dyninfo.Bias, tzinfo.Bias); ok(!lstrcmpW(dyninfo.StandardName, tzinfo.StandardName), "got std name %s, %s\n", wine_dbgstr_w(dyninfo.StandardName), wine_dbgstr_w(tzinfo.StandardName)); ok(!memcmp(&dyninfo.StandardDate, &tzinfo.StandardDate, sizeof(dyninfo.StandardDate)), "got different StandardDate\n"); - ok(dyninfo.StandardBias == tzinfo.StandardBias, "got %d, %d\n", dyninfo.StandardBias, tzinfo.StandardBias); + ok(dyninfo.StandardBias == tzinfo.StandardBias, "got %ld, %ld\n", dyninfo.StandardBias, tzinfo.StandardBias); ok(!lstrcmpW(dyninfo.DaylightName, tzinfo.DaylightName), "got daylight name %s, %s\n", wine_dbgstr_w(dyninfo.DaylightName), wine_dbgstr_w(tzinfo.DaylightName)); ok(!memcmp(&dyninfo.DaylightDate, &tzinfo.DaylightDate, sizeof(dyninfo.DaylightDate)), "got different DaylightDate\n"); @@ -856,7 +857,7 @@ static void test_GetSystemTimes(void) ok( !NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength), "NtQuerySystemInformation failed\n" ); - ok( sizeof(sbi) == ReturnLength, "Inconsistent length %d\n", ReturnLength ); + ok( sizeof(sbi) == ReturnLength, "Inconsistent length %ld\n", ReturnLength ); /* Check if we have some return values */ trace( "Number of Processors : %d\n", sbi.NumberOfProcessors ); @@ -972,30 +973,30 @@ static void test_GetTimeZoneInformationForYear(void) GetTimeZoneInformation(&local_tzinfo); ret = pGetTimeZoneInformationForYear(systemtime.wYear, NULL, &tzinfo); - ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); - ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %d, got %d\n", local_tzinfo.Bias, tzinfo.Bias); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %lu\n", GetLastError()); + ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %ld, got %ld\n", local_tzinfo.Bias, tzinfo.Bias); ok(!lstrcmpW(tzinfo.StandardName, local_tzinfo.StandardName), "Expected StandardName %s, got %s\n", wine_dbgstr_w(local_tzinfo.StandardName), wine_dbgstr_w(tzinfo.StandardName)); ok(!memcmp(&tzinfo.StandardDate, &local_tzinfo.StandardDate, sizeof(SYSTEMTIME)), "StandardDate does not match\n"); - ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %d, got %d\n", local_tzinfo.StandardBias, tzinfo.StandardBias); + ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %ld, got %ld\n", local_tzinfo.StandardBias, tzinfo.StandardBias); ok(!lstrcmpW(tzinfo.DaylightName, local_tzinfo.DaylightName), "Expected DaylightName %s, got %s\n", wine_dbgstr_w(local_tzinfo.DaylightName), wine_dbgstr_w(tzinfo.DaylightName)); ok(!memcmp(&tzinfo.DaylightDate, &local_tzinfo.DaylightDate, sizeof(SYSTEMTIME)), "DaylightDate does not match\n"); - ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %d, got %d\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); + ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %ld, got %ld\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); pGetDynamicTimeZoneInformation(&dyn_tzinfo); ret = pGetTimeZoneInformationForYear(systemtime.wYear, &dyn_tzinfo, &tzinfo); - ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); - ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %d, got %d\n", local_tzinfo.Bias, tzinfo.Bias); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %lu\n", GetLastError()); + ok(tzinfo.Bias == local_tzinfo.Bias, "Expected Bias %ld, got %ld\n", local_tzinfo.Bias, tzinfo.Bias); ok(!lstrcmpW(tzinfo.StandardName, local_tzinfo.StandardName), "Expected StandardName %s, got %s\n", wine_dbgstr_w(local_tzinfo.StandardName), wine_dbgstr_w(tzinfo.StandardName)); ok(!memcmp(&tzinfo.StandardDate, &local_tzinfo.StandardDate, sizeof(SYSTEMTIME)), "StandardDate does not match\n"); - ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %d, got %d\n", local_tzinfo.StandardBias, tzinfo.StandardBias); + ok(tzinfo.StandardBias == local_tzinfo.StandardBias, "Expected StandardBias %ld, got %ld\n", local_tzinfo.StandardBias, tzinfo.StandardBias); ok(!lstrcmpW(tzinfo.DaylightName, local_tzinfo.DaylightName), "Expected DaylightName %s, got %s\n", wine_dbgstr_w(local_tzinfo.DaylightName), wine_dbgstr_w(tzinfo.DaylightName)); ok(!memcmp(&tzinfo.DaylightDate, &local_tzinfo.DaylightDate, sizeof(SYSTEMTIME)), "DaylightDate does not match\n"); - ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %d, got %d\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); + ok(tzinfo.DaylightBias == local_tzinfo.DaylightBias, "Expected DaylightBias %ld, got %ld\n", local_tzinfo.DaylightBias, tzinfo.DaylightBias); memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); lstrcpyW(dyn_tzinfo.TimeZoneKeyName, L"Greenland Daylight Time"); @@ -1005,7 +1006,7 @@ static void test_GetTimeZoneInformationForYear(void) broken_test = TRUE; ok((ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(broken_test) /* vista,7 */, - "GetTimeZoneInformationForYear err %u\n", GetLastError()); + "GetTimeZoneInformationForYear err %lu\n", GetLastError()); memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); lstrcpyW(dyn_tzinfo.TimeZoneKeyName, L"Altai Standard Time"); @@ -1014,7 +1015,7 @@ static void test_GetTimeZoneInformationForYear(void) if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) broken_test = TRUE; ok(ret == TRUE || broken(broken_test) /* before 10 1809 */, - "GetTimeZoneInformationForYear err %u\n", GetLastError()); + "GetTimeZoneInformationForYear err %lu\n", GetLastError()); if (broken(broken_test)) { @@ -1031,11 +1032,11 @@ static void test_GetTimeZoneInformationForYear(void) ret = pGetTimeZoneInformationForYear(test_data[i].year, &dyn_tzinfo, &tzinfo); todo_wine_if(test_data[i].tzinfo_todo) - ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u, for %s\n", GetLastError(), wine_dbgstr_w(test_data[i].tzname)); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %lu, for %s\n", GetLastError(), wine_dbgstr_w(test_data[i].tzname)); if (!ret) continue; todo_wine_if(test_data[i].bias_todo) - ok(tzinfo.Bias == test_data[i].bias, "Expected bias %d, got %d, for %s\n", + ok(tzinfo.Bias == test_data[i].bias, "Expected bias %ld, got %ld, for %s\n", test_data[i].bias, tzinfo.Bias, wine_dbgstr_w(test_data[i].tzname)); todo_wine_if(test_data[i].std_month_todo) ok(tzinfo.StandardDate.wMonth == test_data[i].std_month, "Expected standard month %d, got %d, for %s\n", @@ -1045,7 +1046,7 @@ static void test_GetTimeZoneInformationForYear(void) ok(std_day == test_data[i].std_day, "Expected standard day %d, got %d, for %s\n", test_data[i].std_day, std_day, wine_dbgstr_w(test_data[i].tzname)); todo_wine_if(test_data[i].std_bias_todo) - ok(tzinfo.StandardBias == test_data[i].std_bias, "Expected standard bias %d, got %d, for %s\n", + ok(tzinfo.StandardBias == test_data[i].std_bias, "Expected standard bias %ld, got %ld, for %s\n", test_data[i].std_bias, tzinfo.StandardBias, wine_dbgstr_w(test_data[i].tzname)); todo_wine_if(test_data[i].dlt_month_todo) ok(tzinfo.DaylightDate.wMonth == test_data[i].dlt_month, "Expected daylight month %d, got %d, for %s\n", @@ -1055,7 +1056,7 @@ static void test_GetTimeZoneInformationForYear(void) ok(dlt_day == test_data[i].dlt_day, "Expected daylight day %d, got %d, for %s\n", test_data[i].dlt_day, dlt_day, wine_dbgstr_w(test_data[i].tzname)); todo_wine_if(test_data[i].dlt_bias_todo) - ok(tzinfo.DaylightBias == test_data[i].dlt_bias, "Expected daylight bias %d, got %d, for %s\n", + ok(tzinfo.DaylightBias == test_data[i].dlt_bias, "Expected daylight bias %ld, got %ld, for %s\n", test_data[i].dlt_bias, tzinfo.DaylightBias, wine_dbgstr_w(test_data[i].tzname)); if (i > 0 && test_data[i-1].tzname == test_data[i].tzname) @@ -1090,8 +1091,8 @@ static void test_GetTickCount(void) t3 = pNtGetTickCount(); } while(t3 < t1 && i++ < 1); /* allow for wrap, but only once */ - ok(t1 <= t2, "out of order %d %d\n", t1, t2); - ok(t2 <= t3, "out of order %d %d\n", t2, t3); + ok(t1 <= t2, "out of order %ld %ld\n", t1, t2); + ok(t2 <= t3, "out of order %ld %ld\n", t2, t3); } BOOL (WINAPI *pQueryUnbiasedInterruptTime)(ULONGLONG *time); @@ -1106,22 +1107,22 @@ static void test_QueryUnbiasedInterruptTime(void) { SetLastError( 0xdeadbeef ); ret = pQueryUnbiasedInterruptTime( &time ); - ok( ret, "QueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + ok( ret, "QueryUnbiasedInterruptTime failed err %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = pQueryUnbiasedInterruptTime( NULL ); ok( !ret, "QueryUnbiasedInterruptTime succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); } else win_skip( "QueryUnbiasedInterruptTime not supported\n" ); if (pRtlQueryUnbiasedInterruptTime) { SetLastError( 0xdeadbeef ); ret = pRtlQueryUnbiasedInterruptTime( &time ); - ok( ret, "RtlQueryUnbiasedInterruptTime failed err %u\n", GetLastError() ); + ok( ret, "RtlQueryUnbiasedInterruptTime failed err %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = pRtlQueryUnbiasedInterruptTime( NULL ); ok( !ret, "RtlQueryUnbiasedInterruptTime succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %lu\n", GetLastError() ); } else win_skip( "RtlQueryUnbiasedInterruptTime not supported\n" ); }

2 1

[PATCH 1/4] windows.gaming.input: Implement CreateGameController for RawGameController runtimeclass.
by Rémi Bernon 09 Mar '22

09 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/controller.c | 242 ++++++++++++++++++++++++- dlls/windows.gaming.input/manager.c | 36 +++- dlls/windows.gaming.input/private.h | 34 ++-- 3 files changed, 288 insertions(+), 24 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 94343c0927d..9b08528b01b 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -18,11 +18,237 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(input); +struct controller +{ + IGameControllerImpl IGameControllerImpl_iface; + IGameControllerInputSink IGameControllerInputSink_iface; + IRawGameController IRawGameController_iface; + IGameController *IGameController_outer; + LONG ref; + + IGameControllerProvider *provider; +}; + +static inline struct controller *impl_from_IGameControllerImpl( IGameControllerImpl *iface ) +{ + return CONTAINING_RECORD( iface, struct controller, IGameControllerImpl_iface ); +} + +static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REFIID iid, void **out ) +{ + struct controller *impl = impl_from_IGameControllerImpl( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IGameControllerImpl )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerImpl_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGameControllerInputSink )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerInputSink_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IRawGameController )) + { + IInspectable_AddRef( (*out = &impl->IRawGameController_iface) ); + return S_OK; + } + + WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI controller_AddRef( IGameControllerImpl *iface ) +{ + struct controller *impl = impl_from_IGameControllerImpl( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI controller_Release( IGameControllerImpl *iface ) +{ + struct controller *impl = impl_from_IGameControllerImpl( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + IGameControllerProvider_Release( impl->provider ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI controller_GetIids( IGameControllerImpl *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetRuntimeClassName( IGameControllerImpl *iface, HSTRING *class_name ) +{ + return WindowsCreateString( RuntimeClass_Windows_Gaming_Input_RawGameController, + ARRAY_SIZE(RuntimeClass_Windows_Gaming_Input_RawGameController), + class_name ); +} + +static HRESULT WINAPI controller_GetTrustLevel( IGameControllerImpl *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameController *outer, + IGameControllerProvider *provider ) +{ + struct controller *impl = impl_from_IGameControllerImpl( iface ); + + TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); + + impl->IGameController_outer = outer; + IGameControllerProvider_AddRef( (impl->provider = provider) ); + + return S_OK; +} + +static const struct IGameControllerImplVtbl controller_vtbl = +{ + controller_QueryInterface, + controller_AddRef, + controller_Release, + /* IInspectable methods */ + controller_GetIids, + controller_GetRuntimeClassName, + controller_GetTrustLevel, + /* IGameControllerImpl methods */ + controller_Initialize, +}; + +DEFINE_IINSPECTABLE_OUTER( input_sink, IGameControllerInputSink, struct controller, IGameController_outer ) + +static HRESULT WINAPI input_sink_OnInputResumed( IGameControllerInputSink *iface, UINT64 timestamp ) +{ + FIXME( "iface %p, timestamp %I64u stub!\n", iface, timestamp ); + return E_NOTIMPL; +} + +static HRESULT WINAPI input_sink_OnInputSuspended( IGameControllerInputSink *iface, UINT64 timestamp ) +{ + FIXME( "iface %p, timestamp %I64u stub!\n", iface, timestamp ); + return E_NOTIMPL; +} + +static const struct IGameControllerInputSinkVtbl input_sink_vtbl = +{ + input_sink_QueryInterface, + input_sink_AddRef, + input_sink_Release, + /* IInspectable methods */ + input_sink_GetIids, + input_sink_GetRuntimeClassName, + input_sink_GetTrustLevel, + /* IGameControllerInputSink methods */ + input_sink_OnInputResumed, + input_sink_OnInputSuspended, +}; + +DEFINE_IINSPECTABLE_OUTER( raw_controller, IRawGameController, struct controller, IGameController_outer ) + +static HRESULT WINAPI raw_controller_get_AxisCount( IRawGameController *iface, INT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_get_ButtonCount( IRawGameController *iface, INT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_get_ForceFeedbackMotors( IRawGameController *iface, IVectorView_ForceFeedbackMotor **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_get_HardwareProductId( IRawGameController *iface, UINT16 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_get_HardwareVendorId( IRawGameController *iface, UINT16 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_get_SwitchCount( IRawGameController *iface, INT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_GetButtonLabel( IRawGameController *iface, INT32 index, + enum GameControllerButtonLabel *value ) +{ + FIXME( "iface %p, index %d, value %p stub!\n", iface, index, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_GetCurrentReading( IRawGameController *iface, UINT32 buttons_size, BOOLEAN *buttons, + UINT32 switches_size, enum GameControllerSwitchPosition *switches, + UINT32 axes_size, DOUBLE *axes, UINT64 *timestamp ) +{ + FIXME( "iface %p, buttons_size %u, buttons %p, switches_size %u, switches %p, axes_size %u, axes %p, timestamp %p stub!\n", + iface, buttons_size, buttons, switches_size, switches, axes_size, axes, timestamp ); + return E_NOTIMPL; +} + +static HRESULT WINAPI raw_controller_GetSwitchKind( IRawGameController *iface, INT32 index, enum GameControllerSwitchKind *value ) +{ + FIXME( "iface %p, index %d, value %p stub!\n", iface, index, value ); + return E_NOTIMPL; +} + +static const struct IRawGameControllerVtbl raw_controller_vtbl = +{ + raw_controller_QueryInterface, + raw_controller_AddRef, + raw_controller_Release, + /* IInspectable methods */ + raw_controller_GetIids, + raw_controller_GetRuntimeClassName, + raw_controller_GetTrustLevel, + /* IRawGameController methods */ + raw_controller_get_AxisCount, + raw_controller_get_ButtonCount, + raw_controller_get_ForceFeedbackMotors, + raw_controller_get_HardwareProductId, + raw_controller_get_HardwareVendorId, + raw_controller_get_SwitchCount, + raw_controller_GetButtonLabel, + raw_controller_GetCurrentReading, + raw_controller_GetSwitchKind, +}; + struct controller_statics { IActivationFactory IActivationFactory_iface; @@ -213,8 +439,20 @@ DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct co static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, IInspectable **value ) { - FIXME( "iface %p, provider %p, value %p stub!\n", iface, provider, value ); - return E_NOTIMPL; + struct controller *impl; + + TRACE( "iface %p, provider %p, value %p.\n", iface, provider, value ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl; + impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl; + impl->IRawGameController_iface.lpVtbl = &raw_controller_vtbl; + impl->ref = 1; + + TRACE( "created RawGameController %p\n", impl ); + + *value = (IInspectable *)&impl->IGameControllerImpl_iface; + return S_OK; } static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value ) diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index f5b5654a4c6..489588a68ab 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -40,6 +40,7 @@ struct controller { IGameController IGameController_iface; IGameControllerBatteryInfo IGameControllerBatteryInfo_iface; + IInspectable *IInspectable_inner; LONG ref; struct list entry; @@ -73,9 +74,7 @@ static HRESULT WINAPI controller_QueryInterface( IGameController *iface, REFIID return S_OK; } - FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); - *out = NULL; - return E_NOINTERFACE; + return IInspectable_QueryInterface( impl->IInspectable_inner, iid, out ); } static ULONG WINAPI controller_AddRef( IGameController *iface ) @@ -95,6 +94,9 @@ static ULONG WINAPI controller_Release( IGameController *iface ) if (!ref) { + /* guard against re-entry if inner releases an outer iface */ + InterlockedIncrement( &impl->ref ); + IInspectable_Release( impl->IInspectable_inner ); ICustomGameControllerFactory_Release( impl->factory ); IGameControllerProvider_Release( impl->provider ); free( impl ); @@ -111,14 +113,14 @@ static HRESULT WINAPI controller_GetIids( IGameController *iface, ULONG *iid_cou static HRESULT WINAPI controller_GetRuntimeClassName( IGameController *iface, HSTRING *class_name ) { - FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); - return E_NOTIMPL; + struct controller *impl = impl_from_IGameController( iface ); + return IInspectable_GetRuntimeClassName( impl->IInspectable_inner, class_name ); } static HRESULT WINAPI controller_GetTrustLevel( IGameController *iface, TrustLevel *trust_level ) { - FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); - return E_NOTIMPL; + struct controller *impl = impl_from_IGameController( iface ); + return IInspectable_GetTrustLevel( impl->IInspectable_inner, trust_level ); } static HRESULT WINAPI controller_add_HeadsetConnected( IGameController *iface, ITypedEventHandler_IGameController_Headset *handler, @@ -421,13 +423,33 @@ IGameControllerFactoryManagerStatics2 *manager_factory = &manager_statics.IGameC static HRESULT controller_create( ICustomGameControllerFactory *factory, IGameControllerProvider *provider, struct controller **out ) { + IGameControllerImpl *inner_impl; struct controller *impl; + HRESULT hr; if (!(impl = malloc(sizeof(*impl)))) return E_OUTOFMEMORY; impl->IGameController_iface.lpVtbl = &controller_vtbl; impl->IGameControllerBatteryInfo_iface.lpVtbl = &battery_vtbl; impl->ref = 1; + if (FAILED(hr = ICustomGameControllerFactory_CreateGameController( factory, provider, &impl->IInspectable_inner ))) + WARN( "Failed to create game controller, hr %#lx\n", hr ); + else if (FAILED(hr = IInspectable_QueryInterface( impl->IInspectable_inner, &IID_IGameControllerImpl, (void **)&inner_impl ))) + WARN( "Failed to find IGameControllerImpl iface, hr %#lx\n", hr ); + else + { + if (FAILED(hr = IGameControllerImpl_Initialize( inner_impl, &impl->IGameController_iface, provider ))) + WARN( "Failed to initialize game controller, hr %#lx\n", hr ); + IGameControllerImpl_Release( inner_impl ); + } + + if (FAILED(hr)) + { + if (impl->IInspectable_inner) IInspectable_Release( impl->IInspectable_inner ); + free( impl ); + return hr; + } + ICustomGameControllerFactory_AddRef( (impl->factory = factory) ); IGameControllerProvider_AddRef( (impl->provider = provider) ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 56d03abad44..e3da45621b4 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -49,38 +49,42 @@ extern void provider_remove( const WCHAR *device_path ); extern void manager_on_provider_created( IGameControllerProvider *provider ); extern void manager_on_provider_removed( IGameControllerProvider *provider ); -#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ - static inline impl_type *impl_from_##iface_type( iface_type *iface ) \ +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ { \ - return CONTAINING_RECORD( iface, impl_type, iface_type##_iface ); \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ } \ static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_QueryInterface( (IInspectable *)&impl->base_iface, iid, out ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ } \ static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_AddRef( (IInspectable *)&impl->base_iface ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ } \ static ULONG WINAPI pfx##_Release( iface_type *iface ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_Release( (IInspectable *)&impl->base_iface ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ } \ static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_GetIids( (IInspectable *)&impl->base_iface, iid_count, iids ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ } \ static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_GetRuntimeClassName( (IInspectable *)&impl->base_iface, class_name ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ } \ static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ { \ - impl_type *impl = impl_from_##iface_type( iface ); \ - return IInspectable_GetTrustLevel( (IInspectable *)&impl->base_iface, trust_level ); \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) -- 2.35.1

1 3

[PATCH 6/6] combase: Execute dllhost.exe for correct architecture in a WoW64 setup.
by Dmitry Timoshkov 09 Mar '22

09 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/combase/combase.c | 2 +- dlls/combase/rpc.c | 48 +++++++++++++++++++++++++++++--------- programs/dllhost/dllhost.c | 2 ++ 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index fb8f453661f..376f270fdf1 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -350,7 +350,7 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) HRESULT hr; /* read the AppID value under the class's key */ - hr = open_key_for_clsid(clsid, NULL, KEY_READ, &hkey); + hr = open_key_for_clsid(clsid, NULL, access, &hkey); if (FAILED(hr)) return hr; diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 40f900175dd..f620339f19e 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -526,18 +526,24 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) { static const WCHAR processidW[] = L" /PROCESSID:"; HKEY key; + int arch = (sizeof(void *) > sizeof(int)) ? 64 : 32; + REGSAM opposite = (arch == 64) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; + BOOL is_wow64 = FALSE; HRESULT hr; WCHAR command[MAX_PATH + ARRAY_SIZE(processidW) + CHARS_IN_GUID]; DWORD size; - STARTUPINFOW sinfo; - PROCESS_INFORMATION pinfo; + STARTUPINFOW si; + PROCESS_INFORMATION pi; LONG ret; TRACE("Attempting to start surrogate server for %s\n", debugstr_guid(rclsid)); hr = open_appidkey_from_clsid(rclsid, KEY_READ, &key); - if (FAILED(hr)) - return hr; + if (FAILED(hr) && (arch == 64 || (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64))) + { + hr = open_appidkey_from_clsid(rclsid, opposite | KEY_READ, &key); + if (FAILED(hr)) return hr; + } size = (MAX_PATH + 1) * sizeof(WCHAR); ret = RegQueryValueExW(key, L"DllSurrogate", NULL, NULL, (LPBYTE)command, &size); @@ -545,25 +551,45 @@ static HRESULT create_surrogate_server(REFCLSID rclsid, HANDLE *process) if (ret || !size || !command[0]) { TRACE("No value for DllSurrogate key\n"); - wcscpy(command, L"dllhost.exe"); + + if ((sizeof(void *) == 8 || is_wow64) && opposite == KEY_WOW64_32KEY) + GetSystemWow64DirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe")); + else + GetSystemDirectoryW(command, MAX_PATH - ARRAY_SIZE(L"\\dllhost.exe")); + + wcscat(command, L"\\dllhost.exe"); } /* Surrogate EXE servers are started with the /PROCESSID:{GUID} switch. */ wcscat(command, processidW); StringFromGUID2(rclsid, command + wcslen(command), CHARS_IN_GUID); - memset(&sinfo, 0, sizeof(sinfo)); - sinfo.cb = sizeof(sinfo); + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); TRACE("Activating surrogate local server %s\n", debugstr_w(command)); - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &sinfo, &pinfo)) + if (is_wow64 && arch == 64) + { + void *cookie; + Wow64DisableWow64FsRedirection(&cookie); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) + { + WARN("failed to run surrogate local server %s\n", debugstr_w(command)); + hr = HRESULT_FROM_WIN32(GetLastError()); + } + Wow64RevertWow64FsRedirection(cookie); + } + else if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) { WARN("failed to run surrogate local server %s\n", debugstr_w(command)); - return HRESULT_FROM_WIN32(GetLastError()); + hr = HRESULT_FROM_WIN32(GetLastError()); } - *process = pinfo.hProcess; - CloseHandle(pinfo.hThread); + + if (FAILED(hr)) return hr; + + *process = pi.hProcess; + CloseHandle(pi.hThread); return S_OK; } diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index dc89c978510..83700826f8b 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -327,6 +327,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho CLSID clsid; struct surrogate surrogate; + TRACE("Running as %u-bit\n", (int)sizeof(void *) * 8); + if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) return 0; -- 2.35.1

1 0

[PATCH] dlls/wintrust/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wintrust/tests/Makefile.in | 1 dlls/wintrust/tests/asn.c | 208 ++++++++++++++++++------------------- dlls/wintrust/tests/crypt.c | 222 ++++++++++++++++++++------------------- dlls/wintrust/tests/register.c | 44 ++++---- dlls/wintrust/tests/softpub.c | 144 +++++++++++++------------ 5 files changed, 309 insertions(+), 310 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index c19db4558a9..87654a685ff 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wintrust.dll IMPORTS = wintrust crypt32 advapi32 diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 82feac61bfe..9cb255d3048 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -46,20 +46,20 @@ static void test_encodeSPCFinancialCriteria(void) } ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(falseCriteria), "Unexpected size %d\n", size); + ok(size == sizeof(falseCriteria), "Unexpected size %ld\n", size); ok(!memcmp(buf, falseCriteria, size), "Unexpected value\n"); LocalFree(buf); } criteria.fFinancialInfoAvailable = criteria.fMeetsCriteria = TRUE; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(trueCriteria), "Unexpected size %d\n", size); + ok(size == sizeof(trueCriteria), "Unexpected size %ld\n", size); ok(!memcmp(buf, trueCriteria, size), "Unexpected value\n"); LocalFree(buf); } @@ -79,7 +79,7 @@ static void test_decodeSPCFinancialCriteria(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, falseCriteria, sizeof(falseCriteria), 0, NULL, &criteria, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(!criteria.fFinancialInfoAvailable, "expected FALSE\n"); @@ -87,7 +87,7 @@ static void test_decodeSPCFinancialCriteria(void) } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, trueCriteria, sizeof(trueCriteria), 0, NULL, &criteria, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(criteria.fFinancialInfoAvailable, "expected TRUE\n"); @@ -131,14 +131,14 @@ static void test_encodeSPCLink(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); link.dwLinkChoice = SPC_URL_LINK_CHOICE; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptyURLSPCLink), "Unexpected size %d\n", size); + ok(size == sizeof(emptyURLSPCLink), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptyURLSPCLink, size), "Unexpected value\n"); LocalFree(buf); } @@ -151,18 +151,18 @@ static void test_encodeSPCLink(void) ok(!ret && (GetLastError() == CRYPT_E_INVALID_IA5_STRING || GetLastError() == OSS_BAD_PTR /* WinNT */), - "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError()); + "Expected CRYPT_E_INVALID_IA5_STRING, got %08lx\n", GetLastError()); /* Unlike the crypt32 string encoding routines, size is not set to the * index of the first invalid character. */ - ok(size == 0, "Expected size 0, got %d\n", size); + ok(size == 0, "Expected size 0, got %ld\n", size); U(link).pwszUrl = url; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(urlSPCLink), "Unexpected size %d\n", size); + ok(size == sizeof(urlSPCLink), "Unexpected size %ld\n", size); ok(!memcmp(buf, urlSPCLink, size), "Unexpected value\n"); LocalFree(buf); } @@ -170,10 +170,10 @@ static void test_encodeSPCLink(void) U(link).pwszFile = (LPWSTR)nihongoURL; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(fileSPCLink), "Unexpected size %d\n", size); + ok(size == sizeof(fileSPCLink), "Unexpected size %ld\n", size); ok(!memcmp(buf, fileSPCLink, size), "Unexpected value\n"); LocalFree(buf); } @@ -181,10 +181,10 @@ static void test_encodeSPCLink(void) memset(&U(link).Moniker, 0, sizeof(U(link).Moniker)); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptyMonikerSPCLink), "Unexpected size %d\n", size); + ok(size == sizeof(emptyMonikerSPCLink), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptyMonikerSPCLink, size), "Unexpected value\n"); LocalFree(buf); } @@ -193,10 +193,10 @@ static void test_encodeSPCLink(void) U(link).Moniker.SerializedData.cbData = sizeof(data); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(monikerSPCLink), "Unexpected size %d\n", size); + ok(size == sizeof(monikerSPCLink), "Unexpected size %ld\n", size); ok(!memcmp(buf, monikerSPCLink, size), "Unexpected value\n"); LocalFree(buf); } @@ -222,50 +222,50 @@ static void test_decodeSPCLink(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, emptyURLSPCLink, sizeof(emptyURLSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { link = (SPC_LINK *)buf; ok(link->dwLinkChoice == SPC_URL_LINK_CHOICE, - "Expected SPC_URL_LINK_CHOICE, got %d\n", link->dwLinkChoice); + "Expected SPC_URL_LINK_CHOICE, got %ld\n", link->dwLinkChoice); ok(lstrlenW(U(*link).pwszUrl) == 0, "Expected empty string\n"); LocalFree(buf); } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, urlSPCLink, sizeof(urlSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { link = (SPC_LINK *)buf; ok(link->dwLinkChoice == SPC_URL_LINK_CHOICE, - "Expected SPC_URL_LINK_CHOICE, got %d\n", link->dwLinkChoice); + "Expected SPC_URL_LINK_CHOICE, got %ld\n", link->dwLinkChoice); ok(!lstrcmpW(U(*link).pwszUrl, url), "Unexpected URL\n"); LocalFree(buf); } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, fileSPCLink, sizeof(fileSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { link = (SPC_LINK *)buf; ok(link->dwLinkChoice == SPC_FILE_LINK_CHOICE, - "Expected SPC_FILE_LINK_CHOICE, got %d\n", link->dwLinkChoice); + "Expected SPC_FILE_LINK_CHOICE, got %ld\n", link->dwLinkChoice); ok(!lstrcmpW(U(*link).pwszFile, nihongoURL), "Unexpected file\n"); LocalFree(buf); } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, emptyMonikerSPCLink, sizeof(emptyMonikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { SPC_SERIALIZED_OBJECT emptyMoniker = { { 0 } }; link = (SPC_LINK *)buf; ok(link->dwLinkChoice == SPC_MONIKER_LINK_CHOICE, - "Expected SPC_MONIKER_LINK_CHOICE, got %d\n", link->dwLinkChoice); + "Expected SPC_MONIKER_LINK_CHOICE, got %ld\n", link->dwLinkChoice); ok(!memcmp(&U(*link).Moniker.ClassId, &emptyMoniker.ClassId, sizeof(emptyMoniker.ClassId)), "Unexpected value\n"); ok(U(*link).Moniker.SerializedData.cbData == 0, @@ -275,19 +275,19 @@ static void test_decodeSPCLink(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, monikerSPCLink, sizeof(monikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { SPC_UUID id; link = (SPC_LINK *)buf; ok(link->dwLinkChoice == SPC_MONIKER_LINK_CHOICE, - "Expected SPC_MONIKER_LINK_CHOICE, got %d\n", link->dwLinkChoice); + "Expected SPC_MONIKER_LINK_CHOICE, got %ld\n", link->dwLinkChoice); memset(&id, 0xea, sizeof(id)); ok(!memcmp(&U(*link).Moniker.ClassId, &id, sizeof(id)), "Unexpected value\n"); ok(U(*link).Moniker.SerializedData.cbData == sizeof(data), - "Unexpected data size %d\n", U(*link).Moniker.SerializedData.cbData); + "Unexpected data size %ld\n", U(*link).Moniker.SerializedData.cbData); ok(!memcmp(U(*link).Moniker.SerializedData.pbData, data, sizeof(data)), "Unexpected value\n"); LocalFree(buf); @@ -299,7 +299,7 @@ static void test_decodeSPCLink(void) ok(!ret && (GetLastError() == CRYPT_E_BAD_ENCODE || GetLastError() == OSS_DATA_ERROR /* WinNT */), - "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); + "Expected CRYPT_E_BAD_ENCODE, got %08lx\n", GetLastError()); } static const BYTE emptySequence[] = { 0x30,0x00 }; @@ -329,10 +329,10 @@ static void test_encodeSPCPEImage(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptySequence), "Unexpected size %d\n", size); + ok(size == sizeof(emptySequence), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptySequence, sizeof(emptySequence)), "Unexpected value\n"); LocalFree(buf); @@ -343,16 +343,16 @@ static void test_encodeSPCPEImage(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError () == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); /* With just unused bits field set: */ imageData.pFile = NULL; imageData.Flags.cUnusedBits = 1; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptySequence), "Unexpected size %d\n", size); + ok(size == sizeof(emptySequence), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptySequence, sizeof(emptySequence)), "Unexpected value\n"); LocalFree(buf); @@ -368,10 +368,10 @@ static void test_encodeSPCPEImage(void) skip("SPC_PE_IMAGE_DATA_STRUCT not supported\n"); return; } - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(onlyFlagsPEImage), "Unexpected size %d\n", size); + ok(size == sizeof(onlyFlagsPEImage), "Unexpected size %ld\n", size); ok(!memcmp(buf, onlyFlagsPEImage, sizeof(onlyFlagsPEImage)), "Unexpected value\n"); LocalFree(buf); @@ -382,10 +382,10 @@ static void test_encodeSPCPEImage(void) imageData.pFile = &link; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(onlyEmptyFilePEImage), "Unexpected size %d\n", size); + ok(size == sizeof(onlyEmptyFilePEImage), "Unexpected size %ld\n", size); ok(!memcmp(buf, onlyEmptyFilePEImage, sizeof(onlyEmptyFilePEImage)), "Unexpected value\n"); LocalFree(buf); @@ -395,10 +395,10 @@ static void test_encodeSPCPEImage(void) imageData.Flags.cbData = sizeof(flags); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(flagsAndEmptyFilePEImage), "Unexpected size %d\n", + ok(size == sizeof(flagsAndEmptyFilePEImage), "Unexpected size %ld\n", size); ok(!memcmp(buf, flagsAndEmptyFilePEImage, sizeof(flagsAndEmptyFilePEImage)), "Unexpected value\n"); @@ -408,10 +408,10 @@ static void test_encodeSPCPEImage(void) U(link).pwszFile = (LPWSTR)nihongoURL; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(flagsAndFilePEImage), "Unexpected size %d\n", size); + ok(size == sizeof(flagsAndFilePEImage), "Unexpected size %ld\n", size); ok(!memcmp(buf, flagsAndFilePEImage, sizeof(flagsAndFilePEImage)), "Unexpected value\n"); LocalFree(buf); @@ -435,11 +435,11 @@ static void test_decodeSPCPEImage(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { imageData = (SPC_PE_IMAGE_DATA *)buf; - ok(imageData->Flags.cbData == 0, "Expected empty flags, got %d\n", + ok(imageData->Flags.cbData == 0, "Expected empty flags, got %ld\n", imageData->Flags.cbData); ok(imageData->pFile == NULL, "Expected no file\n"); LocalFree(buf); @@ -447,12 +447,12 @@ static void test_decodeSPCPEImage(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, onlyFlagsPEImage, sizeof(onlyFlagsPEImage), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { imageData = (SPC_PE_IMAGE_DATA *)buf; ok(imageData->Flags.cbData == sizeof(flags), - "Unexpected flags size %d\n", imageData->Flags.cbData); + "Unexpected flags size %ld\n", imageData->Flags.cbData); if (imageData->Flags.cbData) ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), "Unexpected flags\n"); @@ -462,17 +462,17 @@ static void test_decodeSPCPEImage(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, onlyEmptyFilePEImage, sizeof(onlyEmptyFilePEImage), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { imageData = (SPC_PE_IMAGE_DATA *)buf; - ok(imageData->Flags.cbData == 0, "Expected empty flags, got %d\n", + ok(imageData->Flags.cbData == 0, "Expected empty flags, got %ld\n", imageData->Flags.cbData); ok(imageData->pFile != NULL, "Expected a file\n"); if (imageData->pFile) { ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, - "Expected SPC_FILE_LINK_CHOICE, got %d\n", + "Expected SPC_FILE_LINK_CHOICE, got %ld\n", imageData->pFile->dwLinkChoice); ok(!lstrcmpW(U(*imageData->pFile).pwszFile, emptyString), "Unexpected file\n"); @@ -482,12 +482,12 @@ static void test_decodeSPCPEImage(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, flagsAndEmptyFilePEImage, sizeof(flagsAndEmptyFilePEImage), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { imageData = (SPC_PE_IMAGE_DATA *)buf; ok(imageData->Flags.cbData == sizeof(flags), - "Unexpected flags size %d\n", imageData->Flags.cbData); + "Unexpected flags size %ld\n", imageData->Flags.cbData); if (imageData->Flags.cbData) ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), "Unexpected flags\n"); @@ -495,7 +495,7 @@ static void test_decodeSPCPEImage(void) if (imageData->pFile) { ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, - "Expected SPC_FILE_LINK_CHOICE, got %d\n", + "Expected SPC_FILE_LINK_CHOICE, got %ld\n", imageData->pFile->dwLinkChoice); ok(!lstrcmpW(U(*imageData->pFile).pwszFile, emptyString), "Unexpected file\n"); @@ -505,12 +505,12 @@ static void test_decodeSPCPEImage(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, flagsAndFilePEImage, sizeof(flagsAndFilePEImage), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { imageData = (SPC_PE_IMAGE_DATA *)buf; ok(imageData->Flags.cbData == sizeof(flags), - "Unexpected flags size %d\n", imageData->Flags.cbData); + "Unexpected flags size %ld\n", imageData->Flags.cbData); if (imageData->Flags.cbData) ok(!memcmp(imageData->Flags.pbData, flags, sizeof(flags)), "Unexpected flags\n"); @@ -518,7 +518,7 @@ static void test_decodeSPCPEImage(void) if (imageData->pFile) { ok(imageData->pFile->dwLinkChoice == SPC_FILE_LINK_CHOICE, - "Expected SPC_FILE_LINK_CHOICE, got %d\n", + "Expected SPC_FILE_LINK_CHOICE, got %ld\n", imageData->pFile->dwLinkChoice); ok(!lstrcmpW(U(*imageData->pFile).pwszFile, nihongoURL), "Unexpected file\n"); @@ -560,10 +560,10 @@ static void test_encodeCatMemberInfo(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptyCatMemberInfo), "Unexpected size %d\n", size); + ok(size == sizeof(emptyCatMemberInfo), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptyCatMemberInfo, sizeof(emptyCatMemberInfo)), "Unexpected value\n"); LocalFree(buf); @@ -571,10 +571,10 @@ static void test_encodeCatMemberInfo(void) info.pwszSubjGuid = foo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(catMemberInfoWithSillyGuid), "Unexpected size %d\n", + ok(size == sizeof(catMemberInfoWithSillyGuid), "Unexpected size %ld\n", size); ok(!memcmp(buf, catMemberInfoWithSillyGuid, sizeof(catMemberInfoWithSillyGuid)), "Unexpected value\n"); @@ -583,10 +583,10 @@ static void test_encodeCatMemberInfo(void) info.pwszSubjGuid = guidStr; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(catMemberInfoWithGuid), "Unexpected size %d\n", + ok(size == sizeof(catMemberInfoWithGuid), "Unexpected size %ld\n", size); ok(!memcmp(buf, catMemberInfoWithGuid, sizeof(catMemberInfoWithGuid)), "Unexpected value\n"); @@ -610,39 +610,39 @@ static void test_decodeCatMemberInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, emptyCatMemberInfo, sizeof(emptyCatMemberInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { info = (CAT_MEMBERINFO *)buf; ok(!info->pwszSubjGuid || !info->pwszSubjGuid[0], "expected empty pwszSubjGuid\n"); - ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %ld\n", info->dwCertVersion); LocalFree(buf); } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, catMemberInfoWithSillyGuid, sizeof(catMemberInfoWithSillyGuid), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { info = (CAT_MEMBERINFO *)buf; ok(info->pwszSubjGuid && !lstrcmpW(info->pwszSubjGuid, foo), "unexpected pwszSubjGuid\n"); - ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %ld\n", info->dwCertVersion); LocalFree(buf); } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_MEMBERINFO_STRUCT, catMemberInfoWithGuid, sizeof(catMemberInfoWithGuid), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { info = (CAT_MEMBERINFO *)buf; ok(info->pwszSubjGuid && !lstrcmpW(info->pwszSubjGuid, guidStr), "unexpected pwszSubjGuid\n"); - ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %d\n", + ok(info->dwCertVersion == 0, "expected dwCertVersion == 0, got %ld\n", info->dwCertVersion); LocalFree(buf); } @@ -670,10 +670,10 @@ static void test_encodeCatNameValue(void) memset(&value, 0, sizeof(value)); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptyCatNameValue), "Unexpected size %d\n", size); + ok(size == sizeof(emptyCatNameValue), "Unexpected size %ld\n", size); ok(!memcmp(buf, emptyCatNameValue, sizeof(emptyCatNameValue)), "Unexpected value\n"); LocalFree(buf); @@ -681,10 +681,10 @@ static void test_encodeCatNameValue(void) value.pwszTag = foo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(catNameValueWithTag), "Unexpected size %d\n", size); + ok(size == sizeof(catNameValueWithTag), "Unexpected size %ld\n", size); ok(!memcmp(buf, catNameValueWithTag, sizeof(catNameValueWithTag)), "Unexpected value\n"); LocalFree(buf); @@ -693,10 +693,10 @@ static void test_encodeCatNameValue(void) value.fdwFlags = 0xf00dd00d; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(catNameValueWithFlags), "Unexpected size %d\n", size); + ok(size == sizeof(catNameValueWithFlags), "Unexpected size %ld\n", size); ok(!memcmp(buf, catNameValueWithFlags, sizeof(catNameValueWithFlags)), "Unexpected value\n"); LocalFree(buf); @@ -706,10 +706,10 @@ static void test_encodeCatNameValue(void) value.Value.pbData = aVal; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, &value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(catNameValueWithValue), "Unexpected size %d\n", size); + ok(size == sizeof(catNameValueWithValue), "Unexpected size %ld\n", size); ok(!memcmp(buf, catNameValueWithValue, sizeof(catNameValueWithValue)), "Unexpected value\n"); LocalFree(buf); @@ -727,14 +727,14 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, emptyCatNameValue, sizeof(emptyCatNameValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { value = (CAT_NAMEVALUE *)buf; ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); - ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08lx\n", value->fdwFlags); - ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + ok(value->Value.cbData == 0, "expected 0-length value, got %ld\n", value->Value.cbData); LocalFree(buf); } @@ -742,15 +742,15 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithTag, sizeof(catNameValueWithTag), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { value = (CAT_NAMEVALUE *)buf; ok(value->pwszTag && !lstrcmpW(value->pwszTag, foo), "unexpected pwszTag\n"); - ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08lx\n", value->fdwFlags); - ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + ok(value->Value.cbData == 0, "expected 0-length value, got %ld\n", value->Value.cbData); LocalFree(buf); } @@ -758,14 +758,14 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithFlags, sizeof(catNameValueWithFlags), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { value = (CAT_NAMEVALUE *)buf; ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); ok(value->fdwFlags == 0xf00dd00d, - "expected fdwFlags == 0xf00dd00d, got %08x\n", value->fdwFlags); - ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + "expected fdwFlags == 0xf00dd00d, got %08lx\n", value->fdwFlags); + ok(value->Value.cbData == 0, "expected 0-length value, got %ld\n", value->Value.cbData); LocalFree(buf); } @@ -773,14 +773,14 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithValue, sizeof(catNameValueWithValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { value = (CAT_NAMEVALUE *)buf; ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); - ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08lx\n", value->fdwFlags); - ok(value->Value.cbData == sizeof(aVal), "unexpected size %d\n", + ok(value->Value.cbData == sizeof(aVal), "unexpected size %ld\n", value->Value.cbData); ok(!memcmp(value->Value.pbData, aVal, value->Value.cbData), "unexpected value\n"); @@ -812,20 +812,20 @@ static void test_encodeSpOpusInfo(void) memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(emptySequence), "unexpected size %d\n", size); + ok(size == sizeof(emptySequence), "unexpected size %ld\n", size); ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); LocalFree(buf); } info.pwszProgramName = progName; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { - ok(size == sizeof(spOpusInfoWithProgramName), "unexpected size %d\n", + ok(size == sizeof(spOpusInfoWithProgramName), "unexpected size %ld\n", size); ok(!memcmp(buf, spOpusInfoWithProgramName, size), "unexpected value\n"); @@ -838,16 +838,16 @@ static void test_encodeSpOpusInfo(void) ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %08x\n", GetLastError()); + "expected E_INVALIDARG, got %08lx\n", GetLastError()); moreInfo.dwLinkChoice = SPC_URL_LINK_CHOICE; U(moreInfo).pwszUrl = winehq; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(spOpusInfoWithMoreInfo), - "unexpected size %d\n", size); + "unexpected size %ld\n", size); ok(!memcmp(buf, spOpusInfoWithMoreInfo, size), "unexpected value\n"); LocalFree(buf); @@ -856,11 +856,11 @@ static void test_encodeSpOpusInfo(void) info.pPublisherInfo = &moreInfo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(size == sizeof(spOpusInfoWithPublisherInfo), - "unexpected size %d\n", size); + "unexpected size %ld\n", size); ok(!memcmp(buf, spOpusInfoWithPublisherInfo, size), "unexpected value\n"); LocalFree(buf); @@ -876,7 +876,7 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(!info->pwszProgramName, "expected NULL\n"); @@ -887,7 +887,7 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithProgramName, sizeof(spOpusInfoWithProgramName), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(info->pwszProgramName && !lstrcmpW(info->pwszProgramName, @@ -899,7 +899,7 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithMoreInfo, sizeof(spOpusInfoWithMoreInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(!info->pwszProgramName, "expected NULL\n"); @@ -907,7 +907,7 @@ static void test_decodeSpOpusInfo(void) if (info->pMoreInfo) { ok(info->pMoreInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, - "unexpected link choice %d\n", info->pMoreInfo->dwLinkChoice); + "unexpected link choice %ld\n", info->pMoreInfo->dwLinkChoice); ok(!lstrcmpW(U(*info->pMoreInfo).pwszUrl, winehq), "unexpected link value\n"); } @@ -917,7 +917,7 @@ static void test_decodeSpOpusInfo(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithPublisherInfo, sizeof(spOpusInfoWithPublisherInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08lx\n", GetLastError()); if (ret) { ok(!info->pwszProgramName, "expected NULL\n"); @@ -927,7 +927,7 @@ static void test_decodeSpOpusInfo(void) if (info->pPublisherInfo) { ok(info->pPublisherInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, - "unexpected link choice %d\n", + "unexpected link choice %ld\n", info->pPublisherInfo->dwLinkChoice); ok(!lstrcmpW(U(*info->pPublisherInfo).pwszUrl, winehq), "unexpected link value\n"); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 5f9c402e00f..ca246776046 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -200,25 +200,25 @@ static void test_context(void) ret = pCryptCATAdminAcquireContext(NULL, NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* NULL GUID */ if (0) { /* crashes on 64-bit win10 */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* Proper release */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); /* Try to release a second time */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } /* All NULL */ @@ -226,14 +226,14 @@ static void test_context(void) ret = pCryptCATAdminReleaseContext(NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef); ret = pCryptCATAdminAcquireContext(NULL, &dummy, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* Correct context handle and dummy GUID * @@ -246,7 +246,7 @@ static void test_context(void) */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); - ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %lu\n", GetLastError()); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { win_skip("Not running as administrator\n"); @@ -276,15 +276,15 @@ static void test_context(void) } ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); /* Correct context handle and GUID */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); hca = (void *) 0xdeadbeef; SetLastError(0xdeadbeef); @@ -292,14 +292,14 @@ static void test_context(void) ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); ok((!ret && (GetLastError() == ERROR_INVALID_PARAMETER) && (hca == (void *) 0xdeadbeef)) || broken(ret && hca != NULL && hca != (void *) 0xdeadbeef), - "Expected FALSE and ERROR_INVALID_PARAMETER with untouched handle, got %d and %u with %p\n", + "Expected FALSE and ERROR_INVALID_PARAMETER with untouched handle, got %d and %lu with %p\n", ret, GetLastError(), hca); if (ret && hca) { SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); } } @@ -319,14 +319,14 @@ static void test_calchash(void) ret = pCryptCATAdminCalcHashFromFileHandle(NULL, NULL, NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* NULL filehandle, rest is legal */ SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(NULL, &hashsize, NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* Correct filehandle, rest is NULL */ file = CreateFileA(selfname, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -334,7 +334,7 @@ static void test_calchash(void) ret = pCryptCATAdminCalcHashFromFileHandle(file, NULL, NULL, 0); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); CloseHandle(file); /* All OK, but dwFlags set to 1 */ @@ -343,18 +343,18 @@ static void test_calchash(void) ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 1); ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); CloseHandle(file); /* All OK, requesting the size of the hash */ file = CreateFileA(selfname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); + ok(hashsize == 20," Expected a hash size of 20, got %ld\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + "Expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); CloseHandle(file); /* All OK, retrieve the hash @@ -365,10 +365,10 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); + ok(hashsize == 20," Expected a hash size of 20, got %ld\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); CloseHandle(file); HeapFree(GetProcessHeap(), 0, hash); @@ -387,9 +387,9 @@ static void test_calchash(void) hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && !memcmp(hash, expectedhash, sizeof(expectedhash)), "Hashes didn't match\n"); @@ -414,7 +414,7 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(NULL, 0, 0, 0, 0); ok(cat == INVALID_HANDLE_VALUE, "expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError()); for (flags = 0; flags < 8; ++flags) { @@ -422,19 +422,19 @@ static void test_CryptCATOpen(void) cat = pCryptCATOpen(filename, flags, 0, 0, 0); if (flags == CRYPTCAT_OPEN_EXISTING) { - ok(cat == INVALID_HANDLE_VALUE, "flags %#x: expected failure\n", flags); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat == INVALID_HANDLE_VALUE, "flags %#lx: expected failure\n", flags); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "flags %#lx: got error %lu\n", flags, GetLastError()); ret = DeleteFileW(filename); - ok(!ret, "flags %#x: expected failure\n", flags); + ok(!ret, "flags %#lx: expected failure\n", flags); } else { - ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#lx: expected success\n", flags); + ok(!GetLastError(), "flags %#lx: got error %lu\n", flags, GetLastError()); ret = pCryptCATClose(cat); - ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#lx: failed to close file\n", flags); ret = DeleteFileW(filename); - ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + ok(ret, "flags %#lx: failed to delete file, error %lu\n", flags, GetLastError()); } file = _wfopen(filename, L"w"); @@ -443,21 +443,21 @@ static void test_CryptCATOpen(void) SetLastError(0xdeadbeef); cat = pCryptCATOpen(filename, flags, 0, 0, 0); - ok(cat != INVALID_HANDLE_VALUE, "flags %#x: expected success\n", flags); - ok(!GetLastError(), "flags %#x: got error %u\n", flags, GetLastError()); + ok(cat != INVALID_HANDLE_VALUE, "flags %#lx: expected success\n", flags); + ok(!GetLastError(), "flags %#lx: got error %lu\n", flags, GetLastError()); ret = pCryptCATClose(cat); - ok(ret, "flags %#x: failed to close file\n", flags); + ok(ret, "flags %#lx: failed to close file\n", flags); file = _wfopen(filename, L"r"); ret = fread(buffer, 1, sizeof(buffer), file); if (flags & CRYPTCAT_OPEN_CREATENEW) - ok(!ret, "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + ok(!ret, "flags %#lx: got %s\n", flags, debugstr_an(buffer, ret)); else - ok(ret == 9 && !strncmp(buffer, "test text", ret), "flags %#x: got %s\n", flags, debugstr_an(buffer, ret)); + ok(ret == 9 && !strncmp(buffer, "test text", ret), "flags %#lx: got %s\n", flags, debugstr_an(buffer, ret)); fclose(file); ret = DeleteFileW(filename); - ok(ret, "flags %#x: failed to delete file, error %u\n", flags, GetLastError()); + ok(ret, "flags %#lx: failed to delete file, error %lu\n", flags, GetLastError()); } } @@ -466,7 +466,7 @@ static DWORD local_error; static void WINAPI cdf_callback(DWORD area, DWORD error, WCHAR* line) { - ok(error_area != -2, "Didn't expect cdf_callback() to be called (%08x, %08x)\n", + ok(error_area != -2, "Didn't expect cdf_callback() to be called (%08lx, %08lx)\n", area, error); error_area = area; @@ -489,33 +489,33 @@ static void test_CryptCATCDF_params(void) catcdf = pCryptCATCDFOpen(NULL, NULL); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); catcdf = pCryptCATCDFOpen(NULL, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* File doesn't exist */ SetLastError(0xdeadbeef); catcdf = pCryptCATCDFOpen(nonexistent, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATCDFClose(NULL); ok(!ret, "Expected failure\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); catcdf = NULL; SetLastError(0xdeadbeef); ret = pCryptCATCDFClose(catcdf); ok(!ret, "Expected failure\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } /* FIXME: Once Wine can create catalog files we should use the created catalog file in this test */ @@ -545,11 +545,11 @@ static void test_CryptCATAdminAddRemoveCatalog(void) if (!GetTempFileNameA(CURR_DIR, "cat", 0, tmpfile)) return; DeleteFileA(tmpfile); file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %lu\n", GetLastError()); CloseHandle(file); ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); - ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %lu\n", GetLastError()); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { win_skip("Not running as administrator\n"); @@ -560,13 +560,13 @@ static void test_CryptCATAdminAddRemoveCatalog(void) hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER, "got %lu expected ERROR_INVALID_PARAMETER\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, NULL, NULL, 0); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(error == ERROR_INVALID_PARAMETER, "got %lu expected ERROR_INVALID_PARAMETER\n", GetLastError()); MultiByteToWideChar(CP_ACP, 0, tmpfile, -1, tmpfileW, MAX_PATH); @@ -575,7 +575,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) error = GetLastError(); todo_wine { ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - ok(error == ERROR_BAD_FORMAT, "got %u expected ERROR_BAD_FORMAT\n", GetLastError()); + ok(error == ERROR_BAD_FORMAT, "got %lu expected ERROR_BAD_FORMAT\n", GetLastError()); } if (hcatinfo != NULL) pCryptCATAdminReleaseCatalogContext(hcatadmin, hcatinfo, 0); @@ -586,17 +586,17 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); ok(error == ERROR_INVALID_PARAMETER || error == ERROR_BAD_FORMAT, /* win 8 */ - "got %u\n", GetLastError()); + "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); error = GetLastError(); ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); - todo_wine ok(error == ERROR_BAD_FORMAT, "got %u expected ERROR_BAD_FORMAT\n", GetLastError()); + todo_wine ok(error == ERROR_BAD_FORMAT, "got %lu expected ERROR_BAD_FORMAT\n", GetLastError()); DeleteFileA(tmpfile); file = CreateFileA(tmpfile, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %lu\n", GetLastError()); WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); CloseHandle(file); @@ -607,14 +607,14 @@ static void test_CryptCATAdminAddRemoveCatalog(void) win_skip("Not enough rights\n"); goto cleanup; } - todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %lu\n", GetLastError()); info.cbStruct = sizeof(info); info.wszCatalogFile[0] = 0; ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); todo_wine { - ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); + ok(ret, "CryptCATCatalogInfoFromContext failed %lu\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); } WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); @@ -625,11 +625,11 @@ static void test_CryptCATAdminAddRemoveCatalog(void) /* Set the file attributes so we can check what happens with them during the 'copy' */ attrs = FILE_ATTRIBUTE_READONLY; ret = SetFileAttributesA(tmpfile, attrs); - ok(ret, "SetFileAttributesA failed : %u\n", GetLastError()); + ok(ret, "SetFileAttributesA failed : %lu\n", GetLastError()); /* winetest.cat will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); - ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %lu\n", GetLastError()); lstrcpyA(catfilepath, catroot); lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); @@ -638,45 +638,45 @@ static void test_CryptCATAdminAddRemoveCatalog(void) todo_wine ok(attrs == FILE_ATTRIBUTE_SYSTEM || attrs == (FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | FILE_ATTRIBUTE_SYSTEM), /* Vista */ - "File has wrong attributes : %08x\n", attrs); + "File has wrong attributes : %08lx\n", attrs); info.cbStruct = sizeof(info); info.wszCatalogFile[0] = 0; ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); - ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); + ok(ret, "CryptCATCatalogInfoFromContext failed %lu\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); if ((p = strrchr(catfile, '\\'))) p++; ok(!lstrcmpA(basename, p), "Expected %s, got %s\n", basename, p); ret = pCryptCATAdminReleaseCatalogContext(hcatadmin, hcatinfo, 0); - ok(ret, "CryptCATAdminReleaseCatalogContext failed %u\n", GetLastError()); + ok(ret, "CryptCATAdminReleaseCatalogContext failed %lu\n", GetLastError()); /* Remove the catalog file with the unique name */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, catfileW, 0); - ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + ok(ret, "CryptCATAdminRemoveCatalog failed %lu\n", GetLastError()); /* Remove the winetest.cat catalog file, first with the full path. This should not succeed * according to MSDN */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); - ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + ok(ret, "CryptCATAdminRemoveCatalog failed %lu\n", GetLastError()); /* The call succeeded with the full path but the file is not removed */ attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); /* Given only the filename the file is removed */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); - ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + ok(ret, "CryptCATAdminRemoveCatalog failed %lu\n", GetLastError()); attrs = GetFileAttributesA(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); cleanup: ret = pCryptCATAdminReleaseContext(hcatadmin, 0); - ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); + ok(ret, "CryptCATAdminReleaseContext failed %lu\n", GetLastError()); /* Set the attributes so we can delete the file */ attrs = FILE_ATTRIBUTE_NORMAL; ret = SetFileAttributesA(tmpfile, attrs); - ok(ret, "SetFileAttributesA failed %u\n", GetLastError()); + ok(ret, "SetFileAttributesA failed %lu\n", GetLastError()); DeleteFileA(tmpfile); } @@ -705,7 +705,7 @@ static void test_catalog_properties(const char *catfile, int attributes, int mem trace("Creating the catalog file\n"); if (!GetTempFileNameA(CURR_DIR, "cat", 0, catalog)) return; file = CreateFileA(catalog, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %lu\n", GetLastError()); WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); CloseHandle(file); @@ -725,7 +725,7 @@ static void test_catalog_properties(const char *catfile, int attributes, int mem win_skip("CryptCATOpen on W2K can't handle catalog files with no members\n"); return; } - ok(hcat != INVALID_HANDLE_VALUE, "CryptCATOpen failed %u\n", GetLastError()); + ok(hcat != INVALID_HANDLE_VALUE, "CryptCATOpen failed %lu\n", GetLastError()); m = pCryptCATEnumerateMember(NULL, NULL); ok(m == NULL, "CryptCATEnumerateMember succeeded\n"); @@ -733,12 +733,12 @@ static void test_catalog_properties(const char *catfile, int attributes, int mem m = NULL; while ((m = pCryptCATEnumerateMember(hcat, m))) { - ok(m->cbStruct == sizeof(CRYPTCATMEMBER), "unexpected size %u\n", m->cbStruct); + ok(m->cbStruct == sizeof(CRYPTCATMEMBER), "unexpected size %lu\n", m->cbStruct); todo_wine ok(!lstrcmpW(m->pwszReferenceTag, hashmeW), "unexpected tag\n"); ok(!memcmp(&m->gSubjectType, &subject, sizeof(subject)), "guid differs\n"); - ok(!m->fdwMemberFlags, "got %x expected 0\n", m->fdwMemberFlags); - ok(m->dwCertVersion == 0x200, "got %x expected 0x200\n", m->dwCertVersion); - ok(!m->dwReserved, "got %x expected 0\n", m->dwReserved); + ok(!m->fdwMemberFlags, "got %lx expected 0\n", m->fdwMemberFlags); + ok(m->dwCertVersion == 0x200, "got %lx expected 0x200\n", m->dwCertVersion); + ok(!m->dwReserved, "got %lx expected 0\n", m->dwReserved); ok(m->hReserved == NULL, "got %p expected NULL\n", m->hReserved); attr = pCryptCATEnumerateAttr(hcat, m, NULL); @@ -793,7 +793,7 @@ static void test_create_catalog_file(void) /* Create the cdf file */ file = CreateFileA(cdffileA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %lu\n", GetLastError()); WriteFile(file, test_cdf, sizeof(test_cdf) - 1, &written, NULL); CloseHandle(file); @@ -804,14 +804,14 @@ static void test_create_catalog_file(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } ret = pCryptCATCDFClose(catcdf); todo_wine { - ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %ld\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } attrs = GetFileAttributesA(catfileA); @@ -893,15 +893,15 @@ static void create_cdf_file(const CHAR *filename, const CHAR *contents) DWORD written; file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %lu\n", GetLastError()); WriteFile(file, contents, lstrlenA(contents), &written, NULL); CloseHandle(file); } #define CHECK_EXPECT(a, b) \ do { \ - ok(a == error_area, "Expected %08x, got %08x\n", a, error_area); \ - ok(b == local_error, "Expected %08x, got %08x\n", b, local_error); \ + ok(a == error_area, "Expected %08x, got %08lx\n", a, error_area); \ + ok(b == local_error, "Expected %08x, got %08lx\n", b, local_error); \ } while (0) /* Clear the variables (can't use 0) */ @@ -940,7 +940,7 @@ static void test_cdf_parsing(void) CHECK_EXPECT(CRYPTCAT_E_AREA_HEADER, CRYPTCAT_E_CDF_TAGNOTFOUND); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -954,7 +954,7 @@ static void test_cdf_parsing(void) ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + "Expected ERROR_SHARING_VIOLATION, got %ld\n", GetLastError()); DeleteFileA(cdffileA); /* Header and member only */ @@ -969,7 +969,7 @@ static void test_cdf_parsing(void) ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + "Expected ERROR_SHARING_VIOLATION, got %ld\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -984,7 +984,7 @@ static void test_cdf_parsing(void) ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine ok(GetLastError() == ERROR_SHARING_VIOLATION, - "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + "Expected ERROR_SHARING_VIOLATION, got %ld\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -999,7 +999,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } pCryptCATCDFClose(catcdf); DeleteFileA(cdffileA); @@ -1019,7 +1019,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the members */ CLEAR_EXPECT; @@ -1046,7 +1046,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the members */ CLEAR_EXPECT; @@ -1054,9 +1054,9 @@ static void test_cdf_parsing(void) catmembertag = NULL; while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, cdf_callback, &catmember, FALSE, NULL))) ; ok(error_area == 0xffffffff || broken(error_area == CRYPTCAT_E_AREA_MEMBER) /* < win81 */, - "Expected area 0xffffffff, got %08x\n", error_area); + "Expected area 0xffffffff, got %08lx\n", error_area); ok(local_error == 0xffffffff || broken(local_error == CRYPTCAT_E_CDF_MEMBER_FILE_PATH) /* < win81 */, - "Expected error 0xffffffff, got %08x\n", local_error); + "Expected error 0xffffffff, got %08lx\n", local_error); pCryptCATCDFClose(catcdf); DeleteFileA(cdffileA); @@ -1077,7 +1077,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the members */ SET_UNEXPECTED; @@ -1102,7 +1102,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the attributes */ CLEAR_EXPECT; @@ -1130,7 +1130,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the members */ SET_UNEXPECTED; @@ -1162,7 +1162,7 @@ static void test_cdf_parsing(void) todo_wine { ok(catcdf != NULL, "CryptCATCDFOpen failed\n"); - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", GetLastError()); } /* Loop through the members */ SET_UNEXPECTED; @@ -1266,26 +1266,26 @@ static void test_sip(void) info.cbSize = sizeof(SIP_SUBJECTINFO); info.pgSubjectType = &guid; ret = CryptSIPRetrieveSubjectGuid(NULL, file, info.pgSubjectType); - ok(ret, "CryptSIPRetrieveSubjectGuid failed (%x)\n", GetLastError()); + ok(ret, "CryptSIPRetrieveSubjectGuid failed (%lx)\n", GetLastError()); ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); - ok(index == ERROR_PATH_NOT_FOUND, "GetLastError returned %x\n", index); + ok(index == ERROR_PATH_NOT_FOUND, "GetLastError returned %lx\n", index); info.hFile = file; info.pwsFileName = nameW; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); - todo_wine ok(index == ERROR_INVALID_PARAMETER, "GetLastError returned %x\n", index); + todo_wine ok(index == ERROR_INVALID_PARAMETER, "GetLastError returned %lx\n", index); info.hFile = INVALID_HANDLE_VALUE; info.pwsFileName = nameW; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); ok(!ret, "CryptSIPPutSignedDataMsg succeeded\n"); index = GetLastError(); - ok(index == ERROR_SHARING_VIOLATION, "GetLastError returned %x\n", index); + ok(index == ERROR_SHARING_VIOLATION, "GetLastError returned %lx\n", index); CloseHandle(file); file= CreateFileW(nameW, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -1293,8 +1293,8 @@ static void test_sip(void) info.hFile = file; info.pwsFileName = (void*)0xdeadbeef; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 4, (BYTE*)"test"); - ok(ret, "CryptSIPPutSignedDataMsg failed (%x)\n", GetLastError()); - ok(index == 0, "index = %x\n", index); + ok(ret, "CryptSIPPutSignedDataMsg failed (%lx)\n", GetLastError()); + ok(index == 0, "index = %lx\n", index); CloseHandle(file); file= CreateFileW(nameW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -1302,33 +1302,33 @@ static void test_sip(void) info.hFile = INVALID_HANDLE_VALUE; info.pwsFileName = nameW; ret = pPutSignedDataMsg(&info, X509_ASN_ENCODING, &index, 14, (BYTE*)"longer message"); - ok(ret, "CryptSIPPutSignedDataMsg failed (%x)\n", GetLastError()); - ok(index == 1, "index = %x\n", index); + ok(ret, "CryptSIPPutSignedDataMsg failed (%lx)\n", GetLastError()); + ok(index == 1, "index = %lx\n", index); size = 0; encoding = 0xdeadbeef; ret = pGetSignedDataMsg(&info, &encoding, 0, &size, NULL); - ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); - ok(encoding == 0xdeadbeef, "encoding = %x\n", encoding); - ok(size == 16, "size = %d\n", size); + ok(ret, "CryptSIPGetSignedDataMsg failed (%lx)\n", GetLastError()); + ok(encoding == 0xdeadbeef, "encoding = %lx\n", encoding); + ok(size == 16, "size = %ld\n", size); ret = pGetSignedDataMsg(&info, &encoding, 0, &size, (BYTE*)buf); - ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); - ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %x\n", encoding); - ok(size == 8, "size = %d\n", size); + ok(ret, "CryptSIPGetSignedDataMsg failed (%lx)\n", GetLastError()); + ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %lx\n", encoding); + ok(size == 8, "size = %ld\n", size); ok(!memcmp(buf, "test\0\0\0\0", 8), "buf = %s\n", buf); size = 0; encoding = 0xdeadbeef; ret = pGetSignedDataMsg(&info, &encoding, 1, &size, NULL); - ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); - ok(encoding == 0xdeadbeef, "encoding = %x\n", encoding); - ok(size == 24, "size = %d\n", size); + ok(ret, "CryptSIPGetSignedDataMsg failed (%lx)\n", GetLastError()); + ok(encoding == 0xdeadbeef, "encoding = %lx\n", encoding); + ok(size == 24, "size = %ld\n", size); ret = pGetSignedDataMsg(&info, &encoding, 1, &size, (BYTE*)buf); - ok(ret, "CryptSIPGetSignedDataMsg failed (%x)\n", GetLastError()); - ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %x\n", encoding); - ok(size == 16, "size = %d\n", size); + ok(ret, "CryptSIPGetSignedDataMsg failed (%lx)\n", GetLastError()); + ok(encoding == (X509_ASN_ENCODING|PKCS_7_ASN_ENCODING), "encoding = %lx\n", encoding); + ok(size == 16, "size = %ld\n", size); ok(!strcmp(buf, "longer message"), "buf = %s\n", buf); CryptReleaseContext(info.hProv, 0); diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 32c87827491..bf4746d9284 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -76,7 +76,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %lu.\n", GetLastError()); /* NULL functions */ SetLastError(0xdeadbeef); @@ -84,7 +84,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %lu.\n", GetLastError()); /* All OK (although no functions defined), except cbStruct is not set in ActionIDFunctions */ SetLastError(0xdeadbeef); @@ -93,7 +93,7 @@ static void test_AddRem_ActionID(void) ok (!ret, "Expected WintrustAddActionID to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER /* XP/W2K3 */ || GetLastError() == 0xdeadbeef /* Win98/NT4/W2K */, - "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER(W2K3) or 0xdeadbeef(Win98/NT4/W2K), got %lu.\n", GetLastError()); /* All OK (although no functions defined) and cbStruct is set now */ SetLastError(0xdeadbeef); @@ -102,7 +102,7 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); /* All OK and all (but 1) functions are correctly defined. The DLL and entrypoints * are not present. @@ -122,7 +122,7 @@ static void test_AddRem_ActionID(void) ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, - "Expected ERROR_INVALID_PARAMETER or ERROR_ACCESS_DENIED, got %u.\n", + "Expected ERROR_INVALID_PARAMETER or ERROR_ACCESS_DENIED, got %lu.\n", GetLastError()); /* All OK and all functions are correctly defined. The DLL and entrypoints @@ -142,27 +142,27 @@ static void test_AddRem_ActionID(void) ret = pWintrustAddActionID(&ActionID, 0, &ActionIDFunctions); ok (ret, "Expected WintrustAddActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef || GetLastError() == ERROR_ACCESS_DENIED, - "Expected 0xdeadbeef or ERROR_ACCESS_DENIED, got %u.\n", + "Expected 0xdeadbeef or ERROR_ACCESS_DENIED, got %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); - ok ( ret, "WintrustRemoveActionID failed : %d\n", GetLastError()); - ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: %u\n", GetLastError()); + ok ( ret, "WintrustRemoveActionID failed : %ld\n", GetLastError()); + ok ( GetLastError() == 0xdeadbeef, "Last error should not have been changed: %lu\n", GetLastError()); /* NULL input */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(NULL); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); /* The passed GUID is removed by a previous call, so it's basically a test with a nonexistent Trust provider */ SetLastError(0xdeadbeef); ret = pWintrustRemoveActionID(&ActionID); ok (ret, "Expected WintrustRemoveActionID to succeed.\n"); ok (GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %u.\n", GetLastError()); + "Expected 0xdeadbeef, got %lu.\n", GetLastError()); } static void test_AddDefaultForUsage(void) @@ -185,14 +185,14 @@ static void test_AddDefaultForUsage(void) ret = pWintrustAddDefaultForUsage(NULL, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); /* NULL defusage */ SetLastError(0xdeadbeef); ret = pWintrustAddDefaultForUsage(oid, NULL); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); /* NULL oid and proper defusage */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -205,7 +205,7 @@ static void test_AddDefaultForUsage(void) ret = pWintrustAddDefaultForUsage(NULL, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); @@ -218,7 +218,7 @@ static void test_AddDefaultForUsage(void) ret = pWintrustAddDefaultForUsage(oid, &DefUsage); ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %lu.\n", GetLastError()); } static void test_LoadFunctionPointers(void) @@ -244,7 +244,7 @@ static void test_LoadFunctionPointers(void) ok(!ret, "WintrustLoadFunctionPointers succeeded\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == 0xdeadbeef /* W2K and XP-SP1 */, - "Expected ERROR_INVALID_PARAMETER or 0xdeadbeef, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER or 0xdeadbeef, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); funcs.cbStruct = 0; @@ -253,7 +253,7 @@ static void test_LoadFunctionPointers(void) SetLastError(0xdeadbeef); funcs.cbStruct = sizeof(funcs); ret = pWintrustLoadFunctionPointers(&action, &funcs); - ok(ret, "WintrustLoadFunctionPointers failed: %d\n", GetLastError()); + ok(ret, "WintrustLoadFunctionPointers failed: %ld\n", GetLastError()); ok(funcs.pfnAlloc != NULL, "Expected a pointer\n"); ok(funcs.pfnFree != NULL, "Expected a pointer\n"); } @@ -286,21 +286,21 @@ static void test_RegPolicyFlags(void) r = RegOpenKeyExA(HKEY_CURRENT_USER, Software_Publishing, 0, KEY_ALL_ACCESS, &key); - ok(!r, "RegOpenKeyEx failed: %d\n", r); + ok(!r, "RegOpenKeyEx failed: %ld\n", r); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); - ok(!r || r == ERROR_FILE_NOT_FOUND, "RegQueryValueEx failed: %d\n", r); + ok(!r || r == ERROR_FILE_NOT_FOUND, "RegQueryValueEx failed: %ld\n", r); if (!r) - ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); + ok(flags1 == flags2, "Got %08lx flags instead of %08lx\n", flags1, flags2); flags3 = flags2 | 1; ret = pWintrustSetRegPolicyFlags(flags3); - ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); + ok(ret, "WintrustSetRegPolicyFlags failed: %ld\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); - ok(!r, "RegQueryValueEx failed: %d\n", r); - ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); + ok(!r, "RegQueryValueEx failed: %ld\n", r); + ok(flags1 == flags3, "Got %08lx flags instead of %08lx\n", flags1, flags3); pWintrustSetRegPolicyFlags(flags2); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 25d458faad7..8195e6006b1 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -138,8 +138,8 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) if (store) { ret = funcs->pfnAddStore2Chain(&data, store); - ok(ret, "pfnAddStore2Chain failed: %08x\n", GetLastError()); - ok(data.chStores == 1, "Expected 1 store, got %d\n", data.chStores); + ok(ret, "pfnAddStore2Chain failed: %08lx\n", GetLastError()); + ok(data.chStores == 1, "Expected 1 store, got %ld\n", data.chStores); ok(data.pahStores != NULL, "Expected pahStores to be allocated\n"); if (data.pahStores) { @@ -153,15 +153,15 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) } } else - skip("CertOpenStore failed: %08x\n", GetLastError()); + skip("CertOpenStore failed: %08lx\n", GetLastError()); /* Crash ret = funcs->pfnAddSgnr2Chain(NULL, FALSE, 0, NULL); ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, NULL); */ ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); - ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); - ok(data.csSigners == 1, "Expected 1 signer, got %d\n", data.csSigners); + ok(ret, "pfnAddSgnr2Chain failed: %08lx\n", GetLastError()); + ok(data.csSigners == 1, "Expected 1 signer, got %ld\n", data.csSigners); ok(data.pasSigners != NULL, "Expected pasSigners to be allocated\n"); if (data.pasSigners) { @@ -173,15 +173,15 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) sgnr.cbStruct = sizeof(CRYPT_PROVIDER_SGNR); sgnr.sftVerifyAsOf.dwLowDateTime = 0xdeadbeef; ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 1, &sgnr); - ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); - ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners); + ok(ret, "pfnAddSgnr2Chain failed: %08lx\n", GetLastError()); + ok(data.csSigners == 2, "Expected 2 signers, got %ld\n", data.csSigners); ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)), "Unexpected data in signer\n"); /* This also adds, but the index is ignored */ sgnr.cbStruct = sizeof(DWORD); ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); - ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); - ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners); + ok(ret, "pfnAddSgnr2Chain failed: %08lx\n", GetLastError()); + ok(data.csSigners == 3, "Expected 3 signers, got %ld\n", data.csSigners); sgnr.sftVerifyAsOf.dwLowDateTime = 0; todo_wine ok(!memcmp(&data.pasSigners[2], &sgnr, sizeof(sgnr)), @@ -191,7 +191,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) SetLastError(0xdeadbeef); ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* Crash ret = funcs->pfnAddCert2Chain(NULL, 0, FALSE, 0, NULL); @@ -206,8 +206,8 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) * 2. An invalid signer index isn't checked. */ ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); - ok(ret, "pfnAddCert2Chain failed: %08x\n", GetLastError()); - ok(data.pasSigners[0].csCertChain == 1, "Expected 1 cert, got %d\n", + ok(ret, "pfnAddCert2Chain failed: %08lx\n", GetLastError()); + ok(data.pasSigners[0].csCertChain == 1, "Expected 1 cert, got %ld\n", data.pasSigners[0].csCertChain); ok(data.pasSigners[0].pasCertChain != NULL, "Expected pasCertChain to be allocated\n"); @@ -221,7 +221,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) CertFreeCertificateContext(cert); } else - skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); + skip("CertCreateCertificateContext failed: %08lx\n", GetLastError()); funcs->pfnFree(data.pasSigners); } } @@ -243,7 +243,7 @@ static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) */ memset(&data, 0, sizeof(data)); ret = funcs->pfnInitialize(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); data.padwTrustStepErrors = funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); /* Without wintrust data set, crashes when padwTrustStepErrors is set */ @@ -254,17 +254,17 @@ static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) memset(data.padwTrustStepErrors, 0, TRUSTERROR_MAX_STEPS * sizeof(DWORD)); ret = funcs->pfnInitialize(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); data.cdwTrustStepErrors = 1; ret = funcs->pfnInitialize(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); memset(data.padwTrustStepErrors, 0xba, TRUSTERROR_MAX_STEPS * sizeof(DWORD)); ret = funcs->pfnInitialize(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT] = 0; ret = funcs->pfnInitialize(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); funcs->pfnFree(data.padwTrustStepErrors); } } @@ -333,28 +333,28 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) 0x00,0x00,0x00,0x00,0x00 } }; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", + "Expected ERROR_INVALID_PARAMETER, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); U(wintrust_data).pCert = &certInfo; wintrust_data.dwUnionChoice = WTD_CHOICE_CERT; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); certInfo.psCertContext = (PCERT_CONTEXT)CertCreateCertificateContext( X509_ASN_ENCODING, v1CertWithPubKey, sizeof(v1CertWithPubKey)); ret = funcs->pfnObjectTrust(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); CertFreeCertificateContext(certInfo.psCertContext); certInfo.psCertContext = NULL; wintrust_data.dwUnionChoice = WTD_CHOICE_FILE; U(wintrust_data).pFile = NULL; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", + "Expected ERROR_INVALID_PARAMETER, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); U(wintrust_data).pFile = &fileInfo; /* Crashes @@ -366,19 +366,19 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) U(data).pPDSip = &provDataSIP; data.psPfns = (CRYPT_PROVIDER_FUNCTIONS *)funcs; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_SUBJECT_FORM_UNKNOWN, - "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); CloseHandle(fileInfo.hFile); fileInfo.hFile = NULL; fileInfo.pcwszFilePath = pathW; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_SUBJECT_FORM_UNKNOWN, - "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); DeleteFileW(pathW); /* Test again with a file we expect to exist, and to contain no @@ -386,12 +386,12 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) */ getNotepadPath(pathW, MAX_PATH); ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_SUBJECT_FORM_UNKNOWN, - "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE) @@ -405,14 +405,14 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Specifying the GUID results in that GUID being the subject GUID */ fileInfo.pgKnownSubject = &bogusGuid; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_SUBJECT_FORM_UNKNOWN || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_PROVIDER_UNKNOWN, - "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN or TRUST_E_PROVIDER_UNKNOWN, got %08x\n", + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN or TRUST_E_PROVIDER_UNKNOWN, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE) @@ -425,7 +425,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { fileInfo.pgKnownSubject = (GUID *)0xdeadbeef; ret = funcs->pfnObjectTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); } funcs->pfnFree(data.padwTrustStepErrors); } @@ -568,9 +568,9 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) return; } ret = funcs->pfnCertificateTrust(&data); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(ret == S_FALSE, "Expected S_FALSE, got %08lx\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] == - TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n", + TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08lx\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); b = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); if (b) @@ -579,7 +579,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* An empty signer "succeeds," even though there's no cert */ ret = funcs->pfnCertificateTrust(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); if (cert) @@ -598,13 +598,13 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) */ data.psPfns = (CRYPT_PROVIDER_FUNCTIONS *)funcs; ret = funcs->pfnCertificateTrust(&data); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); - ok(data.csSigners == 1, "Unexpected number of signers %d\n", + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); + ok(data.csSigners == 1, "Unexpected number of signers %ld\n", data.csSigners); ok(data.pasSigners[0].pChainContext != NULL, "Expected a certificate chain\n"); ok(data.pasSigners[0].csCertChain == 1, - "Unexpected number of chain elements %d\n", + "Unexpected number of chain elements %ld\n", data.pasSigners[0].csCertChain); /* pasSigners and pasSigners[0].pasCertChain are guaranteed to be * initialized, see tests for pfnAddSgnr2Chain and pfnAddCert2Chain @@ -615,7 +615,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) "Expected cert to be self-signed\n"); ok(data.pasSigners[0].pasCertChain[0].dwConfidence == (CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST), - "Expected CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST, got %08x\n", + "Expected CERT_CONFIDENCE_SIG | CERT_CONFIDENCE_TIMENEST, got %08lx\n", data.pasSigners[0].pasCertChain[0].dwConfidence); CertFreeCertificateContext( data.pasSigners[0].pasCertChain[0].pCert); @@ -756,16 +756,16 @@ static void test_sip_create_indirect_data(void) SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); subjinfo.cbSize = sizeof(subjinfo); SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); file = create_temp_file(temp_file); if (file == INVALID_HANDLE_VALUE) { @@ -779,17 +779,17 @@ static void test_sip_create_indirect_data(void) SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); subjinfo.pgSubjectType = &unknown; SetLastError(0xdeadbeef); ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); subjinfo.DigestAlgorithm.pszObjId = oid_sha1; count = 0xdeadbeef; ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, NULL); todo_wine - ok(ret, "CryptSIPCreateIndirectData failed: %d\n", GetLastError()); + ok(ret, "CryptSIPCreateIndirectData failed: %ld\n", GetLastError()); ok(count, "expected a positive count\n"); if (ret) { @@ -797,16 +797,16 @@ static void test_sip_create_indirect_data(void) count = 256; ret = CryptSIPCreateIndirectData_p(&subjinfo, &count, indirect); - ok(ret, "CryptSIPCreateIndirectData failed: %d\n", GetLastError()); + ok(ret, "CryptSIPCreateIndirectData failed: %ld\n", GetLastError()); /* If the count is larger than needed, it's unmodified */ - ok(count == 256, "unexpected count %d\n", count); + ok(count == 256, "unexpected count %ld\n", count); ok(!strcmp(indirect->Data.pszObjId, SPC_PE_IMAGE_DATA_OBJID), "unexpected data oid %s\n", indirect->Data.pszObjId); ok(!strcmp(indirect->DigestAlgorithm.pszObjId, oid_sha1), "unexpected digest algorithm oid %s\n", indirect->DigestAlgorithm.pszObjId); - ok(indirect->Digest.cbData == 20, "unexpected hash size %d\n", + ok(indirect->Digest.cbData == 20, "unexpected hash size %ld\n", indirect->Digest.cbData); if (indirect->Digest.cbData == 20) { @@ -847,9 +847,9 @@ static void test_wintrust(void) file.hFile = create_temp_file(pathW); SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); + ok(r == GetLastError(), "expected %08lx, got %08lx\n", GetLastError(), r); ok(r == TRUST_E_SUBJECT_FORM_UNKNOWN, - "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", r); + "expected TRUST_E_SUBJECT_FORM_UNKNOWN, got %08lx\n", r); CloseHandle(file.hFile); DeleteFileW(pathW); file.hFile = NULL; @@ -857,25 +857,25 @@ static void test_wintrust(void) getNotepadPath(pathW, MAX_PATH); SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(r == GetLastError(), "expected %08x, got %08x\n", GetLastError(), r); + ok(r == GetLastError(), "expected %08lx, got %08lx\n", GetLastError(), r); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, - "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08lx\n", r); wtd.dwStateAction = WTD_STATEACTION_CLOSE; SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); - ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08lx\n", GetLastError()); + ok(r == S_OK, "WinVerifyTrust failed: %08lx\n", r); wtd.dwStateAction = WTD_STATEACTION_VERIFY; SetLastError(0xdeadbeef); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(hr == GetLastError(), "expected %08x, got %08x\n", GetLastError(), hr); + ok(hr == GetLastError(), "expected %08lx, got %08lx\n", GetLastError(), hr); ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, - "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08lx\n", hr); wtd.dwStateAction = WTD_STATEACTION_CLOSE; SetLastError(0xdeadbeef); r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08x\n", GetLastError()); - ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %08lx\n", GetLastError()); + ok(r == S_OK, "WinVerifyTrust failed: %08lx\n", r); } /* Self-signed .exe, built with tcc, signed with signtool @@ -1142,7 +1142,7 @@ static void call_winverify(WCHAR *pathW, LONG *status, BOOL hash_only) data.dwStateAction = WTD_STATEACTION_CLOSE; ret = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); - ok(ret == S_OK, "WinVerifyTrust failed: %08x\n", ret); + ok(ret == S_OK, "WinVerifyTrust failed: %08lx\n", ret); } static void test_wintrust_digest(void) @@ -1231,18 +1231,18 @@ static void test_wintrust_digest(void) for (j = 0; tests[i].blocks[j].data; j++) { ret = WriteFile(file, tests[i].blocks[j].data, tests[i].blocks[j].length, &written, NULL); - ok(ret && written == tests[i].blocks[j].length, "WriteFile failed with %u\n", GetLastError()); + ok(ret && written == tests[i].blocks[j].length, "WriteFile failed with %lu\n", GetLastError()); } CloseHandle(file); call_winverify(pathW, &status, FALSE); todo_wine_if(tests[i].t1.todo) - ok(status == tests[i].t1.status, "test %d/1: expected %08x, got %08x\n", i, tests[i].t1.status, status); + ok(status == tests[i].t1.status, "test %d/1: expected %08lx, got %08lx\n", i, tests[i].t1.status, status); call_winverify(pathW, &status, TRUE); todo_wine_if(tests[i].t2.todo) - ok(status == tests[i].t2.status, "test %d/2: expected %08x, got %08x\n", i, tests[i].t2.status, status); + ok(status == tests[i].t2.status, "test %d/2: expected %08lx, got %08lx\n", i, tests[i].t2.status, status); DeleteFileW(pathW); } @@ -1261,22 +1261,22 @@ static void test_get_known_usages(void) SetLastError(0xdeadbeef); ret = pWTHelperGetKnownUsages(0, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWTHelperGetKnownUsages(1, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWTHelperGetKnownUsages(0, &usages); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); /* A value of 1 for the first parameter seems to imply the value is * allocated */ SetLastError(0xdeadbeef); usages = NULL; ret = pWTHelperGetKnownUsages(1, &usages); - ok(ret, "WTHelperGetKnownUsages failed: %d\n", GetLastError()); + ok(ret, "WTHelperGetKnownUsages failed: %ld\n", GetLastError()); ok(usages != NULL, "expected a pointer\n"); if (ret && usages) { @@ -1289,10 +1289,10 @@ static void test_get_known_usages(void) { ok((*ptr)->cbSize == sizeof(CRYPT_OID_INFO) || (*ptr)->cbSize == (sizeof(CRYPT_OID_INFO) + 2 * sizeof(LPCWSTR)), /* Vista */ - "unexpected size %d\n", (*ptr)->cbSize); + "unexpected size %ld\n", (*ptr)->cbSize); /* Each returned usage is in the CRYPT_ENHKEY_USAGE_OID_GROUP_ID group */ ok((*ptr)->dwGroupId == CRYPT_ENHKEY_USAGE_OID_GROUP_ID, - "expected group CRYPT_ENHKEY_USAGE_OID_GROUP_ID, got %d\n", + "expected group CRYPT_ENHKEY_USAGE_OID_GROUP_ID, got %ld\n", (*ptr)->dwGroupId); } } @@ -1300,16 +1300,16 @@ static void test_get_known_usages(void) */ SetLastError(0xdeadbeef); ret = pWTHelperGetKnownUsages(2, &usages); - ok(ret, "WTHelperGetKnownUsages failed: %d\n", GetLastError()); + ok(ret, "WTHelperGetKnownUsages failed: %ld\n", GetLastError()); ok(usages == NULL, "expected pointer to be cleared\n"); SetLastError(0xdeadbeef); usages = NULL; ret = pWTHelperGetKnownUsages(2, &usages); - ok(ret, "WTHelperGetKnownUsages failed: %d\n", GetLastError()); + ok(ret, "WTHelperGetKnownUsages failed: %ld\n", GetLastError()); SetLastError(0xdeadbeef); ret = pWTHelperGetKnownUsages(2, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } START_TEST(softpub)

1 0

[PATCH] dlls/wintab32/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wintab32/tests/Makefile.in | 1 - dlls/wintab32/tests/context.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wintab32/tests/Makefile.in b/dlls/wintab32/tests/Makefile.in index 921d97284dc..635e03fd5d6 100644 --- a/dlls/wintab32/tests/Makefile.in +++ b/dlls/wintab32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wintab32.dll IMPORTS = user32 diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index a88e4bb845d..4359412785a 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -165,40 +165,40 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); - trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_X %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Y, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_Y size %d\n", ret); - trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_Y %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); if(ret) - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_Z %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); else trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); - trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_NPRESSURE %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); if(ret) - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + trace("DVC_TPRESSURE %ld, %ld, %d\n", value.axMin, value.axMax, value.axUnits); else trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); - trace("DVC_ORIENTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); - trace("DVC_ORIENTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); - trace("DVC_ORIENTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + trace("DVC_ORIENTATION0 %ld, %ld, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ORIENTATION1 %ld, %ld, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ORIENTATION2 %ld, %ld, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_ROTATION, &orientation ); if(ret) { - trace("DVC_ROTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); - trace("DVC_ROTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); - trace("DVC_ROTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + trace("DVC_ROTATION0 %ld, %ld, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ROTATION1 %ld, %ld, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ROTATION2 %ld, %ld, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); } else trace("DVC_ROTATION not supported\n");

1 0

[PATCH] dlls/windows.media.devices/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.media.devices/tests/Makefile.in | 1 - dlls/windows.media.devices/tests/devices.c | 40 +++++++++++++------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in index 37f5f7bde06..4d107889dad 100644 --- a/dlls/windows.media.devices/tests/Makefile.in +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.media.devices.dll IMPORTS = combase diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c index d8acc638837..c992686d4e8 100644 --- a/dlls/windows.media.devices/tests/devices.c +++ b/dlls/windows.media.devices/tests/devices.c @@ -103,7 +103,7 @@ static HRESULT WINAPI async_activate_ActivateCompleted( hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, &async_activate_test.result_hr, &async_activate_test.result_iface); ok(hr == S_OK, - "%s: GetActivateResult failed: %08x\n", + "%s: GetActivateResult failed: %08lx\n", async_activate_test.msg_pfx, hr); return S_OK; @@ -135,29 +135,29 @@ static void test_MediaDeviceStatics(void) DWORD dr; hr = WindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr); WindowsDeleteString(str); /* interface tests */ hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IMediaDeviceStatics, (void **)&media_device_statics); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IMediaDeviceStatics failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IMediaDeviceStatics failed, hr %#lx\n", hr); hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IMediaDeviceStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IMediaDeviceStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); @@ -169,7 +169,7 @@ static void test_MediaDeviceStatics(void) /* test default capture device creation */ hr = IMediaDeviceStatics_GetDefaultAudioCaptureId(media_device_statics, AudioDeviceRole_Default, &str); - ok(hr == S_OK, "GetDefaultAudioCaptureId failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioCaptureId failed: %08lx\n", hr); ok((!!g_default_capture_id) == (!!str), "Presence of default capture device doesn't match expected state\n"); @@ -181,7 +181,7 @@ static void test_MediaDeviceStatics(void) /* returned id does not work in GetDevice... */ hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ async_activate_test.ref = 1; @@ -194,14 +194,14 @@ static void test_MediaDeviceStatics(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); @@ -210,7 +210,7 @@ static void test_MediaDeviceStatics(void) /* test default render device creation */ hr = IMediaDeviceStatics_GetDefaultAudioRenderId(media_device_statics, AudioDeviceRole_Default, &str); - ok(hr == S_OK, "GetDefaultAudioRenderId failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioRenderId failed: %08lx\n", hr); ok((!!g_default_render_id) == (!!str), "Presence of default render device doesn't match expected state\n"); @@ -222,7 +222,7 @@ static void test_MediaDeviceStatics(void) /* returned id does not work in GetDevice... */ hr = IMMDeviceEnumerator_GetDevice(g_mmdevenum, WindowsGetStringRawBuffer(str, NULL), &mmdev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr); /* ...but does work in ActivateAudioInterfaceAsync */ async_activate_test.ref = 1; @@ -235,14 +235,14 @@ static void test_MediaDeviceStatics(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(WindowsGetStringRawBuffer(str, NULL), &IID_IAudioClient2, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08x\n", async_activate_test.result_hr); + ok(async_activate_test.result_hr == S_OK, "Got unexpected activation result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface != NULL, "Expected to get WASAPI interface, but got NULL\n"); IUnknown_Release(async_activate_test.result_iface); @@ -278,17 +278,17 @@ START_TEST(devices) #undef LOAD_FUNCPTR hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&g_mmdevenum); - ok(hr == S_OK, "Couldn't make MMDeviceEnumerator: %08x\n", hr); + ok(hr == S_OK, "Couldn't make MMDeviceEnumerator: %08lx\n", hr); hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(g_mmdevenum, eCapture, eMultimedia, &mmdev); if (hr == S_OK) { hr = IMMDevice_GetId(mmdev, &g_default_capture_id); - ok(hr == S_OK, "IMMDevice::GetId(capture) failed: %08x\n", hr); + ok(hr == S_OK, "IMMDevice::GetId(capture) failed: %08lx\n", hr); IMMDevice_Release(mmdev); } @@ -299,7 +299,7 @@ START_TEST(devices) if (hr == S_OK) { hr = IMMDevice_GetId(mmdev, &g_default_render_id); - ok(hr == S_OK, "IMMDevice::GetId(render) failed: %08x\n", hr); + ok(hr == S_OK, "IMMDevice::GetId(render) failed: %08lx\n", hr); IMMDevice_Release(mmdev); }

1 0

[PATCH] dlls/windows.globalization/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/windows.globalization/tests/Makefile.in | 1 dlls/windows.globalization/tests/globalization.c | 52 +++++++++++----------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/windows.globalization/tests/Makefile.in b/dlls/windows.globalization/tests/Makefile.in index 2b643ef8437..7ee2bc407d6 100644 --- a/dlls/windows.globalization/tests/Makefile.in +++ b/dlls/windows.globalization/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.globalization.dll IMPORTS = combase uuid diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index ebe7ccc4704..c42cb67496e 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -59,13 +59,13 @@ static void test_GlobalizationPreferences(void) GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(class_name, wcslen(class_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); @@ -75,26 +75,26 @@ static void test_GlobalizationPreferences(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IGlobalizationPreferencesStatics, (void **)&preferences_statics); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGlobalizationPreferencesStatics failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGlobalizationPreferencesStatics failed, hr %#lx\n", hr); hr = IGlobalizationPreferencesStatics_QueryInterface(preferences_statics, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IGlobalizationPreferencesStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IGlobalizationPreferencesStatics_QueryInterface(preferences_statics, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IGlobalizationPreferencesStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#lx\n", hr); buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -112,25 +112,25 @@ static void test_GlobalizationPreferences(void) WindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#lx\n", hr); hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_HSTRING_QueryInterface returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#lx\n", hr); ok(tmp_agile_object != agile_object, "IVectorView_HSTRING_QueryInterface IID_IAgileObject returned agile_object\n"); IAgileObject_Release(tmp_agile_object); size = 0xdeadbeef; hr = IVectorView_HSTRING_get_Size(languages, &size); - ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#lx\n", hr); ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); hr = IVectorView_HSTRING_GetAt(languages, 0, &tmp_str); - ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#lx\n", hr); buf = WindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -141,34 +141,34 @@ static void test_GlobalizationPreferences(void) i = 0xdeadbeef; found = FALSE; hr = IVectorView_HSTRING_IndexOf(languages, tmp_str, &i, &found); - ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#lx\n", hr); ok(i == 0 && found == TRUE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); WindowsDeleteString(tmp_str); hr = WindowsCreateString(L"deadbeef", 8, &tmp_str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); i = 0xdeadbeef; found = TRUE; hr = IVectorView_HSTRING_IndexOf(languages, tmp_str, &i, &found); - ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_IndexOf failed, hr %#lx\n", hr); ok(i == 0 && found == FALSE, "IVectorView_HSTRING_IndexOf returned size %d, found %d\n", size, found); WindowsDeleteString(tmp_str); tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetAt(languages, size, &tmp_str); - ok(hr == E_BOUNDS, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_HSTRING_GetAt failed, hr %#lx\n", hr); ok(tmp_str == NULL, "IVectorView_HSTRING_GetAt returned %p\n", tmp_str); tmp_str = (HSTRING)0xdeadbeef; hr = IVectorView_HSTRING_GetMany(languages, size, 1, &tmp_str, &i); - ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#lx\n", hr); ok(i == 0 && tmp_str == NULL, "IVectorView_HSTRING_GetMany returned count %u, str %p\n", i, tmp_str); hr = IVectorView_HSTRING_GetMany(languages, 0, 1, &tmp_str, &i); - ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_GetAt failed, hr %#lx\n", hr); ok(i == 1, "IVectorView_HSTRING_GetMany returned count %u, expected 1\n", i); buf = WindowsGetStringRawBuffer(tmp_str, &len); @@ -184,33 +184,33 @@ static void test_GlobalizationPreferences(void) hr = IGlobalizationPreferencesStatics_get_Calendars(preferences_statics, &calendars); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Calendars failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Calendars failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_HSTRING_get_Size(calendars, &size); - ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); IVectorView_HSTRING_Release(calendars); hr = IGlobalizationPreferencesStatics_get_Clocks(preferences_statics, &clocks); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Clocks failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Clocks failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_HSTRING_get_Size(clocks, &size); - ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); IVectorView_HSTRING_Release(clocks); hr = IGlobalizationPreferencesStatics_get_Currencies(preferences_statics, &currencies); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Currencies failed, hr %#x\n", hr); + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Currencies failed, hr %#lx\n", hr); size = 0xdeadbeef; hr = IVectorView_HSTRING_get_Size(currencies, &size); - ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_HSTRING_get_Size failed, hr %#lx\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_HSTRING_get_Size returned %u\n", size); IVectorView_HSTRING_Release(currencies);

1 0

[PATCH] dlls/wiaservc/tests: enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wiaservc/tests/Makefile.in | 1 - dlls/wiaservc/tests/wia.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in index 7eadf649a35..594e1b2a988 100644 --- a/dlls/wiaservc/tests/Makefile.in +++ b/dlls/wiaservc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wiaservc.dll IMPORTS = ole32 diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index 48050f4ecc9..b2ac607a8dd 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -39,19 +39,19 @@ static void test_EnumDeviceInfo(void) ULONG count; hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL); - ok(FAILED(hr), "got 0x%08x\n", hr); + ok(FAILED(hr), "got 0x%08lx\n", hr); hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); - ok(FAILED(hr), "got 0x%08x\n", hr); + ok(FAILED(hr), "got 0x%08lx\n", hr); count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count != 1000, "got %u\n", count); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(count != 1000, "got %lu\n", count); IEnumWIA_DEV_INFO_Release(devenum); } @@ -62,11 +62,11 @@ static void test_SelectDeviceDlg(void) IWiaItem *root; hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, NULL); todo_wine - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IWiaDevMgr_SelectDeviceDlg(devmanager, NULL, StiDeviceTypeDefault, 0, NULL, &root); todo_wine - ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08x\n", hr); + ok(hr == S_OK || hr == WIA_S_NO_DEVICE_AVAILABLE, "got 0x%08lx\n", hr); } START_TEST(wia) @@ -77,7 +77,7 @@ START_TEST(wia) hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager); if (FAILED(hr)) { - win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr); + win_skip("Failed to create WiaDevMgr instance, 0x%08lx\n", hr); CoUninitialize(); return; }

1 0

[PATCH] dlls/kernel32/tests/ : enable compilation with long types
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/atom.c | 33 +++++++++++++------------ dlls/kernel32/tests/drive.c | 37 ++++++++++++++-------------- dlls/kernel32/tests/mailslot.c | 53 ++++++++++++++++++++-------------------- dlls/kernel32/tests/power.c | 11 +++++--- dlls/kernel32/tests/resource.c | 47 ++++++++++++++++++----------------- dlls/kernel32/tests/timer.c | 29 +++++++++++----------- dlls/kernel32/tests/toolhelp.c | 17 +++++++------ 7 files changed, 117 insertions(+), 110 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index 4796d41d23d..ac69a53066b 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdio.h> @@ -115,20 +116,20 @@ static void test_add_atom(void) { SetLastError( 0xdeadbeef ); ok( GlobalAddAtomA((LPCSTR)i) == i && GetLastError() == 0xdeadbeef, - "failed to add atom %lx\n", i ); + "failed to add atom %Ix\n", i ); if (unicode_OS) { SetLastError( 0xdeadbeef ); ok( GlobalAddAtomW((LPCWSTR)i) == i && GetLastError() == 0xdeadbeef, - "failed to add atom %lx\n", i ); + "failed to add atom %Ix\n", i ); } } for (i = 0xc000; i <= 0xffff; i++) { - ok( !GlobalAddAtomA((LPCSTR)i), "succeeded adding %lx\n", i ); + ok( !GlobalAddAtomA((LPCSTR)i), "succeeded adding %Ix\n", i ); if (unicode_OS) - ok( !GlobalAddAtomW((LPCWSTR)i), "succeeded adding %lx\n", i ); + ok( !GlobalAddAtomW((LPCWSTR)i), "succeeded adding %Ix\n", i ); } } @@ -196,7 +197,7 @@ static void test_get_atom_name(void) len = GlobalGetAtomNameA( (ATOM)i, buf, 2); ok(!len, "bad length %d\n", len); ok(GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INVALID_PARAMETER, - "wrong error conditions %u for %u\n", GetLastError(), i); + "wrong error conditions %lu for %u\n", GetLastError(), i); } memset( buf, '.', sizeof(buf) ); @@ -229,7 +230,7 @@ static void test_get_atom_name(void) SetLastError(0xdeadbeef); len = GlobalGetAtomNameA(atom, out, 10); ok(!len, "bad length %d\n", len); - ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA); + ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%lu instead of %u)\n", GetLastError(), ERROR_MORE_DATA); for (i = 0; i < 9; i++) { ok(out[i] == "abcdefghij"[i % 10], "wrong string at %i (%c instead of %c)\n", i, out[i], "abcdefghij"[i % 10]); @@ -266,7 +267,7 @@ static void test_get_atom_name(void) { /* len == 0 with ERROR_MORE_DATA is on NT3.51 */ ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA), - "0x%04x: got %u with %d (expected '1' or '0' with " + "0x%04x: got %u with %ld (expected '1' or '0' with " "ERROR_MORE_DATA)\n", i, len, GetLastError()); ok(outW[1] == DOUBLE('.'), "buffer overwrite\n"); } @@ -373,20 +374,20 @@ static void test_local_add_atom(void) { SetLastError( 0xdeadbeef ); ok( AddAtomA((LPCSTR)i) == i && GetLastError() == 0xdeadbeef, - "failed to add atom %lx\n", i ); + "failed to add atom %Ix\n", i ); if (unicode_OS) { SetLastError( 0xdeadbeef ); ok( AddAtomW((LPCWSTR)i) == i && GetLastError() == 0xdeadbeef, - "failed to add atom %lx\n", i ); + "failed to add atom %Ix\n", i ); } } for (i = 0xc000; i <= 0xffff; i++) { - ok( !AddAtomA((LPCSTR)i), "succeeded adding %lx\n", i ); + ok( !AddAtomA((LPCSTR)i), "succeeded adding %Ix\n", i ); if (unicode_OS) - ok( !AddAtomW((LPCWSTR)i), "succeeded adding %lx\n", i ); + ok( !AddAtomW((LPCWSTR)i), "succeeded adding %Ix\n", i ); } } @@ -472,11 +473,11 @@ static void test_local_get_atom_name(void) if (i) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_MORE_DATA, - "wrong error conditions %u for %u\n", GetLastError(), i); + "wrong error conditions %lu for %u\n", GetLastError(), i); else ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_MORE_DATA, - "wrong error conditions %u for %u\n", GetLastError(), i); + "wrong error conditions %lu for %u\n", GetLastError(), i); } /* test string limits & overflow */ do_initA(in, "abcdefghij", 255); @@ -505,7 +506,7 @@ static void test_local_get_atom_name(void) /* ERROR_MORE_DATA is on nt3.51 sp5 */ ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_MORE_DATA, - "wrong error code (%u)\n", GetLastError()); + "wrong error code (%lu)\n", GetLastError()); if (unicode_OS) { @@ -532,7 +533,7 @@ static void test_local_get_atom_name(void) /* ERROR_MORE_DATA is on nt3.51 sp5 */ ok(GetLastError() == ERROR_MORE_DATA || GetLastError() == (i ? ERROR_INSUFFICIENT_BUFFER : ERROR_INVALID_PARAMETER), - "wrong error conditions %u for %u\n", GetLastError(), i); + "wrong error conditions %lu for %u\n", GetLastError(), i); } do_initW(inW, "abcdefghij", 255); atom = AddAtomW(inW); @@ -560,7 +561,7 @@ static void test_local_get_atom_name(void) /* ERROR_MORE_DATA is on nt3.51 sp5 */ ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_MORE_DATA, - "wrong error code (%u)\n", GetLastError()); + "wrong error code (%lu)\n", GetLastError()); } } diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 98dc454f340..6fa0754de3e 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> @@ -35,7 +36,7 @@ static void test_GetDriveTypeA(void) UINT type; logical_drives = GetLogicalDrives(); - ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError()); + ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { @@ -88,7 +89,7 @@ static void test_GetDriveTypeW(void) UINT type; logical_drives = GetLogicalDrives(); - ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError()); + ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { @@ -142,21 +143,21 @@ static void test_GetDiskFreeSpaceA(void) DWORD logical_drives; ret = GetDiskFreeSpaceA(NULL, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); ret = GetDiskFreeSpaceA("", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_INVALID_NAME), - "GetDiskFreeSpaceA(\"\"): ret=%d GetLastError=%d\n", + "GetDiskFreeSpaceA(\"\"): ret=%d GetLastError=%ld\n", ret, GetLastError()); ret = GetDiskFreeSpaceA("\\", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); ret = GetDiskFreeSpaceA("/", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - ok(ret, "GetDiskFreeSpaceA error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); logical_drives = GetLogicalDrives(); - ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError()); + ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { @@ -169,7 +170,7 @@ static void test_GetDiskFreeSpaceA(void) ret = GetDiskFreeSpaceA(drive, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); if (!(logical_drives & 1)) ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_INVALID_DRIVE), - "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", + "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%ld\n", drive, ret, GetLastError()); else { @@ -177,12 +178,12 @@ static void test_GetDiskFreeSpaceA(void) if (!ret) /* GetDiskFreeSpaceA() should succeed, but it can fail with too many different GetLastError() results to be usable for an ok() */ - trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError()); + trace("GetDiskFreeSpaceA(%s) failed with %ld\n", drive, GetLastError()); if( GetVersion() & 0x80000000) /* win3.0 through winME */ ok( total_clusters <= 65535, - "total clusters is %d > 65535\n", total_clusters); + "total clusters is %ld > 65535\n", total_clusters); else if (pGetDiskFreeSpaceExA) { /* NT, 2k, XP : GetDiskFreeSpace should be accurate */ ULARGE_INTEGER totEx, tot, d; @@ -194,7 +195,7 @@ static void test_GetDiskFreeSpaceA(void) if (!ret) /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many different GetLastError() results to be usable for an ok() */ - trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError()); + trace("GetDiskFreeSpaceExA(%s) failed with %ld\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, @@ -222,21 +223,21 @@ static void test_GetDiskFreeSpaceW(void) win_skip("GetDiskFreeSpaceW is not available\n"); return; } - ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); ret = GetDiskFreeSpaceW(empty_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, - "GetDiskFreeSpaceW(\"\"): ret=%d GetLastError=%d\n", + "GetDiskFreeSpaceW(\"\"): ret=%d GetLastError=%ld\n", ret, GetLastError()); ret = GetDiskFreeSpaceW(root_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - ok(ret, "GetDiskFreeSpaceW(\"\") error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceW(\"\") error %ld\n", GetLastError()); ret = GetDiskFreeSpaceW(unix_style_root_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError()); + ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); logical_drives = GetLogicalDrives(); - ok(logical_drives != 0, "GetLogicalDrives error %d\n", GetLastError()); + ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { @@ -247,12 +248,12 @@ static void test_GetDiskFreeSpaceW(void) ret = GetDiskFreeSpaceW(drive, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); if (!(logical_drives & 1)) ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, - "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", + "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%ld\n", drive[0], ret, GetLastError()); else if (!ret) /* GetDiskFreeSpaceW() should succeed, but it can fail with too many different GetLastError() results to be usable for an ok() */ - trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError()); + trace("GetDiskFreeSpaceW(%c) failed with %ld\n", drive[0], GetLastError()); } logical_drives >>= 1; } diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 7e488566dbb..8011249542d 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdlib.h> @@ -81,38 +82,38 @@ static int mailslot_test(void) SetLastError(0xdeadbeef); ret = ReadFile(INVALID_HANDLE_VALUE, buffer, 0, &count, NULL); ok(!ret, "ReadFile should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); - ok(count == 0, "expected 0, got %u\n", count); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %lu\n", GetLastError()); + ok(count == 0, "expected 0, got %lu\n", count); count = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(hSlot, buffer, 0, &count, NULL); ok(!ret, "ReadFile should fail\n"); todo_wine - ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); - ok(count == 0, "expected 0, got %u\n", count); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError()); + ok(count == 0, "expected 0, got %lu\n", count); count = 0; memset(buffer, 0, sizeof buffer); ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); ok( !ret, "slot read\n"); - if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); - else ok( count == 0, "wrong count %u\n", count ); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); + else ok( count == 0, "wrong count %lu\n", count ); ok( !WriteFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot write\n"); - ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %lu\n", GetLastError() ); /* now try and open the client, but with the wrong sharing mode */ hWriter = CreateFileA(szmspath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION, - "error should be ERROR_SHARING_VIOLATION got %p / %u\n", hWriter, GetLastError()); + "error should be ERROR_SHARING_VIOLATION got %p / %lu\n", hWriter, GetLastError()); if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter ); /* now open the client with the correct sharing mode */ hWriter = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot err %u\n", GetLastError()); + ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot err %lu\n", GetLastError()); /* * opening a client should make no difference to @@ -120,11 +121,11 @@ static int mailslot_test(void) */ ret = ReadFile( hSlot, buffer, sizeof buffer/2, &count, NULL); ok( !ret, "slot read\n"); - if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); - else ok( count == 0, "wrong count %u\n", count ); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); + else ok( count == 0, "wrong count %lu\n", count ); ok( !WriteFile( hSlot, buffer, sizeof buffer/2, &count, NULL), "slot write\n"); - ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %lu\n", GetLastError() ); /* * we can't read from this client, @@ -133,13 +134,13 @@ static int mailslot_test(void) ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, - "wrong error %u\n", GetLastError() ); + "wrong error %lu\n", GetLastError() ); ok( WriteFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can't write client\n"); ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, - "wrong error %u\n", GetLastError() ); + "wrong error %lu\n", GetLastError() ); /* * seeing as there's something in the slot, @@ -152,8 +153,8 @@ static int mailslot_test(void) /* but not again */ ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); ok( !ret, "slot read\n"); - if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); - else ok( count == 0, "wrong count %u\n", count ); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); + else ok( count == 0, "wrong count %lu\n", count ); /* now try open another writer... should fail */ hWriter2 = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, @@ -214,8 +215,8 @@ static int mailslot_test(void) /* check there's still no data */ ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); ok( !ret, "slot read\n"); - if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); - else ok( count == 0, "wrong count %u\n", count ); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); + else ok( count == 0, "wrong count %lu\n", count ); /* write two messages */ buffer[0] = 'a'; @@ -250,7 +251,7 @@ static int mailslot_test(void) "getmailslotinfo failed\n"); ok( dwNext == 1, "dwNext incorrect\n"); todo_wine - ok( dwMsgCount == 3, "dwMsgCount incorrect %u\n", dwMsgCount); + ok( dwMsgCount == 3, "dwMsgCount incorrect %lu\n", dwMsgCount); buffer[0]=buffer[1]=0; @@ -269,7 +270,7 @@ static int mailslot_test(void) "getmailslotinfo failed\n"); ok( dwNext == 2, "dwNext incorrect\n"); todo_wine { - ok( dwMsgCount == 2, "dwMsgCount incorrect %u\n", dwMsgCount); + ok( dwMsgCount == 2, "dwMsgCount incorrect %lu\n", dwMsgCount); } /* read the second message */ @@ -282,9 +283,9 @@ static int mailslot_test(void) dwNext = dwMsgCount = 0; ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ), "getmailslotinfo failed\n"); - ok( dwNext == 0, "dwNext incorrect %u\n", dwNext); + ok( dwNext == 0, "dwNext incorrect %lu\n", dwNext); todo_wine { - ok( dwMsgCount == 1, "dwMsgCount incorrect %u\n", dwMsgCount); + ok( dwMsgCount == 1, "dwMsgCount incorrect %lu\n", dwMsgCount); } /* read the 3rd (zero length) message */ @@ -307,8 +308,8 @@ static int mailslot_test(void) /* check that reads fail */ ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); ok( !ret, "3rd slot read succeeded\n"); - if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); - else ok( count == 0, "wrong count %u\n", count ); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); + else ok( count == 0, "wrong count %lu\n", count ); /* finally close the mailslot and its client */ ok( CloseHandle( hWriter2 ), "closing 2nd client\n"); @@ -322,9 +323,9 @@ static int mailslot_test(void) memset(buffer, 0, sizeof buffer); dwTimeout = GetTickCount(); ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %lu\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 900, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 900, "timeout too short %lu\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0; diff --git a/dlls/kernel32/tests/power.c b/dlls/kernel32/tests/power.c index af488849e21..40ecf29a941 100644 --- a/dlls/kernel32/tests/power.c +++ b/dlls/kernel32/tests/power.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "wine/test.h" @@ -53,14 +54,14 @@ void test_GetSystemPowerStatus(void) "expected %u%%-charged battery to have capacity flags 0x%02x, got 0x%02x\n", ps.BatteryLifePercent, expected_capacity_flags, capacity_flags); ok(ps.BatteryLifeTime <= ps.BatteryFullLifeTime, - "expected BatteryLifeTime %u to be less than or equal to BatteryFullLifeTime %u\n", + "expected BatteryLifeTime %lu to be less than or equal to BatteryFullLifeTime %lu\n", ps.BatteryLifeTime, ps.BatteryFullLifeTime); if (ps.BatteryFlag & BATTERY_FLAG_CHARGING) { ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, - "expected BatteryLifeTime to be -1 when charging, got %u\n", ps.BatteryLifeTime); + "expected BatteryLifeTime to be -1 when charging, got %lu\n", ps.BatteryLifeTime); ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, - "expected BatteryFullLifeTime to be -1 when charging, got %u\n", ps.BatteryFullLifeTime); + "expected BatteryFullLifeTime to be -1 when charging, got %lu\n", ps.BatteryFullLifeTime); } } else @@ -71,9 +72,9 @@ void test_GetSystemPowerStatus(void) ok(ps.BatteryLifePercent == BATTERY_PERCENTAGE_UNKNOWN, "expected BatteryLifePercent to be -1, got %u\n", ps.BatteryLifePercent); ok(ps.BatteryLifeTime == BATTERY_LIFE_UNKNOWN, - "expected BatteryLifeTime to be -1, got %u\n", ps.BatteryLifeTime); + "expected BatteryLifeTime to be -1, got %lu\n", ps.BatteryLifeTime); ok(ps.BatteryFullLifeTime == BATTERY_LIFE_UNKNOWN, - "expected BatteryFullLifeTime to be -1, got %u\n", ps.BatteryFullLifeTime); + "expected BatteryFullLifeTime to be -1, got %lu\n", ps.BatteryFullLifeTime); } } diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index bca0298044f..b9428a7b240 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <windows.h> #include <stdio.h> @@ -332,10 +333,10 @@ static void update_resources_version( void ) MAKEINTRESOURCEA(0x4567), 0xabcd, foo, sizeof foo ); - ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); + ok( r == TRUE, "UpdateResource failed: %ld\n", GetLastError()); r = EndUpdateResourceA( res, FALSE ); - ok( r, "EndUpdateResource failed: %d\n", GetLastError()); + ok( r, "EndUpdateResource failed: %ld\n", GetLastError()); } static void update_resources_bigdata( void ) @@ -352,7 +353,7 @@ static void update_resources_bigdata( void ) MAKEINTRESOURCEA(0x5647), 0xcdba, foo, sizeof foo ); - ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); + ok( r == TRUE, "UpdateResource failed: %ld\n", GetLastError()); r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); @@ -367,27 +368,27 @@ static void update_resources_name( void ) BOOL ret; res = BeginUpdateResourceA( filename, TRUE ); - ok( res != NULL, "BeginUpdateResource failed: %u\n", GetLastError() ); + ok( res != NULL, "BeginUpdateResource failed: %lu\n", GetLastError() ); if ( !res ) return; ret = UpdateResourceA( res, res_type, res_name, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), foo, sizeof(foo) ); - ok( ret == TRUE, "UpdateResource failed: %u\n", GetLastError() ); + ok( ret == TRUE, "UpdateResource failed: %lu\n", GetLastError() ); ret = EndUpdateResourceA( res, FALSE ); - ok( ret, "EndUpdateResource failed: %u\n", GetLastError() ); + ok( ret, "EndUpdateResource failed: %lu\n", GetLastError() ); if ( !ret ) return; module = LoadLibraryExA( filename, NULL, LOAD_LIBRARY_AS_DATAFILE ); - ok( module != NULL, "LoadLibraryEx failed: %u\n", GetLastError() ); + ok( module != NULL, "LoadLibraryEx failed: %lu\n", GetLastError() ); if ( !module ) return; rsrc = FindResourceA( module, res_name, res_type ); ok( rsrc != NULL || broken( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ) /* win2008 */, - "FindResource failed: %u\n", GetLastError() ); + "FindResource failed: %lu\n", GetLastError() ); ret = FreeLibrary(module); - ok( ret, "FreeLibrary failed: %u\n", GetLastError() ); + ok( ret, "FreeLibrary failed: %lu\n", GetLastError() ); } static void check_exe( const sec_verify *verify ) @@ -402,7 +403,7 @@ static void check_exe( const sec_verify *verify ) DWORD length, sec_count = 0; file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); - ok (file != INVALID_HANDLE_VALUE, "failed to create file (%d)\n", GetLastError()); + ok (file != INVALID_HANDLE_VALUE, "failed to create file (%ld)\n", GetLastError()); length = GetFileSize( file, NULL ); ok( length >= verify->length, "file size wrong\n"); @@ -423,11 +424,11 @@ static void check_exe( const sec_verify *verify ) for(i = 0; i < max_sections; i++) if (verify->sect_out[i]) { - ok( !memcmp(&verify->sect_out[i]->Name, &sec[sec_count].Name, 8), "section %d name wrong\n", sec_count); - ok( verify->sect_out[i]->VirtualAddress == sec[sec_count].VirtualAddress, "section %d vaddr wrong\n", sec_count); - ok( verify->sect_out[i]->SizeOfRawData <= sec[sec_count].SizeOfRawData, "section %d SizeOfRawData wrong (%d vs %d)\n", sec_count, verify->sect_out[i]->SizeOfRawData ,sec[sec_count].SizeOfRawData); - ok( verify->sect_out[i]->PointerToRawData == sec[sec_count].PointerToRawData, "section %d PointerToRawData wrong\n", sec_count); - ok( verify->sect_out[i]->Characteristics == sec[sec_count].Characteristics , "section %d characteristics wrong\n", sec_count); + ok( !memcmp(&verify->sect_out[i]->Name, &sec[sec_count].Name, 8), "section %ld name wrong\n", sec_count); + ok( verify->sect_out[i]->VirtualAddress == sec[sec_count].VirtualAddress, "section %ld vaddr wrong\n", sec_count); + ok( verify->sect_out[i]->SizeOfRawData <= sec[sec_count].SizeOfRawData, "section %ld SizeOfRawData wrong (%ld vs %ld)\n", sec_count, verify->sect_out[i]->SizeOfRawData ,sec[sec_count].SizeOfRawData); + ok( verify->sect_out[i]->PointerToRawData == sec[sec_count].PointerToRawData, "section %ld PointerToRawData wrong\n", sec_count); + ok( verify->sect_out[i]->Characteristics == sec[sec_count].Characteristics , "section %ld characteristics wrong\n", sec_count); sec_count++; } @@ -438,17 +439,17 @@ static void check_exe( const sec_verify *verify ) dir = (void*) ((BYTE*) dos + sec[verify->rsrc_section].VirtualAddress); ok( dir->Characteristics == 0, "Characteristics wrong\n"); - ok( dir->TimeDateStamp == 0, "TimeDateStamp wrong %u\n", dir->TimeDateStamp); + ok( dir->TimeDateStamp == 0, "TimeDateStamp wrong %lu\n", dir->TimeDateStamp); ok( dir->MajorVersion == 4, "MajorVersion wrong\n"); ok( dir->MinorVersion == 0, "MinorVersion wrong\n"); - ok( dir->NumberOfNamedEntries == verify->NumberOfNamedEntries, "NumberOfNamedEntries should be %d instead of %d\n", + ok( dir->NumberOfNamedEntries == verify->NumberOfNamedEntries, "NumberOfNamedEntries should be %ld instead of %d\n", verify->NumberOfNamedEntries, dir->NumberOfNamedEntries); - ok( dir->NumberOfIdEntries == verify->NumberOfIdEntries, "NumberOfIdEntries should be %d instead of %d\n", + ok( dir->NumberOfIdEntries == verify->NumberOfIdEntries, "NumberOfIdEntries should be %ld instead of %d\n", verify->NumberOfIdEntries, dir->NumberOfIdEntries); ok(opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress == sec[verify->rsrc_section].VirtualAddress, - "VirtualAddress in optional header should be %d instead of %d\n", + "VirtualAddress in optional header should be %ld instead of %ld\n", sec[verify->rsrc_section].VirtualAddress, opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress); } @@ -476,24 +477,24 @@ static void test_find_resource(void) SetLastError( 0xdeadbeef ); rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), (LPCWSTR)RT_DIALOG ); ok( !rsrc, "resource found\n" ); - ok( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(2), (LPCWSTR)RT_MENU ); ok( !rsrc, "resource found\n" ); - ok( GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); - ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_FRENCH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); - ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %lu\n", GetLastError() ); } typedef struct diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index 156f1acd7f1..e64d2b6300d 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "wine/test.h" #include "winbase.h" @@ -79,10 +80,10 @@ static DWORD WINAPI thread_WaitForSingleObject(void *arg) ok(event != NULL, "CreateEvent failed\n"); t = GetTickCount(); r = WaitForSingleObject(event, 3000); - ok(r == WAIT_TIMEOUT, "WiatForSingleObject returned %x\n", r); + ok(r == WAIT_TIMEOUT, "WiatForSingleObject returned %lx\n", r); CloseHandle(event); t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); return 0; } @@ -92,7 +93,7 @@ static DWORD WINAPI thread_Sleep(void *arg) Sleep(3000); t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); return 0; } @@ -102,7 +103,7 @@ static DWORD WINAPI thread_SleepEx(void *arg) SleepEx(3000, TRUE); t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); return 0; } @@ -122,10 +123,10 @@ static DWORD WINAPI thread_WaitableTimer_rel(void *arg) ok(r, "SetWaitableTimer failed\n"); r = WaitForSingleObject(timer, INFINITE); - ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", r); CloseHandle(timer); t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); return 0; } @@ -149,10 +150,10 @@ static DWORD WINAPI thread_WaitableTimer_abs(void *arg) ok(r, "SetWaitableTimer failed\n"); r = WaitForSingleObject(timer, INFINITE); - ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", r); CloseHandle(timer); t = GetTickCount() - t; - ok(t < 2000, "t = %d\n", t); + ok(t < 2000, "t = %ld\n", t); return 0; } @@ -172,13 +173,13 @@ static DWORD WINAPI thread_WaitableTimer_period(void *arg) ok(r, "SetWaitableTimer failed\n"); r = WaitForSingleObject(timer, INFINITE); - ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", r); r = WaitForSingleObject(timer, INFINITE); - ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", r); CloseHandle(timer); t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); return 0; } @@ -189,7 +190,7 @@ static DWORD WINAPI thread_SetTimer(void *arg) MSG msg; timer = SetTimer(NULL, 0, 3000, NULL); - ok(timer, "SetTimer failed (%d)\n", GetLastError()); + ok(timer, "SetTimer failed (%ld)\n", GetLastError()); while (GetMessageW(&msg, NULL, 0, 0)) { @@ -198,7 +199,7 @@ static DWORD WINAPI thread_SetTimer(void *arg) } t = GetTickCount() - t; - ok(t > 2000, "t = %d\n", t); + ok(t > 2000, "t = %ld\n", t); KillTimer(NULL, timer); return 0; } @@ -210,7 +211,7 @@ static void test_timeouts(void) if (!adjust_system_time(1)) { - skip("can't adjust system clock (%d)\n", GetLastError()); + skip("can't adjust system clock (%ld)\n", GetLastError()); return; } diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 3bc07ec84f3..7d3df2d5e38 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdarg.h> #include <stdlib.h> @@ -124,7 +125,7 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) { if (pe.th32ProcessID == curr_pid) found++; if (pe.th32ProcessID == sub_pcs_pid) { childpos = num; found++; } - trace("PID=%x %s\n", pe.th32ProcessID, pe.szExeFile); + trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile); num++; } while (pProcess32Next( hSnapshot, &pe )); } @@ -138,7 +139,7 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) { if (pe.th32ProcessID == curr_pid) found++; if (pe.th32ProcessID == sub_pcs_pid) found++; - trace("PID=%x %s\n", pe.th32ProcessID, pe.szExeFile); + trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile); num--; } while (pProcess32Next( hSnapshot, &pe )); } @@ -237,7 +238,7 @@ static DWORD WINAPI get_id_thread(void* curr_pid) free(pcs_buffer); pcs_buffer = malloc(buf_size); } - ok(status == STATUS_SUCCESS, "got %#x\n", status); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); found = FALSE; matched_idx = -1; @@ -332,7 +333,7 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) if (te.th32OwnerProcessID == curr_pid) curr_found++; if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; if (winetest_debug > 1) - trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); + trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num++; } while (pThread32Next( hSnapshot, &te )); } @@ -349,7 +350,7 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) if (te.th32OwnerProcessID == curr_pid) curr_found++; if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; if (winetest_debug > 1) - trace("PID=%x TID=%x %d\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); + trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num--; } while (pThread32Next( hSnapshot, &te )); } @@ -399,7 +400,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected { do { - trace("PID=%x base=%p size=%x %s %s\n", + trace("PID=%lx base=%p size=%lx %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); ok(me.th32ProcessID == pid, "wrong returned process id\n"); for (i = 0; i < num_expected; i++) @@ -418,7 +419,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected { do { - trace("PID=%x base=%p size=%x %s %s\n", + trace("PID=%lx base=%p size=%lx %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); for (i = 0; i < num_expected; i++) if (!lstrcmpiA(expected[i], me.szModule)) found[i]++; @@ -489,7 +490,7 @@ START_TEST(toolhelp) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - sprintf(buffer, "%s toolhelp %lu %lu", selfname, (DWORD_PTR)ev1, (DWORD_PTR)ev2); + sprintf(buffer, "%s toolhelp %Iu %Iu", selfname, (DWORD_PTR)ev1, (DWORD_PTR)ev2); ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to be initialized */ w = WaitForSingleObject(ev1, WAIT_TIME);

1 0

[PATCH 1/2] dlls/kernel32/tests: use correct integral type
by Eric Pouech 09 Mar '22

09 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/fiber.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9ae45c2091b..3503520bdcf 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -285,6 +285,7 @@ static void test_FiberLocalStorage(void) PEB *peb = teb->Peb; NTSTATUS status; HANDLE hthread; + ULONG index2; SIZE_T size; void* val; BOOL ret; @@ -407,13 +408,13 @@ static void test_FiberLocalStorage(void) g_fls_data->fls_callback_chunks[j]->callbacks[index].callback); fls_data->fls_data_chunks[j][index + 1] = (void *)(ULONG_PTR)0x28; - status = pRtlFlsAlloc(test_fls_callback, &i); + status = pRtlFlsAlloc(test_fls_callback, &index2); ok(!status, "Got unexpected status %#x.\n", status); - ok(i == fls_indices[0x10], "Got unexpected index %u.\n", i); + ok(index2 == fls_indices[0x10], "Got unexpected index %u.\n", index2); ok(fls_data->fls_data_chunks[j][index + 1] == (void *)(ULONG_PTR)0x28, "Got unexpected data %p.\n", fls_data->fls_data_chunks[j][index + 1]); - status = pRtlFlsSetValue(i, (void *)(ULONG_PTR)0x11); + status = pRtlFlsSetValue(index2, (void *)(ULONG_PTR)0x11); ok(!status, "Got unexpected status %#x.\n", status); teb->FlsSlots = NULL;

1 1

[PATCH vkd3d] vkd3d: Handle D3D12_APPEND_ALIGNED_ELEMENT for <4 byte wide elements
by Conor McCarthy 09 Mar '22

09 Mar '22

In d3d12, input element alignment needs to be the _minimum_ of 4 and the size of the type. See the D3D11 spec, section 4.4.6, which behaves similarly: https://microsoft.github.io/DirectX-Specs/d3d/archive/D3D11_3_FunctionalSpe… This is correctly taken into account when generating, e.g., the vertex_buffer_stride_align_mask used for validation, but is not taken into account when D3D12_APPEND_ALIGNED_ELEMENT is used to automatically place input elements. Currently, vkd3d always assumes the alignment is 4. This means that, for example, bytes or shorts should be packed tightly together when D3D12_APPEND_ALIGNED_ELEMENT is used, but are instead padded to 4 bytes. Fixing this makes units appear in Age of Empires IV. (CrossOver bug 19924). From: David Gow <david(a)ingeniumdigital.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e51c11ea..847f497b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2807,9 +2807,9 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, if (e->AlignedByteOffset != D3D12_APPEND_ALIGNED_ELEMENT) offsets[i] = e->AlignedByteOffset; else - offsets[i] = input_slot_offsets[e->InputSlot]; + offsets[i] = align(input_slot_offsets[e->InputSlot], min(4, format->byte_count)); - input_slot_offsets[e->InputSlot] = align(offsets[i] + format->byte_count, 4); + input_slot_offsets[e->InputSlot] = offsets[i] + format->byte_count; } return S_OK; -- 2.34.1

1 0

[PATCH] kernelbase: Fix stack overflow by DefineDosDeviceW().
by Xu Wei 09 Mar '22

09 Mar '22

Signed-off-by: Xu Wei <xuwei(a)uniontech.com> --- dlls/kernel32/tests/volume.c | 10 ++++++++++ dlls/kernelbase/volume.c | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 3bc3c7e4872..10746dd6507 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -112,6 +112,7 @@ static void test_dos_devices(void) { char buf[MAX_PATH], buf2[400]; char drivestr[3]; + WCHAR drivestrW[3]; HANDLE file; BOOL ret; @@ -186,6 +187,15 @@ static void test_dos_devices(void) ret = QueryDosDeviceA( drivestr, buf, sizeof(buf) ); ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %lu\n", GetLastError()); + + SetLastError(0); + ret = DefineDosDeviceW( DDD_RAW_TARGET_PATH, drivestrW, NULL ); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); + + SetLastError(0); + ret = DefineDosDeviceW ( DDD_RAW_TARGET_PATH,L"C:/windows/",L"\\Device\\C:/windows/" ); + ok(ret, "got error %u\n", GetLastError()); } static void test_FindFirstVolume(void) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 39386867aa3..d604ee02500 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -384,7 +384,7 @@ err_ret: */ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device, const WCHAR *target ) { - WCHAR link_name[15] = L"\\DosDevices\\"; + WCHAR *link_name = NULL; UNICODE_STRING nt_name, nt_target; OBJECT_ATTRIBUTES attr; NTSTATUS status; @@ -395,17 +395,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION)) FIXME("Ignoring flags %#lx.\n", flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION)); - lstrcatW( link_name, device ); + if (!(link_name = HeapAlloc( GetProcessHeap(), 0, sizeof(L"\\DosDevices\\") + (device ? lstrlenW(device)*sizeof(WCHAR) : 0)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + lstrcpyW( link_name, L"\\DosDevices\\" ); + if (device) lstrcatW( link_name, device ); RtlInitUnicodeString( &nt_name, link_name ); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, 0, NULL ); if (flags & DDD_REMOVE_DEFINITION) { if (!set_ntstatus( NtOpenSymbolicLinkObject( &handle, 0, &attr ) )) + { + HeapFree( GetProcessHeap(), 0, link_name ); return FALSE; + } status = NtMakeTemporaryObject( handle ); NtClose( handle ); + HeapFree( GetProcessHeap(), 0, link_name ); return set_ntstatus( status ); } @@ -414,6 +425,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (!RtlDosPathNameToNtPathName_U( target, &nt_target, NULL, NULL)) { SetLastError( ERROR_PATH_NOT_FOUND ); + HeapFree( GetProcessHeap(), 0, link_name ); return FALSE; } } @@ -422,6 +434,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (!(status = NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &nt_target ))) NtClose( handle ); + HeapFree( GetProcessHeap(), 0, link_name ); return set_ntstatus( status ); } -- 2.20.1

1 0

[PATCH v2 11/11] win32u: Move is_window_drawable implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 90 +------------------------------------------- dlls/win32u/window.c | 32 ++++++++++++++++ include/ntuser.h | 2 + 3 files changed, 36 insertions(+), 88 deletions(-)

3 2

[PATCH v2 10/11] win32u: Move IsWindowVisible implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 15 +-------------- dlls/win32u/window.c | 21 +++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-)

3 2

[PATCH v2 09/11] win32u: Move IsChild implementation from win32u.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 19 +------------------ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/palette.c | 2 +- dlls/win32u/window.c | 25 +++++++++++++++++++++++++ include/ntuser.h | 1 + 6 files changed, 29 insertions(+), 21 deletions(-)

4 3

[PATCH v2 08/11] win32u: Move GWLP_HWNDPARENT implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 14 -------------- dlls/win32u/window.c | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-)

3 2

[PATCH v2 07/11] win32u: Move NtUserGetAncestor implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

3 2

[PATCH v2 03/11] win32u: Move GetWindowTextLength implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 29 ++--------------------------- dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 27 deletions(-)

3 2

[PATCH v2 01/11] win32u: Move NtUserInternalGetWindowText implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

3 2

[PATCH 11/11] win32u: Move is_window_drawable implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 90 +------------------------------------------- dlls/win32u/window.c | 32 ++++++++++++++++ include/ntuser.h | 2 + 3 files changed, 36 insertions(+), 88 deletions(-)

2 1

[PATCH v3 4/8] dllhost: Implement IClassFactory::CreateInstance().
by Dmitry Timoshkov 08 Mar '22

08 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 691f233906a..681a20a6bb5 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -98,8 +98,14 @@ static ULONG WINAPI factory_Release(IClassFactory *iface) static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, IUnknown *punkouter, REFIID iid, void **ppv) { - FIXME("(%p,%p,%s,%p): stub\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); - return E_NOTIMPL; + struct factory *factory = impl_from_IClassFactory(iface); + + TRACE("(%p,%p,%s,%p)\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); + + if (punkouter) + return CLASS_E_NOAGGREGATION; + + return CoGetClassObject(&factory->clsid, CLSCTX_INPROC_SERVER, NULL, iid, ppv); } static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) -- 2.35.1

2 4

[PATCH 08/11] win32u: Move GWLP_HWNDPARENT implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 14 -------------- dlls/win32u/window.c | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-)

2 1

[PATCH 05/11] win32u: Move GetWindow implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 51 +-------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-)

2 1

[PATCH] makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.
by Brendan Shanks 08 Mar '22

08 Mar '22

Fixes launching 32-bit EXEs from a WOW64 build dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52618 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- configure.ac | 2 +- tools/winegcc/winegcc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ab3490b21cd..d408b1f344b 100644 --- a/configure.ac +++ b/configure.ac @@ -773,7 +773,7 @@ case $host_os in LIBS="$ac_save_LIBS" fi - UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)" + UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/" AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib") AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bcec3916843..ab26adb07e8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -416,7 +416,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n if (opts->unix_lib) { strarray_add( &flags, "-install_name" ); - strarray_add( &flags, strmake( "@loader_path/%s.so", output_name ) ); + strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) ); + strarray_add( &flags, "-Wl,-rpath,@loader_path/" ); } strarray_addall( &link_args, flags ); return link_args; -- 2.32.0 (Apple Git-132)

2 1

[PATCH 04/11] win32u: Move GetWindowLong implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 166 +++--------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-)

2 1

[PATCH] wined3d: Allow changing settings using a new WINE_D3D_CONFIG environment variable.
by Zebediah Figura 08 Mar '22

08 Mar '22

This can be significantly more convenient than modifying the registry. config_list_get_value() is based on vkd3d_debug_list_has_member() by Józef Kucia. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 108 +++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 248c886542f..a4eb23eac05 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -152,17 +152,67 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return object; } -static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size) +static bool is_option_separator(char c) { + return c == ',' || c == ';' || c == '\0'; +} + +static const char *config_list_get_value(const char *string, const char *key, size_t *len) +{ + const char *p, *end; + char prev_char; + + p = string; + while (p) + { + if ((p = strstr(p, key))) + { + prev_char = p > string ? p[-1] : 0; + p += strlen(key); + + if (is_option_separator(prev_char) && *p == '=') + { + if ((end = strpbrk(p + 1, ",;"))) + *len = end - p + 1; + else + *len = strlen(p + 1); + return p + 1; + } + } + } + + return NULL; +} + +static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *env, const char *name, char *buffer, DWORD size) +{ + const char *env_value; + size_t env_len; + + if ((env_value = config_list_get_value(env, name, &env_len)) && env_len < size) + { + memcpy(buffer, env_value, env_len); + buffer[env_len] = 0; + return 0; + } if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (BYTE *)buffer, &size)) return 0; return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *env, const char *name, DWORD *value) { DWORD type, data, size; + const char *env_value; + size_t env_len; + char *end; + if ((env_value = config_list_get_value(env, name, &env_len))) + { + *value = strtoul(env_value, &end, 0); + if (end != env_value) + return 0; + } size = sizeof(data); if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; size = sizeof(data); @@ -214,6 +264,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) char app_name[MAX_PATH], buffer[MAX_PATH + 10]; DWORD wined3d_context_tls_idx; DWORD size = sizeof(buffer); + const char *env; HKEY hkey = 0; HKEY appkey = 0; DWORD tmpvalue; @@ -271,17 +322,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } } - if (hkey || appkey) + /* Allow modifying settings using the WINE_D3D_CONFIG environment variable, + * which takes precedence over registry keys. An example is as follows: + * + * WINE_D3D_CONFIG=csmt=0x1,shader_backend=glsl + */ + env = getenv("WINE_D3D_CONFIG"); + + if (hkey || appkey || env) { - if (!get_config_key_dword(hkey, appkey, "csmt", &wined3d_settings.cs_multithreaded)) + if (!get_config_key_dword(hkey, appkey, env, "csmt", &wined3d_settings.cs_multithreaded)) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); - if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MaxVersionGL", &tmpvalue)) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) + if (!get_config_key(hkey, appkey, env, "shader_backend", buffer, size)) { if (!_strnicmp(buffer, "glsl", -1)) { @@ -305,10 +363,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled.\n"); } - if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) + if (!get_config_key(hkey, appkey, env, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { int pci_device_id = tmpvalue; @@ -323,7 +381,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_device_id = pci_device_id; } } - if ( !get_config_key_dword( hkey, appkey, "VideoPciVendorID", &tmpvalue) ) + if (!get_config_key_dword(hkey, appkey, env, "VideoPciVendorID", &tmpvalue)) { int pci_vendor_id = tmpvalue; @@ -338,7 +396,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_vendor_id = pci_vendor_id; } } - if ( !get_config_key( hkey, appkey, "VideoMemorySize", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "VideoMemorySize", buffer, size)) { int TmpVideoMemorySize = atoi(buffer); if(TmpVideoMemorySize > 0) @@ -351,7 +409,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else ERR("VideoMemorySize is %i but must be >0\n", TmpVideoMemorySize); } - if ( !get_config_key( hkey, appkey, "WineLogo", buffer, size) ) + if (!get_config_key(hkey, appkey, env, "WineLogo", buffer, size)) { size_t len = strlen(buffer) + 1; @@ -360,38 +418,38 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) else memcpy(wined3d_settings.logo, buffer, len); } - if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "MultisampleTextures", &tmpvalue)) { wined3d_settings.multisample_textures = !!tmpvalue; ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); } - if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) + if (!get_config_key_dword(hkey, appkey, env, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); - if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + if (!get_config_key(hkey, appkey, env, "CheckFloatConstants", buffer, size) && !strcmp(buffer, "enabled")) { TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = 1; } - if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "strict_shader_math", &tmpvalue)) { wined3d_settings.strict_shader_math = !!tmpvalue; ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); } - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) TRACE("Limiting HS shader model to %u.\n", wined3d_settings.max_sm_hs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelDS", &wined3d_settings.max_sm_ds)) TRACE("Limiting DS shader model to %u.\n", wined3d_settings.max_sm_ds); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); - if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) + if (!get_config_key_dword(hkey, appkey, env, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if (!get_config_key(hkey, appkey, "renderer", buffer, size)) + if (!get_config_key(hkey, appkey, env, "renderer", buffer, size)) { if (!strcmp(buffer, "vulkan")) { @@ -409,18 +467,18 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } - if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + if (!get_config_key_dword(hkey, appkey, env, "cb_access_map_w", &tmpvalue) && tmpvalue) { TRACE("Forcing all constant buffers to be write-mappable.\n"); wined3d_settings.cb_access_map_w = 1; } - if (!get_config_key_dword(hkey, appkey, "lenient_nooverwrite", &tmpvalue)) + if (!get_config_key_dword(hkey, appkey, env, "lenient_nooverwrite", &tmpvalue)) wined3d_settings.lenient_nooverwrite = tmpvalue; else wined3d_settings.lenient_nooverwrite = quirk_match_lenient_nooverwrite(app_name); if (wined3d_settings.lenient_nooverwrite) TRACE("Allowing DISCARD and NOOVERWRITE maps on non-dynamic resources.\n"); - if (!get_config_key_dword(hkey, appkey, "fake_screen_bit_depth", &wined3d_settings.fake_screen_bit_depth)) + if (!get_config_key_dword(hkey, appkey, env, "fake_screen_bit_depth", &wined3d_settings.fake_screen_bit_depth)) TRACE("Overriding screen bit depth with %u.\n", wined3d_settings.fake_screen_bit_depth); } -- 2.35.1

2 1

[PATCH 1/7] ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_LOOP with zero optlen.
by Paul Gofman 08 Mar '22

08 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index dacb41a0403..816ca828b90 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2981,6 +2981,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen ); case IP_MULTICAST_LOOP: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); case IP_MULTICAST_TTL: -- 2.35.1

3 17

[PATCH 1/3] server: fix some error detection
by Eric Pouech 08 Mar '22

08 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- server/mapping.c | 4 ++-- server/request.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..6b0785c1c0c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -691,13 +691,13 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!file_size) return STATUS_INVALID_FILE_FOR_SECTION; size = pread( unix_fd, &mz, sizeof(mz), 0 ); - if (size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; + if (size < 0 || size < sizeof(mz.dos)) return STATUS_INVALID_IMAGE_NOT_MZ; if (mz.dos.e_magic != IMAGE_DOS_SIGNATURE) return STATUS_INVALID_IMAGE_NOT_MZ; mz_size = size; pos = mz.dos.e_lfanew; size = pread( unix_fd, &nt, sizeof(nt), pos ); - if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; + if (size < 0 || size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); diff --git a/server/request.c b/server/request.c index 7021741c765..1bc92d479ae 100644 --- a/server/request.c +++ b/server/request.c @@ -265,7 +265,8 @@ static void send_reply( union generic_reply *reply ) vec[1].iov_base = current->reply_data; vec[1].iov_len = current->reply_size; - if ((ret = writev( get_unix_fd( current->reply_fd ), vec, 2 )) < sizeof(*reply)) goto error; + ret = writev( get_unix_fd( current->reply_fd ), vec, 2 ); + if (ret < 0 || ret < sizeof(*reply)) goto error; if ((current->reply_towrite = current->reply_size - (ret - sizeof(*reply)))) {

2 1

[PATCH 3/3] include: fix prototype of NtQueryInformationFile
by Eric Pouech 08 Mar '22

08 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..cc8bf0c6e82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4021,7 +4021,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC * NtQueryInformationFile (NTDLL.@) */ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, LONG len, FILE_INFORMATION_CLASS class ) + void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { static const size_t info_sizes[] = { diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..4c49f5eae47 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4048,7 +4048,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOL NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG);

1 0

[PATCH] maintainers: Add dllhost.
by Huw Davies 08 Mar '22

08 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index a90c91b60b7..9ceae9e80bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -233,6 +233,7 @@ F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c +F: programs/dllhost/ OLE Storage M: Esme Povirk <esme(a)codeweavers.com> -- 2.23.0

1 0

[PATCH v2 06/11] win32u: Move GetParent implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 34 +---------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-)

2 1

[PATCH v2 05/11] win32u: Move GetWindow implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 51 +-------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-)

2 1

[PATCH v2 04/11] win32u: Move GetWindowLong implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 166 +++--------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-)

2 1

[PATCH v2 02/11] user32: Use NtUserInternalGetWindowText in GetWindowText.
by Jacek Caban 08 Mar '22

08 Mar '22

Instead of get_server_window_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH] winevulkan: Update to VK spec version 1.3.207.
by Georg Lehmann 08 Mar '22

08 Mar '22

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

1 0

[PATCH 01/11] win32u: Move NtUserInternalGetWindowText implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

2 1

[PATCH] po: Update Dutch Translation.
by Floris Renaud 08 Mar '22

08 Mar '22

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 72 +++++++++++++++----------------------------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/po/nl.po b/po/nl.po index 03b653aa5c0..088a3d52a25 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: 2022-02-05 10:30+0100\n" +"PO-Revision-Date: 2022-03-08 13:40+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10590,11 +10590,9 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Mountain Standaard Tijd (Mexico)" +msgstr "Mountain St. Tijd (Mexico)" #: dlls/tzres/tzres.rc:241 msgctxt "maximum 31 characters" @@ -10662,16 +10660,14 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howe-eiland" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "Arabic Standard Time" msgctxt "maximum 31 characters" msgid "Arabic Standard Time" -msgstr "Arabisch Schiereiland Standaard Tijd" +msgstr "Arab. Schiereiland St. Tijd" #: dlls/tzres/tzres.rc:49 msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" -msgstr "Arabisch Schiereiland Zomertijd" +msgstr "Arab. Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10985,18 +10981,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Buenos Aires (stad)" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- en Caicoseilanden Standaard Tijd" +msgstr "Turks en Caicos Standaard Tijd" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- en Caicoseilanden Zomertijd" +msgstr "Turks en Caicos Zomertijd" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11236,11 +11228,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Noordcentraal-Azië Standaard Tijd" +msgstr "Noordcentraal-Azië St. Tijd" #: dlls/tzres/tzres.rc:247 msgctxt "maximum 31 characters" @@ -11457,11 +11447,9 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 -#, fuzzy -#| msgid "Cen. Australia Standard Time" msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" -msgstr "Centraal Australië Standaard Tijd" +msgstr "Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:97 msgctxt "maximum 31 characters" @@ -11524,11 +11512,9 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Zuid-Amerika Oost Standaard Tijd" +msgstr "Zuid-Amerika Oost St. Tijd" #: dlls/tzres/tzres.rc:310 msgctxt "maximum 31 characters" @@ -11596,11 +11582,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskou, Sint-Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "W-Centraal Australië Standaard Tijd" +msgstr "W-Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:64 msgctxt "maximum 31 characters" @@ -11649,18 +11633,14 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtsjatski" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Bank Standard Time" msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Westelijke Jordaanoever Standaard Tijd" +msgstr "W. Jordaanoever Standaard Tijd" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Bank Daylight Time" msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Westelijke Jordaanoever Zomertijd" +msgstr "W. Jordaanoever Zomertijd" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11681,11 +11661,9 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 -#, fuzzy -#| msgid "AUS Central Standard Time" msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Centraal-Australië Standaard Tijd" +msgstr "Centraal-Australië St. Tijd" #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" @@ -11767,11 +11745,9 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:313 msgctxt "maximum 31 characters" @@ -11993,11 +11969,9 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Brazilian Standard Time" msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" -msgstr "Centraal Brazilië Standaard Tijd" +msgstr "Centraal Brazilië St. Tijd" #: dlls/tzres/tzres.rc:106 msgctxt "maximum 31 characters" @@ -12023,11 +11997,9 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:316 msgctxt "maximum 31 characters" @@ -12202,11 +12174,9 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Oost Zuid-Amerika Standaard Tijd" +msgstr "Oost Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:145 msgctxt "maximum 31 characters" @@ -12232,11 +12202,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Salomonseilanden, Nieuw-Caledonië" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "West Centraal-Afrika Standaard Tijd" +msgstr "West Centraal-Afrika St. Tijd" #: dlls/tzres/tzres.rc:424 msgctxt "maximum 31 characters" @@ -12248,11 +12216,9 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West Centraal-Afrika" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Pacific Zuid-Amerika Stand. Tijd" +msgstr "Pacific Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:277 msgctxt "maximum 31 characters" -- 2.35.1

1 0

[PATCH 10/11] win32u: Move IsWindowVisible implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 15 +-------------- dlls/win32u/window.c | 21 +++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-)

1 0

[PATCH 09/11] win32u: Move IsChild implementation from win32u.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 19 +------------------ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/palette.c | 2 +- dlls/win32u/window.c | 25 +++++++++++++++++++++++++ include/ntuser.h | 1 + 6 files changed, 29 insertions(+), 21 deletions(-)

1 0

[PATCH 07/11] win32u: Move NtUserGetAncestor implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

1 0

[PATCH 06/11] win32u: Move GetParent implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 34 +---------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-)

1 0

[PATCH 03/11] win32u: Move GetWindowTextLength implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 29 ++--------------------------- dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 27 deletions(-)

1 0

[PATCH 02/11] user32: Use NtUserInternalGetWindowText in GetWindowText.
by Jacek Caban 08 Mar '22

08 Mar '22

Instead of get_server_window_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH v2 1/3] ntdll: Add NtAccessCheckByTypeAndAuditAlarm stub.
by Mohamad Al-Jaf 08 Mar '22

08 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Add entry to ntdll/unix/loader, ntdll/ntdll.spec, and loader.c - Add entry to ntoskrnl.exe/ntoskrnl.exe.spec - Add function to wow64/security --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/security.c | 18 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/wow64/security.c | 34 +++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winnt.h | 7 ++++++ include/winternl.h | 1 + 8 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..7c76f1d1d42 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -131,7 +131,7 @@ @ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByType -# @ stub NtAccessCheckByTypeAndAuditAlarm +@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByTypeResultList # @ stub NtAccessCheckByTypeResultListAndAuditAlarm # @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle @@ -1155,7 +1155,7 @@ @ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm # @ stub ZwAccessCheckByType -# @ stub ZwAccessCheckByTypeAndAuditAlarm +@ stdcall -private -syscall ZwNtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm # @ stub ZwAccessCheckByTypeResultList # @ stub ZwAccessCheckByTypeResultListAndAuditAlarm # @ stub ZwAccessCheckByTypeResultListAndAuditAlarmByHandle diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eb201bd90b..4a0c70d5a2c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -124,6 +124,7 @@ static void * const syscalls[] = NtAcceptConnectPort, NtAccessCheck, NtAccessCheckAndAuditAlarm, + NtAccessCheckByTypeAndAuditAlarm, NtAddAtom, NtAdjustGroupsToken, NtAdjustPrivilegesToken, diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..728ee961aa2 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha } +/*********************************************************************** + * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@) + */ +NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *type_name, UNICODE_STRING *name, + PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access, + AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list, + ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, NTSTATUS *access_status, + BOOLEAN *on_close ) +{ + FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n", + debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid, + access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a5557..ff7135928cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1383,6 +1383,7 @@ @ stub WmiUpdateTrace @ stub XIPDispatch @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm +@ stdcall -private ZwNtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm @ stub ZwAddBootEntry @ stdcall -private ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private ZwAlertThread(long) NtAlertThread diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 680f5a6ec56..ce9767c5d07 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -98,6 +98,40 @@ NTSTATUS WINAPI wow64_NtAccessCheckAndAuditAlarm( UINT *args ) } +/********************************************************************** + * wow64_NtAccessCheckByTypeAndAuditAlarm + */ +NTSTATUS WINAPI wow64_NtAccessCheckByTypeAndAuditAlarm( UINT *args ) +{ + UNICODE_STRING32 *subsystem32 = get_ptr( &args ); + HANDLE handle = get_handle( &args ); + UNICODE_STRING32 *typename32 = get_ptr( &args ); + UNICODE_STRING32 *objname32 = get_ptr( &args ); + SECURITY_DESCRIPTOR *sd32 = get_ptr( &args ); + SID *sid = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + AUDIT_EVENT_TYPE type = get_ulong( &args ); + ULONG flags = get_ulong( &args ); + OBJECT_TYPE_LIST *list = get_ptr( &args ); + ULONG length = get_ulong( &args ); + GENERIC_MAPPING *mapping = get_ptr( &args ); + BOOLEAN creation = get_ulong( &args ); + ACCESS_MASK *access_granted = get_ptr( &args ); + BOOLEAN *access_status = get_ptr( &args ); + BOOLEAN *onclose = get_ptr( &args ); + + UNICODE_STRING subsystem, typename, objname; + SECURITY_DESCRIPTOR sd; + + return NtAccessCheckByTypeAndAuditAlarm( unicode_str_32to64( &subsystem, subsystem32 ), handle, + unicode_str_32to64( &typename, typename32 ), + unicode_str_32to64( &objname, objname32 ), + secdesc_32to64( &sd, sd32 ), access, type, flags, list, + length, mapping, creation, + access_granted, access_status, onclose ); +} + + /********************************************************************** * wow64_NtAdjustGroupsToken */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 0c2ba574031..17ebde65826 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,6 +25,7 @@ SYSCALL_ENTRY( NtAcceptConnectPort ) \ SYSCALL_ENTRY( NtAccessCheck ) \ SYSCALL_ENTRY( NtAccessCheckAndAuditAlarm ) \ + SYSCALL_ENTRY( NtAccessCheckByTypeAndAuditAlarm ) \ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAdjustGroupsToken ) \ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..939c2f8d7dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..8e236f9d97d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -- 2.35.1

2 6

[PATCH vkd3d v2 1/5] tests: Split hlsl-operations into individual test units.
by Zebediah Figura 08 Mar '22

08 Mar '22

Partly to make the tests easier to navigate, and partly to allow marking some tests as SM4+. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 12 +- tests/arithmetic-float.shader_test | 25 ++ tests/arithmetic-int.shader_test | 25 ++ tests/arithmetic-uint.shader_test | 25 ++ tests/bitwise.shader_test | 129 ++++++++++ tests/hlsl-operations.shader_test | 367 ----------------------------- tests/logic-operations.shader_test | 158 +++++++++++++ 7 files changed, 372 insertions(+), 369 deletions(-) create mode 100644 tests/arithmetic-float.shader_test create mode 100644 tests/arithmetic-int.shader_test create mode 100644 tests/arithmetic-uint.shader_test create mode 100644 tests/bitwise.shader_test delete mode 100644 tests/hlsl-operations.shader_test create mode 100644 tests/logic-operations.shader_test diff --git a/Makefile.am b/Makefile.am index d4402910c..79aacfcd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,10 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/abs.shader_test \ + tests/arithmetic-float.shader_test \ + tests/arithmetic-int.shader_test \ + tests/arithmetic-uint.shader_test \ + tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -85,7 +89,6 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ - tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -97,6 +100,7 @@ vkd3d_shader_tests = \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ + tests/logic-operations.shader_test \ tests/math.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ @@ -309,6 +313,10 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ + tests/arithmetic-float.shader_test \ + tests/arithmetic-int.shader_test \ + tests/arithmetic-uint.shader_test \ + tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -334,7 +342,6 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ - tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -342,6 +349,7 @@ XFAIL_TESTS = \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ + tests/logic-operations.shader_test \ tests/max.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test new file mode 100644 index 000000000..dcda1bcf8 --- /dev/null +++ b/tests/arithmetic-float.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.33333333) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test new file mode 100644 index 000000000..959f94033 --- /dev/null +++ b/tests/arithmetic-int.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test new file mode 100644 index 000000000..d73947f9f --- /dev/null +++ b/tests/arithmetic-uint.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, 4294967296.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, 4294967296.0, 3.0) diff --git a/tests/bitwise.shader_test b/tests/bitwise.shader_test new file mode 100644 index 000000000..679cf9cd9 --- /dev/null +++ b/tests/bitwise.shader_test @@ -0,0 +1,129 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, -6.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, 4294967296.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/hlsl-operations.shader_test b/tests/hlsl-operations.shader_test deleted file mode 100644 index 09846b18f..000000000 --- a/tests/hlsl-operations.shader_test +++ /dev/null @@ -1,367 +0,0 @@ - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, -10.0, 75.0, 0.33333333) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - float zero = 0.0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float zero = 0.0; - float one = 1.0; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float zero = 0.0; - float one = 1.0; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, -10.0, 75.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - int zero = 0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x >> y, y >> x, x << y, y << x); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x & y, x | y, x ^ y, ~x); -} - -[test] -draw quad -probe all rgba (5.0, 15.0, 10.0, -6.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero & zero, zero & one, one & zero, one & one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero | zero, zero | one, one | zero, one | one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, 4294967296.0, 75.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, 4294967296.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - uint zero = 0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x >> y, y >> x, x << y, y << x); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x & y, x | y, x ^ y, ~x); -} - -[test] -draw quad -probe all rgba (5.0, 15.0, 10.0, 4294967296.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero & zero, zero & one, one & zero, one & one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero | zero, zero | one, one | zero, one | one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test new file mode 100644 index 000000000..360ca03b3 --- /dev/null +++ b/tests/logic-operations.shader_test @@ -0,0 +1,158 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + float zero = 0.0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + int zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + uint zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) -- 2.35.1

2 9

[PATCH 1/2] d3dcompiler: Implement d3dcompiler_shader_reflection_GetThreadGroupSize().
by Paul Gofman 08 Mar '22

08 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 87 ++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 57 +++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 91cc20cdded..1080b4dc6c8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -50,6 +50,8 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE #define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT 16 +#define D3DCOMPILER_SHADER_TYPE_CS 0x5 struct d3dcompiler_shader_signature { @@ -158,6 +160,9 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + UINT thread_group_size_x; + UINT thread_group_size_y; + UINT thread_group_size_z; struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; @@ -707,9 +712,21 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLeve static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p, sizex %p, sizey %p, sizez %p.\n", iface, sizex, sizey, sizez); + + if (!sizex || !sizey || !sizez) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *sizex = reflection->thread_group_size_x; + *sizey = reflection->thread_group_size_y; + *sizez = reflection->thread_group_size_z; + + return *sizex * *sizey * *sizez; } static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( @@ -1754,15 +1771,78 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * return S_OK; } +#define SM4_OPCODE_MASK 0xff +#define SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define SM4_INSTRUCTION_LENGTH_MASK (0x1fu << SM4_INSTRUCTION_LENGTH_SHIFT) + +enum sm4_opcode +{ + SM5_OP_DCL_THREAD_GROUP = 0x9b, +}; + static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, size_t data_size) { + DWORD opcode_token, opcode; + uint32_t size, shader_type; const char *ptr = data; + const uint32_t *u_ptr; + unsigned int len; r->version = read_u32(&ptr); TRACE("Shader version: %u\n", r->version); - /* todo: Check if anything else is needed from the shdr or shex blob. */ + shader_type = (r->version & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT; + + if (shader_type != D3DCOMPILER_SHADER_TYPE_CS) + { + /* todo: Check if anything else is needed from the shdr or shex blob. */ + return S_OK; + } + size = read_u32(&ptr); + TRACE("size %u.\n", size); + if (size * sizeof(DWORD) != data_size || size < 2) + { + WARN("Invalid size %u.\n", size); + return E_FAIL; + } + size -= 2; + u_ptr = (uint32_t *)ptr; + while (size) + { + opcode_token = *u_ptr; + opcode = opcode_token & SM4_OPCODE_MASK; + len = ((opcode_token & SM4_INSTRUCTION_LENGTH_MASK) >> SM4_INSTRUCTION_LENGTH_SHIFT); + if (!len) + { + if (size < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + return E_FAIL; + } + len = u_ptr[1]; + } + if (!len || size < len) + { + WARN("Read invalid length %u, remaining %u.\n", len, size); + return E_FAIL; + } + if (opcode == SM5_OP_DCL_THREAD_GROUP) + { + TRACE("Found dcl_thread_group.\n"); + if (len != 4) + { + WARN("Invalid dcl_thread_group opcode length %u.\n", len); + return E_FAIL; + } + r->thread_group_size_x = u_ptr[1]; + r->thread_group_size_y = u_ptr[2]; + r->thread_group_size_z = u_ptr[3]; + } + size -= len; + u_ptr += len; + } return S_OK; } @@ -1972,7 +2052,6 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void } *reflector = object; - TRACE("Created ID3D11ShaderReflection %p\n", object); return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f2b7f094de6..9781f91ab2b 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -777,6 +777,7 @@ static void test_reflection_desc_ps(void) D3D_NAME expected; unsigned int i; #if D3D_COMPILER_VERSION + UINT size_x, size_y, size_z, size_total; UINT ret; #endif @@ -920,6 +921,14 @@ static void test_reflection_desc_ps(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } +#if D3D_COMPILER_VERSION + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(!size_x, "Got unexpected size %u.\n", size_x); + ok(!size_y, "Got unexpected size %u.\n", size_y); + ok(!size_z, "Got unexpected size %u.\n", size_z); + ok(!size_total, "Got unexpected size %u.\n", size_total); +#endif + count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected count %lu.\n", count); } @@ -1186,6 +1195,53 @@ static const D3D12_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0, 0, 1}, }; +#if D3D_COMPILER_VERSION +static void test_reflection_cs(void) +{ +/* + * fxc.exe /T cs_5_1 /Fo + */ +#if 0 +[numthreads(16, 8, 4)] +void main( uint3 DTid : SV_DispatchThreadID ) +{ +} +#endif + static const DWORD test_blob[] = + { + 0x43425844, 0x77a220d9, 0xfebd5b9c, 0x14a86e30, 0x57537394, 0x00000001, 0x00000184, 0x00000005, + 0x00000034, 0x000000a0, 0x000000b0, 0x000000c0, 0x000000e8, 0x46454452, 0x00000064, 0x00000000, + 0x00000000, 0x00000000, 0x0000003c, 0x43530501, 0x00000500, 0x0000003c, 0x25441313, 0x0000003c, + 0x00000018, 0x00000028, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, + 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, + 0x58454853, 0x00000020, 0x00050051, 0x00000008, 0x0100086a, 0x0400009b, 0x00000010, 0x00000008, + 0x00000004, 0x0100003e, 0x54415453, 0x00000094, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, + }; + UINT size_x, size_y, size_z, size_total; + ID3D11ShaderReflection *ref11; + HRESULT hr; + + hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + todo_wine_if(D3D_COMPILER_VERSION < 47) + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + return; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(size_x == 16, "Got unexpected size %u.\n", size_x); + ok(size_y == 8, "Got unexpected size %u.\n", size_y); + ok(size_z == 4, "Got unexpected size %u.\n", size_z); + ok(size_total == size_x * size_y *size_z, "Got unexpected size %u.\n", size_total); + + ref11->lpVtbl->Release(ref11); +} +#endif + static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADER_INPUT_BIND_DESC *result, unsigned int result_count, unsigned int target_version) { @@ -2150,6 +2206,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); + test_reflection_cs(); #else test_d3d10_interfaces(); #endif -- 2.35.1

1 1

[PATCH v2 3/3] ncrypt/tests: Test for symmetric keys support.
by Hans Leidekker 08 Mar '22

08 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index d1bcbbcab2a..cf434054428 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -291,6 +291,13 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + + key = 0; + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); + if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); + else ok(key, "got null handle\n"); + NCryptFreeObject(prov); } } -- 2.30.2

1 0

[PATCH v2 2/3] ncrypt: Make use of bcrypt for low level cryptography.
by Hans Leidekker 08 Mar '22

08 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Make sure all handles are closed in free_key_object(). Consistent naming. Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/Makefile.in | 1 + dlls/ncrypt/main.c | 93 +++++++++++------------------------ dlls/ncrypt/ncrypt_internal.h | 28 ++--------- 3 files changed, 34 insertions(+), 88 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index ad3ed409961..f46aecae66b 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,5 +1,6 @@ IMPORTLIB = ncrypt MODULE = ncrypt.dll +IMPORTS = bcrypt EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 68d9d884618..8ace3e55731 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -88,21 +88,9 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) static SECURITY_STATUS free_key_object(struct key *key) { - switch (key->alg) - { - case RSA: - { - free(key->rsa.modulus); - free(key->rsa.public_exp); - free(key->rsa.prime1); - free(key->rsa.prime2); - break; - } - default: - WARN("invalid key %p\n", key); - return NTE_INVALID_HANDLE; - } - return ERROR_SUCCESS; + NTSTATUS ret = BCryptDestroyKey(key->bcrypt_key); + if (BCryptCloseAlgorithmProvider(key->bcrypt_alg, 0)) return NTE_INVALID_HANDLE; + return ret ? NTE_INVALID_HANDLE : ERROR_SUCCESS; } SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE handle) @@ -246,8 +234,9 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H BYTE *data, DWORD datasize, DWORD flags) { BCRYPT_KEY_BLOB *header = (BCRYPT_KEY_BLOB *)data; + struct object *object; - TRACE("(%#Ix, %#Ix, %s, %p, %p, %p, %lu, %#lx): stub\n", provider, decrypt_key, wine_dbgstr_w(type), + TRACE("(%#Ix, %#Ix, %s, %p, %p, %p, %lu, %#lx)\n", provider, decrypt_key, wine_dbgstr_w(type), params, handle, data, datasize, flags); if (decrypt_key) @@ -270,70 +259,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_BAD_FLAGS; } - switch (header->Magic) + if (!(object = allocate_object(KEY))) { + ERR("Error allocating memory\n"); + return NTE_NO_MEMORY; + } + + switch(header->Magic) + { + case BCRYPT_RSAFULLPRIVATE_MAGIC: + case BCRYPT_RSAPRIVATE_MAGIC: case BCRYPT_RSAPUBLIC_MAGIC: { - DWORD expected_size; - struct object *object; - struct key *key; - BYTE *public_exp, *modulus; - BCRYPT_RSAKEY_BLOB *rsaheader = (BCRYPT_RSAKEY_BLOB *)data; - - if (datasize < sizeof(*rsaheader)) - { - ERR("Invalid buffer size.\n"); - return NTE_BAD_DATA; - } - - expected_size = sizeof(*rsaheader) + rsaheader->cbPublicExp + rsaheader->cbModulus; - if (datasize != expected_size) - { - ERR("Invalid buffer size.\n"); - return NTE_BAD_DATA; - } - - if (!(object = allocate_object(KEY))) + NTSTATUS ret; + BCRYPT_RSAKEY_BLOB *rsablob = (BCRYPT_RSAKEY_BLOB *)data; + ret = BCryptOpenAlgorithmProvider(&object->key.bcrypt_alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret != ERROR_SUCCESS) { - ERR("Error allocating memory.\n"); - return NTE_NO_MEMORY; - } - - key = &object->key; - key->alg = RSA; - key->rsa.bit_length = rsaheader->BitLength; - key->rsa.public_exp_size = rsaheader->cbPublicExp; - key->rsa.modulus_size = rsaheader->cbModulus; - if (!(key->rsa.public_exp = malloc(rsaheader->cbPublicExp))) - { - ERR("Error allocating memory.\n"); + ERR("Error opening algorithm provider\n"); free(object); - return NTE_NO_MEMORY; + return NTE_INTERNAL_ERROR; } - if (!(key->rsa.modulus = malloc(rsaheader->cbModulus))) + ret = BCryptImportKeyPair(object->key.bcrypt_alg, NULL, type, &object->key.bcrypt_key, data, datasize, 0); + if (ret != ERROR_SUCCESS) { - ERR("Error allocating memory.\n"); - free(key->rsa.public_exp); + WARN("Error importing key pair with bcrypt %#lx\n", ret); + BCryptCloseAlgorithmProvider(object->key.bcrypt_alg, 0); free(object); - return NTE_NO_MEMORY; + return NTE_BAD_DATA; } - public_exp = &data[sizeof(*rsaheader)]; /* The public exp is after the header. */ - modulus = &public_exp[rsaheader->cbPublicExp]; /* The modulus is after the public exponent. */ - memcpy(key->rsa.public_exp, public_exp, rsaheader->cbPublicExp); - memcpy(key->rsa.modulus, modulus, rsaheader->cbModulus); - - set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)L"RSA", sizeof(L"RSA")); - set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&key->rsa.bit_length, sizeof(key->rsa.bit_length)); set_object_property(object, NCRYPT_PROVIDER_HANDLE_PROPERTY, (BYTE *)&provider, sizeof(provider)); - *handle = (NCRYPT_KEY_HANDLE)object; + set_object_property(object, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)BCRYPT_RSA_ALGORITHM, sizeof(BCRYPT_RSA_ALGORITHM)); + set_object_property(object, NCRYPT_LENGTH_PROPERTY, (BYTE *)&rsablob->BitLength, sizeof(rsablob->BitLength)); break; } default: - FIXME("Unhandled key magic %#lx.\n", header->Magic); + FIXME("Unhandled key magic %#lx\n", header->Magic); + free(object); return NTE_INVALID_PARAMETER; } + *handle = (NCRYPT_KEY_HANDLE)object; return ERROR_SUCCESS; } diff --git a/dlls/ncrypt/ncrypt_internal.h b/dlls/ncrypt/ncrypt_internal.h index 3966dd73ed6..e5884c8871a 100644 --- a/dlls/ncrypt/ncrypt_internal.h +++ b/dlls/ncrypt/ncrypt_internal.h @@ -16,34 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -enum key_algorithm -{ - DH, - DSA, - ECC, - RSA, -}; - -struct rsa_key -{ - DWORD bit_length; - DWORD public_exp_size; - BYTE *public_exp; - DWORD modulus_size; - BYTE *modulus; - DWORD prime1_size; - BYTE *prime1; - DWORD prime2_size; - BYTE *prime2; -}; +#include <bcrypt.h> struct key { - enum key_algorithm alg; - union - { - struct rsa_key rsa; - }; + BCRYPT_ALG_HANDLE bcrypt_alg; + BCRYPT_KEY_HANDLE bcrypt_key; }; struct storage_provider -- 2.30.2

1 0

[PATCH v2 1/3] bcrypt: Implement KeyLength property.
by Hans Leidekker 08 Mar '22

08 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Formatting. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 6 ++++++ dlls/bcrypt/tests/bcrypt.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 072b7915b1e..5df4da009a4 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -701,6 +701,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } } + else if (!wcscmp( prop, BCRYPT_KEY_LENGTH )) + { + if (size < sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + key->u.a.bitlen = *(DWORD*)value; + return STATUS_SUCCESS; + } FIXME( "unsupported key property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 4d7516a55ac..8982e0ae90b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -672,6 +672,7 @@ static void test_BCryptGenerateSymmetricKey(void) BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); @@ -706,6 +707,13 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + todo_wine + { + keylen = 512; + ret = BCryptSetProperty(aes, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + } + size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); @@ -2005,6 +2013,7 @@ static void test_RSA(void) ULONG len, size, size2, schemes; NTSTATUS ret; BYTE *buf; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) @@ -2052,12 +2061,21 @@ static void test_RSA(void) ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* sign/verify with export/import round-trip */ - ret = BCryptGenerateKeyPair(alg, &key, 512, 0); + ret = BCryptGenerateKeyPair(alg, &key, 1024, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + keylen = 512; + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, 2, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); -- 2.30.2

1 0

[PATCH v3 3/8] dllhost: Implement ISurrogate::LoadDllServer().
by Dmitry Timoshkov 08 Mar '22

08 Mar '22

v3: Forward IMarshal::QueryInterface() to parent IClassFactory::QueryInterface(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/dllhost.c | 200 ++++++++++++++++++++++++++++++++++++- 1 file changed, 198 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index a0d3b9937f1..691f233906a 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -28,9 +28,182 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct factory +{ + IClassFactory IClassFactory_iface; + IMarshal IMarshal_iface; + CLSID clsid; + LONG ref; +}; + +static inline struct factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct factory, IClassFactory_iface); +} + +static inline struct factory *impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, struct factory, IMarshal_iface); +} + +static HRESULT WINAPI factory_QueryInterface(IClassFactory *iface, + REFIID iid, void **ppv) +{ + struct factory *factory = impl_from_IClassFactory(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IClassFactory)) + { + IClassFactory_AddRef(&factory->IClassFactory_iface); + *ppv = &factory->IClassFactory_iface; + return S_OK; + } + else if (IsEqualIID(iid, &IID_IMarshal)) + { + IClassFactory_AddRef(&factory->IClassFactory_iface); + *ppv = &factory->IMarshal_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef(IClassFactory *iface) +{ + struct factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&factory->ref); + + TRACE("(%p)->%lu\n", iface, ref); + return ref; +} + +static ULONG WINAPI factory_Release(IClassFactory *iface) +{ + struct factory *factory = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&factory->ref); + + TRACE("(%p)->%lu\n", iface, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, factory); + + return ref; +} + +static HRESULT WINAPI factory_CreateInstance(IClassFactory *iface, + IUnknown *punkouter, REFIID iid, void **ppv) +{ + FIXME("(%p,%p,%s,%p): stub\n", iface, punkouter, wine_dbgstr_guid(iid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p,%d)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactory_Vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + factory_CreateInstance, + factory_LockServer +}; + +static HRESULT WINAPI marshal_QueryInterface(IMarshal *iface, REFIID iid, LPVOID *ppv) +{ + struct factory *factory = impl_from_IMarshal(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + return IClassFactory_QueryInterface(&factory->IClassFactory_iface, iid, ppv); +} + +static ULONG WINAPI marshal_AddRef(IMarshal *iface) +{ + struct factory *factory = impl_from_IMarshal(iface); + + TRACE("(%p)\n", iface); + + return IClassFactory_AddRef(&factory->IClassFactory_iface); +} + +static ULONG WINAPI marshal_Release(IMarshal *iface) +{ + struct factory *factory = impl_from_IMarshal(iface); + + TRACE("(%p)\n", iface); + + return IClassFactory_Release(&factory->IClassFactory_iface); +} + +static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + dwDestContext, pvDestContext, mshlflags, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + FIXME("(%p,%s,%p,%08lx,%p,%08lx,%p): stub\n", iface, wine_dbgstr_guid(iid), pv, + dwDestContext, pvDestContext, mshlflags, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + FIXME("(%p,%s,%p,%08lx,%p,%08lx): stub\n", stream, wine_dbgstr_guid(iid), pv, dwDestContext, pvDestContext, mshlflags); + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID iid, void **ppv) +{ + FIXME("(%p,%p,%s,%p): stub\n", iface, stream, wine_dbgstr_guid(iid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + TRACE("(%p,%p)\n", iface, stream); + return S_OK; +} + +static HRESULT WINAPI marshal_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + TRACE("(%p, %08lx)\n", iface, reserved); + return S_OK; +} + +static const IMarshalVtbl Marshal_Vtbl = +{ + marshal_QueryInterface, + marshal_AddRef, + marshal_Release, + marshal_GetUnmarshalClass, + marshal_GetMarshalSizeMax, + marshal_MarshalInterface, + marshal_UnmarshalInterface, + marshal_ReleaseMarshalData, + marshal_DisconnectObject +}; + struct surrogate { ISurrogate ISurrogate_iface; + IClassFactory *factory; + DWORD cookie; LONG ref; }; @@ -74,8 +247,29 @@ static ULONG WINAPI surrogate_Release(ISurrogate *iface) static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) { - FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); - return E_NOTIMPL; + struct surrogate *surrogate = impl_from_ISurrogate(iface); + struct factory *factory; + HRESULT hr; + + TRACE("(%p,%s)\n", iface, wine_dbgstr_guid(clsid)); + + factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + if (!factory) + return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &ClassFactory_Vtbl; + factory->IMarshal_iface.lpVtbl = &Marshal_Vtbl; + factory->clsid = *clsid; + factory->ref = 1; + + hr = CoRegisterClassObject(clsid, (IUnknown *)&factory->IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_SURROGATE, &surrogate->cookie); + if (hr != S_OK) + IClassFactory_Release(&factory->IClassFactory_iface); + else + surrogate->factory = &factory->IClassFactory_iface; + + return hr; } static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) @@ -105,6 +299,8 @@ int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int sho cmdline += 11; surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; + surrogate.factory = NULL; + surrogate.cookie = 0; surrogate.ref = 1; CoInitializeEx(NULL, COINIT_MULTITHREADED); -- 2.35.1

2 1

[PATCH v3 2/8] dllhost: Add ISurrogate stub implementation.
by Dmitry Timoshkov 08 Mar '22

08 Mar '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/dllhost/Makefile.in | 2 +- programs/dllhost/dllhost.c | 84 +++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in index a92add9c2f0..bca6c208cdc 100644 --- a/programs/dllhost/Makefile.in +++ b/programs/dllhost/Makefile.in @@ -1,5 +1,5 @@ MODULE = dllhost.exe -IMPORTS = ole32 +IMPORTS = ole32 uuid EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c index 39d2194db4b..a0d3b9937f1 100644 --- a/programs/dllhost/dllhost.c +++ b/programs/dllhost/dllhost.c @@ -18,6 +18,8 @@ #include <stdarg.h> +#define COBJMACROS + #include <windef.h> #include <winbase.h> #include <objbase.h> @@ -26,24 +28,104 @@ WINE_DEFAULT_DEBUG_CHANNEL(dllhost); +struct surrogate +{ + ISurrogate ISurrogate_iface; + LONG ref; +}; + +static inline struct surrogate *impl_from_ISurrogate(ISurrogate *iface) +{ + return CONTAINING_RECORD(iface, struct surrogate, ISurrogate_iface); +} + +static HRESULT WINAPI surrogate_QueryInterface(ISurrogate *iface, + REFIID iid, void **ppv) +{ + struct surrogate *surrogate = impl_from_ISurrogate(iface); + + TRACE("(%p,%s,%p)\n", iface, wine_dbgstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_ISurrogate)) + { + ISurrogate_AddRef(&surrogate->ISurrogate_iface); + *ppv = &surrogate->ISurrogate_iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI surrogate_AddRef(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI surrogate_Release(ISurrogate *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI surrogate_LoadDllServer(ISurrogate *iface, const CLSID *clsid) +{ + FIXME("(%p,%s): stub\n", iface, wine_dbgstr_guid(clsid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI surrogate_FreeSurrogate(ISurrogate *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static const ISurrogateVtbl Surrogate_Vtbl = +{ + surrogate_QueryInterface, + surrogate_AddRef, + surrogate_Release, + surrogate_LoadDllServer, + surrogate_FreeSurrogate +}; + int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) { HRESULT hr; CLSID clsid; + struct surrogate surrogate; if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) return 0; cmdline += 11; + surrogate.ISurrogate_iface.lpVtbl = &Surrogate_Vtbl; + surrogate.ref = 1; + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CLSIDFromString(cmdline, &clsid); if (hr == S_OK) { - FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + CoRegisterSurrogate(&surrogate.ISurrogate_iface); + + hr = ISurrogate_LoadDllServer(&surrogate.ISurrogate_iface, &clsid); + if (hr != S_OK) + { + ERR("Can't create instance of %s\n", wine_dbgstr_guid(&clsid)); + goto cleanup; + } + + /* FIXME: wait for FreeSurrogate being called */ + Sleep(INFINITE); } +cleanup: CoUninitialize(); return 0; -- 2.35.1

2 1

[PATCH v3 1/8] dllhost: Add stub implementation.
by Dmitry Timoshkov 08 Mar '22

08 Mar '22

v3: Switch to using /PROCESSID:{GUID} as a command line syntax. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 2 ++ configure.ac | 1 + programs/dllhost/Makefile.in | 7 +++++ programs/dllhost/dllhost.c | 50 ++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 programs/dllhost/Makefile.in create mode 100644 programs/dllhost/dllhost.c diff --git a/configure b/configure index 9ceef4c809b..511fc8b794a 100755 --- a/configure +++ b/configure @@ -1558,6 +1558,7 @@ enable_conhost enable_control enable_cscript enable_dism +enable_dllhost enable_dplaysvr enable_dpnsvr enable_dpvsetup @@ -22076,6 +22077,7 @@ wine_fn_config_makefile programs/conhost/tests enable_tests wine_fn_config_makefile programs/control enable_control wine_fn_config_makefile programs/cscript enable_cscript wine_fn_config_makefile programs/dism enable_dism +wine_fn_config_makefile programs/dllhost enable_dllhost wine_fn_config_makefile programs/dplaysvr enable_dplaysvr wine_fn_config_makefile programs/dpnsvr enable_dpnsvr wine_fn_config_makefile programs/dpvsetup enable_dpvsetup diff --git a/configure.ac b/configure.ac index d14cc396e51..f40d83eb18d 100644 --- a/configure.ac +++ b/configure.ac @@ -3258,6 +3258,7 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dllhost) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/programs/dllhost/Makefile.in b/programs/dllhost/Makefile.in new file mode 100644 index 00000000000..a92add9c2f0 --- /dev/null +++ b/programs/dllhost/Makefile.in @@ -0,0 +1,7 @@ +MODULE = dllhost.exe +IMPORTS = ole32 + +EXTRADLLFLAGS = -mwindows -municode + +C_SRCS = \ + dllhost.c diff --git a/programs/dllhost/dllhost.c b/programs/dllhost/dllhost.c new file mode 100644 index 00000000000..39d2194db4b --- /dev/null +++ b/programs/dllhost/dllhost.c @@ -0,0 +1,50 @@ +/* + * Copyright 2022 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 + */ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dllhost); + +int WINAPI wWinMain(HINSTANCE hinst, HINSTANCE previnst, LPWSTR cmdline, int showcmd) +{ + HRESULT hr; + CLSID clsid; + + if (wcsnicmp(cmdline, L"/PROCESSID:", 11)) + return 0; + + cmdline += 11; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CLSIDFromString(cmdline, &clsid); + if (hr == S_OK) + { + FIXME("hosting object %s is not implemented\n", wine_dbgstr_guid(&clsid)); + } + + CoUninitialize(); + + return 0; +} -- 2.35.1

2 1

[PATCH 1/5] windows.gaming.input: Instantiate IGameController(BatteryInfo) stub from providers.
by Rémi Bernon 08 Mar '22

08 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Not completely sure what was wrong with this patch but I've split it to avoid having non executed code and to leave the detail of COM aggregation for later. dlls/windows.gaming.input/manager.c | 265 +++++++++++++++++++++++++++- dlls/windows.gaming.input/private.h | 1 + 2 files changed, 264 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index e6366256fe7..15388f7df5d 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -18,12 +18,209 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(input); +static CRITICAL_SECTION manager_cs; +static CRITICAL_SECTION_DEBUG manager_cs_debug = +{ + 0, 0, &manager_cs, + { &manager_cs_debug.ProcessLocksList, &manager_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": manager_cs") } +}; +static CRITICAL_SECTION manager_cs = { &manager_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list controller_list = LIST_INIT( controller_list ); + +struct controller +{ + IGameController IGameController_iface; + IGameControllerBatteryInfo IGameControllerBatteryInfo_iface; + LONG ref; + + struct list entry; + IGameControllerProvider *provider; + ICustomGameControllerFactory *factory; +}; + +static inline struct controller *impl_from_IGameController( IGameController *iface ) +{ + return CONTAINING_RECORD( iface, struct controller, IGameController_iface ); +} + +static HRESULT WINAPI controller_QueryInterface( IGameController *iface, REFIID iid, void **out ) +{ + struct controller *impl = impl_from_IGameController( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IGameController )) + { + IInspectable_AddRef( (*out = &impl->IGameController_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGameControllerBatteryInfo )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerBatteryInfo_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI controller_AddRef( IGameController *iface ) +{ + struct controller *impl = impl_from_IGameController( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI controller_Release( IGameController *iface ) +{ + struct controller *impl = impl_from_IGameController( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + ICustomGameControllerFactory_Release( impl->factory ); + IGameControllerProvider_Release( impl->provider ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI controller_GetIids( IGameController *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetRuntimeClassName( IGameController *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetTrustLevel( IGameController *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_HeadsetConnected( IGameController *iface, ITypedEventHandler_IGameController_Headset *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_HeadsetConnected( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_HeadsetDisconnected( IGameController *iface, ITypedEventHandler_IGameController_Headset *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_HeadsetDisconnected( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_add_UserChanged( IGameController *iface, + ITypedEventHandler_IGameController_UserChangedEventArgs *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_remove_UserChanged( IGameController *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_Headset( IGameController *iface, IHeadset **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_IsWireless( IGameController *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_get_User( IGameController *iface, __x_ABI_CWindows_CSystem_CIUser **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IGameControllerVtbl controller_vtbl = +{ + controller_QueryInterface, + controller_AddRef, + controller_Release, + /* IInspectable methods */ + controller_GetIids, + controller_GetRuntimeClassName, + controller_GetTrustLevel, + /* IGameController methods */ + controller_add_HeadsetConnected, + controller_remove_HeadsetConnected, + controller_add_HeadsetDisconnected, + controller_remove_HeadsetDisconnected, + controller_add_UserChanged, + controller_remove_UserChanged, + controller_get_Headset, + controller_get_IsWireless, + controller_get_User, +}; + +DEFINE_IINSPECTABLE( battery, IGameControllerBatteryInfo, struct controller, IGameController_iface ) + +static HRESULT WINAPI battery_TryGetBatteryReport( IGameControllerBatteryInfo *iface, IBatteryReport **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IGameControllerBatteryInfoVtbl battery_vtbl = +{ + battery_QueryInterface, + battery_AddRef, + battery_Release, + /* IInspectable methods */ + battery_GetIids, + battery_GetRuntimeClassName, + battery_GetTrustLevel, + /* IGameControllerBatteryInfo methods */ + battery_TryGetBatteryReport, +}; + struct manager_statics { IActivationFactory IActivationFactory_iface; @@ -200,12 +397,76 @@ static struct manager_statics manager_statics = IActivationFactory *manager_factory = &manager_statics.IActivationFactory_iface; +static HRESULT controller_create( ICustomGameControllerFactory *factory, IGameControllerProvider *provider, + struct controller **out ) +{ + struct controller *impl; + + if (!(impl = malloc(sizeof(*impl)))) return E_OUTOFMEMORY; + impl->IGameController_iface.lpVtbl = &controller_vtbl; + impl->IGameControllerBatteryInfo_iface.lpVtbl = &battery_vtbl; + impl->ref = 1; + + ICustomGameControllerFactory_AddRef( (impl->factory = factory) ); + IGameControllerProvider_AddRef( (impl->provider = provider) ); + + *out = impl; + return S_OK; +} + void manager_on_provider_created( IGameControllerProvider *provider ) { - FIXME( "provider %p stub!\n", provider ); + struct list *entry, *next, *list; + struct controller *controller; + HRESULT hr; + + TRACE( "provider %p\n", provider ); + + EnterCriticalSection( &manager_cs ); + + if (list_empty( &controller_list )) list = &controller_list; + else list = list_tail( &controller_list ); + + if (SUCCEEDED(controller_create( controller_factory, provider, &controller ))) + list_add_tail( &controller_list, &controller->entry ); + + LIST_FOR_EACH_SAFE( entry, next, list ) + { + controller = LIST_ENTRY( entry, struct controller, entry ); + hr = ICustomGameControllerFactory_OnGameControllerAdded( controller->factory, + &controller->IGameController_iface ); + if (FAILED(hr)) + { + list_remove( &controller->entry ); + IGameController_Release( &controller->IGameController_iface ); + } + if (next == &controller_list) break; + } + + LeaveCriticalSection( &manager_cs ); } void manager_on_provider_removed( IGameControllerProvider *provider ) { - FIXME( "provider %p stub!\n", provider ); + struct controller *controller, *next; + + TRACE( "provider %p\n", provider ); + + EnterCriticalSection( &manager_cs ); + + LIST_FOR_EACH_ENTRY( controller, &controller_list, struct controller, entry ) + { + if (controller->provider != provider) continue; + ICustomGameControllerFactory_OnGameControllerRemoved( controller->factory, + &controller->IGameController_iface ); + } + + LIST_FOR_EACH_ENTRY_SAFE( controller, next, &controller_list, struct controller, entry ) + { + if (controller->provider != provider) continue; + list_remove( &controller->entry ); + IGameController_Release( &controller->IGameController_iface ); + } + + LeaveCriticalSection( &manager_cs ); } diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 24d0609aa7e..27dbdb8416c 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -31,6 +31,7 @@ #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input #define WIDL_using_Windows_Gaming_Input_Custom #include "windows.gaming.input.custom.h" -- 2.35.1

1 4

[PATCH] winex11.drv: Fix crash when ctx is NULL in glxdrv_wglSwapBuffers().
by Yutao Meng 08 Mar '22

08 Mar '22

The variable ctx can be NULL, and it is checked before every sync_context() function call. However, it is not checked in the ExtEscape() function call in which it is trying to get the hdc member variable of ctx. Signed-off-by: Yutao Meng <mengyutao(a)uniontech.com> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 567205f742c..6b179bc5c0d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3372,7 +3372,7 @@ static BOOL WINAPI glxdrv_wglSwapBuffers( HDC hdc ) release_gl_drawable( gl ); - if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); + if (ctx && escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); return TRUE; } -- 2.20.1

1 0

[PATCH] kernelbase: CopyFileExA support COPY_FILE_OPEN_SOURCE_FOR_WRITE flag
by Alistair Leslie-Hughes 08 Mar '22

08 Mar '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 22 ++++++++++--- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77174d43d5b..eb5bc5ceb36 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1202,6 +1202,70 @@ static void test_CopyFileEx(void) ok(!ret, "DeleteFileA unexpectedly succeeded\n"); } +static void test_CopyFileEx_CopyWrite(void) +{ + char temp_path[MAX_PATH]; + char source[MAX_PATH], dest[MAX_PATH]; + static const char prefix[] = "pfx"; + HANDLE hfile; + DWORD ret; + BOOL retok; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %ld\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, source); + ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError()); + + ret = GetTempFileNameA(temp_path, prefix, 0, dest); + ok(ret != 0, "GetTempFileNameA error %ld\n", GetLastError()); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Read access */ + hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "expected 0, got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Shared Read access */ + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "expected 0, got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA Failed\n"); + + /* Test with Shared R/W access */ + hfile = CreateFileA(source, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %ld\n", GetLastError()); + + retok = CopyFileExA(source, dest, NULL, NULL, NULL, COPY_FILE_OPEN_SOURCE_FOR_WRITE); + ok(retok, "CopyFileExA failed\n"); + ok(GetLastError() == 0, "got %ld\n", GetLastError()); + ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file wasn't created\n"); + CloseHandle(hfile); + + ret = DeleteFileA(source); + ok(ret, "DeleteFileA failed with error %ld\n", GetLastError()); + ret = DeleteFileA(dest); + ok(ret, "DeleteFileA unexpectedly succeeded\n"); +} + /* * Debugging routine to dump a buffer in a hexdump-like fashion. */ @@ -6158,6 +6222,7 @@ START_TEST(file) test_CopyFileW(); test_CopyFile2(); test_CopyFileEx(); + test_CopyFileEx_CopyWrite(); test_CreateFile(); test_CreateFileA(); test_CreateFileW(); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..3ea81e112a7 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -504,6 +504,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT DWORD count; BOOL ret = FALSE; char *buffer; + DWORD source_access = GENERIC_READ; if (!source || !dest) { @@ -518,12 +519,25 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + source_access |= GENERIC_WRITE; + + if ((h1 = CreateFileW( source, source_access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { - WARN("Unable to open source %s\n", debugstr_w(source)); - HeapFree( GetProcessHeap(), 0, buffer ); - return FALSE; + /* Retry with Read mode, if we cannot open R/W */ + if (GetLastError() == ERROR_SHARING_VIOLATION && flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + { + h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 ); + } + + if(h1 == INVALID_HANDLE_VALUE) + { + WARN("Unable to open source %s\n", debugstr_w(source)); + HeapFree( GetProcessHeap(), 0, buffer ); + return FALSE; + } } if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) -- 2.34.1

2 1

[PATCH 1/3] ntdll: Add NtAccessCheckByTypeAndAuditAlarm stub.
by Mohamad Al-Jaf 08 Mar '22

08 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/security.c | 18 ++++++++++++++++++ include/winnt.h | 7 +++++++ include/winternl.h | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..b867767652e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -131,7 +131,7 @@ @ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByType -# @ stub NtAccessCheckByTypeAndAuditAlarm +@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByTypeResultList # @ stub NtAccessCheckByTypeResultListAndAuditAlarm # @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..728ee961aa2 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha } +/*********************************************************************** + * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@) + */ +NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *type_name, UNICODE_STRING *name, + PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access, + AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list, + ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, NTSTATUS *access_status, + BOOLEAN *on_close ) +{ + FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n", + debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid, + access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..939c2f8d7dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..8e236f9d97d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -- 2.35.1

2 7

[PATCH] po: Update Lithuanian translation.
by Aurimas Fišeras 08 Mar '22

08 Mar '22

1 0

Re: [PATCH v2 4/4] apisetschema: Add ext-ms-win-core-iuri-l1-1-0 entry.
by Mohamad Al-Jaf 07 Mar '22

07 Mar '22

Hi, I have no idea why this patch was set to "No patch". Is this the incorrect way to add an apiset? I don't know what I did wrong. -- Kind regards, Mohamad

1 0

[PATCH 1/2] quartz/tests: Use the correct integer types.
by Zebediah Figura 07 Mar '22

07 Mar '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/dsoundrender.c | 3 ++- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 03e6b8413d5..2e1289e715b 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -449,10 +449,11 @@ static void test_basic_audio(void) IBaseFilter *filter = create_dsound_render(); LONG balance, volume; ITypeInfo *typeinfo; + unsigned int count; IBasicAudio *audio; TYPEATTR *typeattr; - ULONG ref, count; HRESULT hr; + ULONG ref; hr = IBaseFilter_QueryInterface(filter, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 98f7b30717d..2496b556132 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2827,8 +2827,8 @@ static void test_control_delegation(void) IVideoWindow *window; IBasicVideo2 *video; ITypeInfo *typeinfo; + unsigned int count; TYPEATTR *typeattr; - ULONG count; HRESULT hr; LONG val; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a0ccb4898a9..45ec3313813 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3975,11 +3975,11 @@ static void test_windowless_size(void) IVMRAspectRatioControl9 *aspect_ratio_control; IVMRWindowlessControl9 *windowless_control; IFilterGraph2 *graph = create_graph(); - VMR9AspectRatioMode aspect_mode; struct testfilter source; IMemAllocator *allocator; RECT src, dst, expect; IMemInputPin *input; + DWORD aspect_mode; HWND window; HRESULT hr; ULONG ref; -- 2.35.1

2 3

[PATCH 1/7] ws2_32: Pre-validate optlen in getsockopt().
by Paul Gofman 07 Mar '22

07 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 228827-228832. For reference, the full patchset (which adds more tests and fixes individual options) is here: https://github.com/gofman/wine/commits/winsock dlls/ws2_32/socket.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e5e29107853..30dc007167a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1395,11 +1395,18 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl TRACE( "socket %#Ix, %s, optval %p, optlen %p (%d)\n", s, debugstr_sockopt(level, optname), optval, optlen, optlen ? *optlen : 0 ); - if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && - !socket_list_find( s )) + if ((level != SOL_SOCKET || optname != SO_OPENTYPE)) { - SetLastError( WSAENOTSOCK ); - return SOCKET_ERROR; + if (!socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + if (!optlen || *optlen <= 0) + { + SetLastError( WSAEFAULT ); + return -1; + } } switch(level) @@ -1464,7 +1471,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_CONNECT_TIME: - if (!optlen || !optval) + if (!optval) { SetLastError( WSAEFAULT ); return -1; @@ -1483,7 +1490,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int len = sizeof(linger); int ret; - if (!optlen || *optlen < sizeof(BOOL)|| !optval) + if (*optlen < sizeof(BOOL)|| !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1500,7 +1507,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: - if (!optlen || *optlen < sizeof(BOOL) || !optval) + if (*optlen < sizeof(BOOL) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1521,7 +1528,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl int size; /* struct linger and LINGER have different sizes */ - if (!optlen || *optlen < sizeof(LINGER) || !optval) + if (*optlen < sizeof(LINGER) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1540,7 +1547,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl } case SO_MAX_MSG_SIZE: - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1574,9 +1581,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl ret = ws_protocol_info(s, optname == SO_PROTOCOL_INFOW, &infow, &size); if (ret) { - if (!optlen || !optval || *optlen < size) + if (!optval || *optlen < size) { - if(optlen) *optlen = size; + *optlen = size; ret = 0; SetLastError(WSAEFAULT); } @@ -1606,7 +1613,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl WSAPROTOCOL_INFOW info; int size; - if (!optlen || *optlen < sizeof(int) || !optval) + if (*optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1765,7 +1772,7 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: - if (!optlen || *optlen < sizeof(UINT) || !optval) + if (*optlen < sizeof(UINT) || !optval) { SetLastError( WSAEFAULT ); return -1; -- 2.35.1

3 15

[PATCH 1/4] include/wine: Introduce a FIXME_ONCE macro.
by Zebediah Figura 07 Mar '22

07 Mar '22

From: David Kahurani <k.kahurani(a)gmail.com> Based on libvkd3d. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wine/debug.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 58f92754164..9e96f217d91 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -85,6 +85,15 @@ struct __wine_debug_channel const enum __wine_debug_class __dbcl = __WINE_DBCL##dbcl; \ __WINE_DBG_LOG +#define __WINE_DPRINTF_ONCE(dbcl1,dbcl2,dbch) \ + do { if(__WINE_GET_DEBUGGING(dbcl1,(dbch))) { \ + static int __wine_dbg_next_time;\ + struct __wine_debug_channel * const __dbch = (dbch); \ + const enum __wine_debug_class __dbcl = \ + __wine_dbg_next_time ? __WINE_DBCL##dbcl2 : __WINE_DBCL##dbcl1; \ + __wine_dbg_next_time = 1; \ + __WINE_DBG_LOG + #define __WINE_DBG_LOG(args...) \ wine_dbg_log( __dbcl, __dbch, __FUNCTION__, args); } } while(0) @@ -104,6 +113,7 @@ struct __wine_debug_channel #define WINE_WARN(args...) do { } while(0) #define WINE_WARN_(ch) WINE_WARN #define WINE_FIXME(args...) do { } while(0) +#define WINE_FIXME_ONCE(args...) do { } while(0) #define WINE_FIXME_(ch) WINE_FIXME #endif @@ -115,6 +125,15 @@ struct __wine_debug_channel const enum __WINE_DEBUG_CLASS __dbcl = __WINE_DBCL##dbcl; \ __WINE_DBG_LOG +#define __WINE_DPRINTF_ONCE(dbcl1,dbcl2,dbch) \ + do { if(__WINE_GET_DEBUGGING(dbcl1,(dbch))) { \ + static int __wine_dbg_next_time;\ + struct __wine_debug_channel * const __dbch = (dbch); \ + const enum __WINE_DEBUG_CLASS __dbcl = \ + __wine_dbg_next_time ? __WINE_DBCL##dbcl2 : __WINE_DBCL##dbcl1; \ + __wine_dbg_next_time = 1; \ + __WINE_DBG_LOG + #define __WINE_DBG_LOG(...) \ wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0) @@ -129,16 +148,36 @@ struct __wine_debug_channel #define WINE_WARN(...) do { } while(0) #define WINE_WARN_(ch) WINE_WARN #define WINE_FIXME(...) do { } while(0) +#define WINE_FIXME_ONCE(...) do { } while(0) #define WINE_FIXME_(ch) WINE_FIXME #endif #else /* !__GNUC__ && !__SUNPRO_C */ +#define __WINE_DPRINTF_ONCE(dbcl1,dbcl2,dbch) \ + do { \ + static BOOL __wine_next_time_level;\ + const enum __wine_debug_class __dbcl = \ + __wine_next_time_level ? __WINE_DBCL##dbcl2 : __WINE_DBCL##dbcl1;\ + (!__WINE_GET_DEBUGGING(dbcl1,(dbch)) || \ + (wine_dbg_log(__dbcl,(dbch),__FILE__,"%d: ",__LINE__) == -1)) ? \ + (void)0 : (void)wine_dbg_printf \ + __wine_next_time_level = TRUE; } while (0) + #define __WINE_DPRINTF(dbcl,dbch) \ (!__WINE_GET_DEBUGGING(dbcl,(dbch)) || \ (wine_dbg_log(__WINE_DBCL##dbcl,(dbch),__FILE__,"%d: ",__LINE__) == -1)) ? \ (void)0 : (void)wine_dbg_printf +#define __WINE_DPRINTF_ONCE(dbcl1,dbcl2,dbch) \ + do { if(__WINE_GET_DEBUGGING(dbcl1,(dbch))) { \ + static int __wine_dbg_next_time;\ + struct __wine_debug_channel * const __dbch = (dbch); \ + const enum __WINE_DEBUG_CLASS __dbcl = \ + __wine_dbg_next_time ? __WINE_DBCL##dbcl2 : __WINE_DBCL##dbcl1; \ + __wine_dbg_next_time = 1; \ + wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0) + #define __WINE_PRINTF_ATTR(fmt, args) #endif /* !__GNUC__ && !__SUNPRO_C */ @@ -487,6 +526,7 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) #ifndef WINE_FIXME #define WINE_FIXME __WINE_DPRINTF(_FIXME,__wine_dbch___default) +#define WINE_FIXME_ONCE __WINE_DPRINTF_ONCE(_FIXME,_WARN,__wine_dbch___default) #define WINE_FIXME_(ch) __WINE_DPRINTF(_FIXME,&__wine_dbch_##ch) #endif #define WINE_FIXME_ON(ch) __WINE_IS_DEBUG_ON(_FIXME,&__wine_dbch_##ch) @@ -526,6 +566,7 @@ static inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbg #define WARN_ON(ch) WINE_WARN_ON(ch) #define FIXME WINE_FIXME +#define FIXME_ONCE WINE_FIXME_ONCE #define FIXME_(ch) WINE_FIXME_(ch) #define FIXME_ON(ch) WINE_FIXME_ON(ch) -- 2.35.1

4 10

[PATCH vkd3d 1/5] vkd3d-utils: Avoid leaking "messages" when vkd3d_blob_create() fails.
by Zebediah Figura 07 Mar '22

07 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 5534453bd..9607eddd6 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -269,6 +269,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { + vkd3d_shader_free_messages(messages); vkd3d_shader_free_shader_code(&byte_code); return hr; } @@ -356,6 +357,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename { if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) { + vkd3d_shader_free_messages(messages); vkd3d_shader_free_shader_code(&preprocessed_code); return hr; } -- 2.35.1

3 10

[PATCH v2] oleaut32: Do not skip the first decimal digit in VarParseNumFromStr().
by Francois Gouget 07 Mar '22

07 Mar '22

Add more tests to probe what happens if the integral part is omitted. From: David Kahurani <k.kahurani(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52476 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fix the subject to not imply this is a test patch. Without the fix the new tests would fail in EXPECT() which performs multiple ok() calls, making adding a todo_wine() impractical. So I opted for submitting the fix and the new tests together. --- dlls/oleaut32/tests/vartest.c | 47 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0a8b56bb2ee..dc1fb476307 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1775,6 +1775,45 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,0); EXPECT2(1,FAILDIG); + /* Skipping the integer part is not an error */ + CONVERT(".2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + /* Even zero gets an exponent (it sort of indicates 'precision') */ + CONVERT(".0", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(0,FAILDIG); + + CONVERT(".000", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECTRGB(0,0); + EXPECTRGB(3,FAILDIG); + + CONVERT("$.02", NUMPRS_CURRENCY|NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_DECIMAL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,4,0,-2); + EXPECT2(2,FAILDIG); + + CONVERT(".001", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,FAILDIG); + + CONVERT(".101", NUMPRS_DECIMAL); + EXPECT(3,NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-3); + EXPECT2(1,0); + EXPECTRGB(2,1); + EXPECTRGB(3,FAILDIG); + + CONVERT(".30", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); + /* See the NUMPRS_THOUSANDS comment about trailing zeroes */ + EXPECTRGB(0,3); + EXPECTRGB(2,FAILDIG); + + /* But skipping both the integer and decimal part is not allowed */ + CONVERT(".", NUMPRS_DECIMAL); + EXPECTFAIL; + /* Consumes only one decimal point */ CONVERT("1.1.", NUMPRS_DECIMAL); EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); @@ -2131,6 +2170,14 @@ static void test_VarParseNumFromStrFr(void) CONVERT("1.2", NUMPRS_DECIMAL); EXPECT(1,NUMPRS_DECIMAL,0,1,0,0); EXPECT2(1,FAILDIG); + + /* The integer part can still be omitted */ + CONVERT(",2", NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(2,FAILDIG); + + CONVERT(".2", NUMPRS_DECIMAL); + EXPECTFAIL; } static void test_VarParseNumFromStrMisc(void) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index bf8f041b9c6..885082cc659 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1633,7 +1633,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* If we have no digits so far, skip leading zeros */ if (!pNumprs->cDig) { - while (lpszStr[1] == '0') + while (*lpszStr == '0') { dwState |= B_LEADING_ZERO; cchUsed++; -- 2.30.2

1 0

[PATCH 1/2] wined3d: Print an ERR message if unable to allocate a GL buffer object.
by Zebediah Figura 07 Mar '22

07 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f356bdc7ec..9e3ed874c9a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1129,7 +1129,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win if (!id) { - WARN("Failed to allocate buffer.\n"); + ERR("Failed to allocate buffer.\n"); return false; } } -- 2.35.1

2 4

[PATCH 8/8] win32u: Move GetClassLong implementation from user32.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 207 +---------------------------------- dlls/user32/spy.c | 35 ------ dlls/user32/user_private.h | 1 - dlls/win32u/class.c | 169 ++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 + dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 12 +- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 7 +- 9 files changed, 196 insertions(+), 242 deletions(-)

3 2

[PATCH 7/8] win32u: Move NtUserSetClassLong from user32.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 237 +++-------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/class.c | 210 +++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 3 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 +++ include/ntuser.h | 3 + 8 files changed, 259 insertions(+), 223 deletions(-)

2 1

[PATCH 6/8] win32u: Move class management implementation from user32.
by Jacek Caban 07 Mar '22

07 Mar '22

2 1

[PATCH 5/8] user32: Store menu name as a struct.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 103 ++++++++++++++++++++--------------- dlls/win32u/ntuser_private.h | 2 +- include/ntuser.h | 7 +++ 3 files changed, 67 insertions(+), 45 deletions(-)

2 1

[PATCH 4/8] user32: Use UNICODE_STRING for passing window classes internally.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 162 +++++++++++++++++++++++------------------ dlls/user32/controls.h | 2 +- dlls/user32/win.c | 24 ++++-- 3 files changed, 109 insertions(+), 79 deletions(-)

3 2

[PATCH 3/8] user32: Move module class registration to get_class_info.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-)

3 2

[PATCH 2/8] user32: Use get_class_info for GetClasInfoEx implementation.
by Jacek Caban 07 Mar '22

07 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 125 +++++++++++++------------------------ dlls/user32/user_private.h | 3 +- dlls/user32/win.c | 2 +- 3 files changed, 45 insertions(+), 85 deletions(-)

2 1

[PATCH 1/8] user32: Introduce get_class_info.
by Jacek Caban 07 Mar '22

07 Mar '22

Ans use it in WIN_CreateWindowEx to trigger class registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 42 ++++++++++++++++++++++++++++++-------- dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 29 ++++++++++---------------- 3 files changed, 46 insertions(+), 28 deletions(-)

3 2

[PATCH vkd3d v2] vkd3d-shader/spirv: Fix the spelling of some comments.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- v2: Fixed the email encoding. --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

2 1

[vkd3d] ANNOUNCE: Fix a typo in the libvkd3d-shader new interfaces section.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- ANNOUNCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index 29a627fc..163e24d9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -88,7 +88,7 @@ New interfaces: Direct3D 12 and Vulkan binding models. - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can be used to specify the version of the libvkd3d-shader API the - application is targetting. If left unspecified, + application is targeting. If left unspecified, VKD3D_SHADER_API_VERSION_1_2 will be used. - Various shader translation fixes, for tessellation shaders in particular. -- 2.30.2

2 1

[vkd3d] vkd3d: Fix the spelling of a couple of trace message.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e7375fb8..f9b3389f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5982,7 +5982,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_SetMarker(ID3D12CommandQueue * static void STDMETHODCALLTYPE d3d12_command_queue_BeginEvent(ID3D12CommandQueue *iface, UINT metadata, const void *data, UINT size) { - FIXME("iface %p, metatdata %#x, data %p, size %u stub!\n", + FIXME("iface %p, metadata %#x, data %p, size %u stub!\n", iface, metadata, data, size); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 59fa9af9..1ccd242a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3736,7 +3736,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, struct d3d12_fence *object; HRESULT hr; - TRACE("iface %p, intial_value %#"PRIx64", flags %#x, riid %s, fence %p.\n", + TRACE("iface %p, initial_value %#"PRIx64", flags %#x, riid %s, fence %p.\n", iface, initial_value, flags, debugstr_guid(riid), fence); if (FAILED(hr = d3d12_fence_create(device, initial_value, flags, &object))) -- 2.30.2

2 1

[vkd3d] vkd3d: Add a trailing linefeed to a couple of WARN() messages.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2d3954d2..0e7800a4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1862,7 +1862,7 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, VK_CALL(vkDestroyShaderModule(device->vk_device, pipeline_info.stage.module, NULL)); if (vr < 0) { - WARN("Failed to create Vulkan compute pipeline, hr %#x.", hr); + WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); return hresult_from_vk_result(vr); } @@ -2664,7 +2664,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } if (rt_desc->BlendEnable && rt_desc->LogicOpEnable) { - WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE."); + WARN("Only one of BlendEnable or LogicOpEnable can be set to TRUE.\n"); hr = E_INVALIDARG; goto fail; } -- 2.30.2

2 1

[PATCH] tzres: Inform translators of 31-character limit
by Alex Henrie 07 Mar '22

07 Mar '22

I wrote a script to pre-add the msgctxt to the translations that are already within the character limit to avoid getting them marked as fuzzy unnecessarily. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51619 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/tzres/tzres.rc | 556 ++++++++++++++++++++++---------------------- po/ast.po | 93 ++++++++ po/ca.po | 206 ++++++++++++++++ po/de.po | 264 +++++++++++++++++++++ po/en.po | 268 +++++++++++++++++++++ po/en_US.po | 268 +++++++++++++++++++++ po/es.po | 137 +++++++++++ po/fi.po | 249 ++++++++++++++++++++ po/fr.po | 62 +++++ po/ja.po | 268 +++++++++++++++++++++ po/ko.po | 268 +++++++++++++++++++++ po/lt.po | 219 +++++++++++++++++ po/nl.po | 251 ++++++++++++++++++++ po/pl.po | 228 ++++++++++++++++++ po/pt_BR.po | 212 +++++++++++++++++ po/ru.po | 133 +++++++++++ po/si.po | 166 +++++++++++++ po/tr.po | 207 +++++++++++++++++ po/uk.po | 214 +++++++++++++++++ po/zh_CN.po | 268 +++++++++++++++++++++ po/zh_TW.po | 268 +++++++++++++++++++++ 21 files changed, 4527 insertions(+), 278 deletions(-) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 4914dba1728..7bc2a67dc92 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -26,421 +26,421 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - 39616 "Afghanistan Standard Time" - 39617 "Afghanistan Daylight Time" + 39616 "#msgctxt#maximum 31 characters#Afghanistan Standard Time" + 39617 "#msgctxt#maximum 31 characters#Afghanistan Daylight Time" 39618 "(UTC+04:30) Kabul" - 50192 "Alaskan Standard Time" - 50193 "Alaskan Daylight Time" + 50192 "#msgctxt#maximum 31 characters#Alaskan Standard Time" + 50193 "#msgctxt#maximum 31 characters#Alaskan Daylight Time" 50194 "(UTC-09:00) Alaska" - 55200 "Aleutian Standard Time" - 55201 "Aleutian Daylight Time" + 55200 "#msgctxt#maximum 31 characters#Aleutian Standard Time" + 55201 "#msgctxt#maximum 31 characters#Aleutian Daylight Time" 55202 "(UTC-10:00) Aleutian Islands" - 4464 "Altai Standard Time" - 4465 "Altai Daylight Time" + 4464 "#msgctxt#maximum 31 characters#Altai Standard Time" + 4465 "#msgctxt#maximum 31 characters#Altai Daylight Time" 4466 "(UTC+07:00) Barnaul, Gorno-Altaysk" - 41968 "Arab Standard Time" - 41969 "Arab Daylight Time" + 41968 "#msgctxt#maximum 31 characters#Arab Standard Time" + 41969 "#msgctxt#maximum 31 characters#Arab Daylight Time" 41970 "(UTC+03:00) Kuwait, Riyadh" - 42704 "Arabian Standard Time" - 42705 "Arabian Daylight Time" + 42704 "#msgctxt#maximum 31 characters#Arabian Standard Time" + 42705 "#msgctxt#maximum 31 characters#Arabian Daylight Time" 42706 "(UTC+04:00) Abu Dhabi, Muscat" - 8768 "Arabic Standard Time" - 8769 "Arabic Daylight Time" + 8768 "#msgctxt#maximum 31 characters#Arabic Standard Time" + 8769 "#msgctxt#maximum 31 characters#Arabic Daylight Time" 8770 "(UTC+03:00) Baghdad" - 19584 "Argentina Standard Time" - 19585 "Argentina Daylight Time" + 19584 "#msgctxt#maximum 31 characters#Argentina Standard Time" + 19585 "#msgctxt#maximum 31 characters#Argentina Daylight Time" 19586 "(UTC-03:00) City of Buenos Aires" - 25104 "Astrakhan Standard Time" - 25105 "Astrakhan Daylight Time" + 25104 "#msgctxt#maximum 31 characters#Astrakhan Standard Time" + 25105 "#msgctxt#maximum 31 characters#Astrakhan Daylight Time" 25106 "(UTC+04:00) Astrakhan, Ulyanovsk" - 34224 "Atlantic Standard Time" - 34225 "Atlantic Daylight Time" + 34224 "#msgctxt#maximum 31 characters#Atlantic Standard Time" + 34225 "#msgctxt#maximum 31 characters#Atlantic Daylight Time" 34226 "(UTC-04:00) Atlantic Time (Canada)" - 47024 "AUS Central Standard Time" - 47025 "AUS Central Daylight Time" + 47024 "#msgctxt#maximum 31 characters#AUS Central Standard Time" + 47025 "#msgctxt#maximum 31 characters#AUS Central Daylight Time" 47026 "(UTC+09:30) Darwin" - 44672 "Aus Central W. Standard Time" - 44673 "Aus Central W. Daylight Time" + 44672 "#msgctxt#maximum 31 characters#Aus Central W. Standard Time" + 44673 "#msgctxt#maximum 31 characters#Aus Central W. Daylight Time" 44674 "(UTC+08:45) Eucla" - 30368 "AUS Eastern Standard Time" - 30369 "AUS Eastern Daylight Time" + 30368 "#msgctxt#maximum 31 characters#AUS Eastern Standard Time" + 30369 "#msgctxt#maximum 31 characters#AUS Eastern Daylight Time" 30370 "(UTC+10:00) Canberra, Melbourne, Sydney" - 11312 "Azerbaijan Standard Time" - 11313 "Azerbaijan Daylight Time" + 11312 "#msgctxt#maximum 31 characters#Azerbaijan Standard Time" + 11313 "#msgctxt#maximum 31 characters#Azerbaijan Daylight Time" 11314 "(UTC+04:00) Baku" - 18832 "Azores Standard Time" - 18833 "Azores Daylight Time" + 18832 "#msgctxt#maximum 31 characters#Azores Standard Time" + 18833 "#msgctxt#maximum 31 characters#Azores Daylight Time" 18834 "(UTC-01:00) Azores" - 50896 "Bahia Standard Time" - 50897 "Bahia Daylight Time" + 50896 "#msgctxt#maximum 31 characters#Bahia Standard Time" + 50897 "#msgctxt#maximum 31 characters#Bahia Daylight Time" 50898 "(UTC-03:00) Salvador" - 48720 "Bangladesh Standard Time" - 48721 "Bangladesh Daylight Time" + 48720 "#msgctxt#maximum 31 characters#Bangladesh Standard Time" + 48721 "#msgctxt#maximum 31 characters#Bangladesh Daylight Time" 48722 "(UTC+06:00) Dhaka" - 56576 "Belarus Standard Time" - 56577 "Belarus Daylight Time" + 56576 "#msgctxt#maximum 31 characters#Belarus Standard Time" + 56577 "#msgctxt#maximum 31 characters#Belarus Daylight Time" 56578 "(UTC+03:00) Minsk" - 51968 "Bougainville Standard Time" - 51969 "Bougainville Daylight Time" + 51968 "#msgctxt#maximum 31 characters#Bougainville Standard Time" + 51969 "#msgctxt#maximum 31 characters#Bougainville Daylight Time" 51970 "(UTC+11:00) Bougainville Island" - 25712 "Canada Central Standard Time" - 25713 "Canada Central Daylight Time" + 25712 "#msgctxt#maximum 31 characters#Canada Central Standard Time" + 25713 "#msgctxt#maximum 31 characters#Canada Central Daylight Time" 25714 "(UTC-06:00) Saskatchewan" - 2000 "Cape Verde Standard Time" - 2001 "Cape Verde Daylight Time" + 2000 "#msgctxt#maximum 31 characters#Cape Verde Standard Time" + 2001 "#msgctxt#maximum 31 characters#Cape Verde Daylight Time" 2002 "(UTC-01:00) Cabo Verde Is." - 29872 "Caucasus Standard Time" - 29873 "Caucasus Daylight Time" + 29872 "#msgctxt#maximum 31 characters#Caucasus Standard Time" + 29873 "#msgctxt#maximum 31 characters#Caucasus Daylight Time" 29874 "(UTC+04:00) Yerevan" - 38928 "Cen. Australia Standard Time" - 38929 "Cen. Australia Daylight Time" + 38928 "#msgctxt#maximum 31 characters#Cen. Australia Standard Time" + 38929 "#msgctxt#maximum 31 characters#Cen. Australia Daylight Time" 38930 "(UTC+09:30) Adelaide" - 36656 "Central America Standard Time" - 36657 "Central America Daylight Time" + 36656 "#msgctxt#maximum 31 characters#Central America Standard Time" + 36657 "#msgctxt#maximum 31 characters#Central America Daylight Time" 36658 "(UTC-06:00) Central America" - 8176 "Central Asia Standard Time" - 8177 "Central Asia Daylight Time" + 8176 "#msgctxt#maximum 31 characters#Central Asia Standard Time" + 8177 "#msgctxt#maximum 31 characters#Central Asia Daylight Time" 8178 "(UTC+06:00) Astana" - 56336 "Central Brazilian Standard Time" - 56337 "Central Brazilian Daylight Time" + 56336 "#msgctxt#maximum 31 characters#Central Brazilian Standard Time" + 56337 "#msgctxt#maximum 31 characters#Central Brazilian Daylight Time" 56338 "(UTC-04:00) Cuiaba" - 4896 "Central Europe Standard Time" - 4897 "Central Europe Daylight Time" + 4896 "#msgctxt#maximum 31 characters#Central Europe Standard Time" + 4897 "#msgctxt#maximum 31 characters#Central Europe Daylight Time" 4898 "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" - 2976 "Central European Standard Time" - 2977 "Central European Daylight Time" + 2976 "#msgctxt#maximum 31 characters#Central European Standard Time" + 2977 "#msgctxt#maximum 31 characters#Central European Daylight Time" 2978 "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" - 64416 "Central Pacific Standard Time" - 64417 "Central Pacific Daylight Time" + 64416 "#msgctxt#maximum 31 characters#Central Pacific Standard Time" + 64417 "#msgctxt#maximum 31 characters#Central Pacific Daylight Time" 64418 "(UTC+11:00) Solomon Is., New Caledonia" - 17456 "Central Standard Time" - 17457 "Central Daylight Time" + 17456 "#msgctxt#maximum 31 characters#Central Standard Time" + 17457 "#msgctxt#maximum 31 characters#Central Daylight Time" 17458 "(UTC-06:00) Central Time (US & Canada)" - 32800 "Central Standard Time (Mexico)" - 32801 "Central Daylight Time (Mexico)" + 32800 "#msgctxt#maximum 31 characters#Central Standard Time (Mexico)" + 32801 "#msgctxt#maximum 31 characters#Central Daylight Time (Mexico)" 32802 "(UTC-06:00) Guadalajara, Mexico City, Monterrey" - 62304 "Chatham Islands Standard Time" - 62305 "Chatham Islands Daylight Time" + 62304 "#msgctxt#maximum 31 characters#Chatham Islands Standard Time" + 62305 "#msgctxt#maximum 31 characters#Chatham Islands Daylight Time" 62306 "(UTC+12:45) Chatham Islands" - 160 "China Standard Time" - 161 "China Daylight Time" + 160 "#msgctxt#maximum 31 characters#China Standard Time" + 161 "#msgctxt#maximum 31 characters#China Daylight Time" 162 "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" - 17136 "Cuba Standard Time" - 17137 "Cuba Daylight Time" + 17136 "#msgctxt#maximum 31 characters#Cuba Standard Time" + 17137 "#msgctxt#maximum 31 characters#Cuba Daylight Time" 17138 "(UTC-05:00) Havana" - 50384 "Dateline Standard Time" - 50385 "Dateline Daylight Time" + 50384 "#msgctxt#maximum 31 characters#Dateline Standard Time" + 50385 "#msgctxt#maximum 31 characters#Dateline Daylight Time" 50386 "(UTC-12:00) International Date Line West" - 62720 "E. Africa Standard Time" - 62721 "E. Africa Daylight Time" + 62720 "#msgctxt#maximum 31 characters#E. Africa Standard Time" + 62721 "#msgctxt#maximum 31 characters#E. Africa Daylight Time" 62722 "(UTC+03:00) Nairobi" - 65264 "E. Australia Standard Time" - 65265 "E. Australia Daylight Time" + 65264 "#msgctxt#maximum 31 characters#E. Australia Standard Time" + 65265 "#msgctxt#maximum 31 characters#E. Australia Daylight Time" 65266 "(UTC+10:00) Brisbane" - 32128 "E. Europe Standard Time" - 32129 "E. Europe Daylight Time" + 32128 "#msgctxt#maximum 31 characters#E. Europe Standard Time" + 32129 "#msgctxt#maximum 31 characters#E. Europe Daylight Time" 32130 "(UTC+02:00) Chisinau" - 64096 "E. South America Standard Time" - 64097 "E. South America Daylight Time" + 64096 "#msgctxt#maximum 31 characters#E. South America Standard Time" + 64097 "#msgctxt#maximum 31 characters#E. South America Daylight Time" 64098 "(UTC-03:00) Brasilia" - 58592 "Easter Island Standard Time" - 58593 "Easter Island Daylight Time" + 58592 "#msgctxt#maximum 31 characters#Easter Island Standard Time" + 58593 "#msgctxt#maximum 31 characters#Easter Island Daylight Time" 58594 "(UTC-06:00) Easter Island" - 30800 "Eastern Standard Time" - 30801 "Eastern Daylight Time" + 30800 "#msgctxt#maximum 31 characters#Eastern Standard Time" + 30801 "#msgctxt#maximum 31 characters#Eastern Daylight Time" 30802 "(UTC-05:00) Eastern Time (US & Canada)" - 59536 "Eastern Standard Time (Mexico)" - 59537 "Eastern Daylight Time (Mexico)" + 59536 "#msgctxt#maximum 31 characters#Eastern Standard Time (Mexico)" + 59537 "#msgctxt#maximum 31 characters#Eastern Daylight Time (Mexico)" 59538 "(UTC-05:00) Chetumal" - 59424 "Egypt Standard Time" - 59425 "Egypt Daylight Time" + 59424 "#msgctxt#maximum 31 characters#Egypt Standard Time" + 59425 "#msgctxt#maximum 31 characters#Egypt Daylight Time" 59426 "(UTC+02:00) Cairo" - 45952 "Ekaterinburg Standard Time" - 45953 "Ekaterinburg Daylight Time" + 45952 "#msgctxt#maximum 31 characters#Ekaterinburg Standard Time" + 45953 "#msgctxt#maximum 31 characters#Ekaterinburg Daylight Time" 45954 "(UTC+05:00) Ekaterinburg" - 25680 "Fiji Standard Time" - 25681 "Fiji Daylight Time" + 25680 "#msgctxt#maximum 31 characters#Fiji Standard Time" + 25681 "#msgctxt#maximum 31 characters#Fiji Daylight Time" 25682 "(UTC+12:00) Fiji" - 63264 "FLE Standard Time" - 63265 "FLE Daylight Time" + 63264 "#msgctxt#maximum 31 characters#FLE Standard Time" + 63265 "#msgctxt#maximum 31 characters#FLE Daylight Time" 63266 "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" - 416 "Georgian Standard Time" - 417 "Georgian Daylight Time" + 416 "#msgctxt#maximum 31 characters#Georgian Standard Time" + 417 "#msgctxt#maximum 31 characters#Georgian Daylight Time" 418 "(UTC+04:00) Tbilisi" - 7408 "GMT Standard Time" - 7409 "GMT Daylight Time" + 7408 "#msgctxt#maximum 31 characters#GMT Standard Time" + 7409 "#msgctxt#maximum 31 characters#GMT Daylight Time" 7410 "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" - 58096 "Greenland Standard Time" - 58097 "Greenland Daylight Time" + 58096 "#msgctxt#maximum 31 characters#Greenland Standard Time" + 58097 "#msgctxt#maximum 31 characters#Greenland Daylight Time" 58098 "(UTC-03:00) Greenland" - 47168 "Greenwich Standard Time" - 47169 "Greenwich Daylight Time" + 47168 "#msgctxt#maximum 31 characters#Greenwich Standard Time" + 47169 "#msgctxt#maximum 31 characters#Greenwich Daylight Time" 47170 "(UTC+00:00) Monrovia, Reykjavik" - 24192 "GTB Standard Time" - 24193 "GTB Daylight Time" + 24192 "#msgctxt#maximum 31 characters#GTB Standard Time" + 24193 "#msgctxt#maximum 31 characters#GTB Daylight Time" 24194 "(UTC+02:00) Athens, Bucharest" - 2896 "Haiti Standard Time" - 2897 "Haiti Daylight Time" + 2896 "#msgctxt#maximum 31 characters#Haiti Standard Time" + 2897 "#msgctxt#maximum 31 characters#Haiti Daylight Time" 2898 "(UTC-05:00) Haiti" - 53376 "Hawaiian Standard Time" - 53377 "Hawaiian Daylight Time" + 53376 "#msgctxt#maximum 31 characters#Hawaiian Standard Time" + 53377 "#msgctxt#maximum 31 characters#Hawaiian Daylight Time" 53378 "(UTC-10:00) Hawaii" - 22400 "India Standard Time" - 22401 "India Daylight Time" + 22400 "#msgctxt#maximum 31 characters#India Standard Time" + 22401 "#msgctxt#maximum 31 characters#India Daylight Time" 22402 "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" - 5568 "Iran Standard Time" - 5569 "Iran Daylight Time" + 5568 "#msgctxt#maximum 31 characters#Iran Standard Time" + 5569 "#msgctxt#maximum 31 characters#Iran Daylight Time" 5570 "(UTC+03:30) Tehran" - 47968 "Israel Standard Time" - 47969 "Israel Daylight Time" + 47968 "#msgctxt#maximum 31 characters#Israel Standard Time" + 47969 "#msgctxt#maximum 31 characters#Israel Daylight Time" 47970 "(UTC+02:00) Jerusalem" - 17232 "Jordan Standard Time" - 17233 "Jordan Daylight Time" + 17232 "#msgctxt#maximum 31 characters#Jordan Standard Time" + 17233 "#msgctxt#maximum 31 characters#Jordan Daylight Time" 17234 "(UTC+02:00) Amman" - 14720 "Kaliningrad Standard Time" - 14721 "Kaliningrad Daylight Time" + 14720 "#msgctxt#maximum 31 characters#Kaliningrad Standard Time" + 14721 "#msgctxt#maximum 31 characters#Kaliningrad Daylight Time" 14722 "(UTC+02:00) Kaliningrad" - 62048 "Korea Standard Time" - 62049 "Korea Daylight Time" + 62048 "#msgctxt#maximum 31 characters#Korea Standard Time" + 62049 "#msgctxt#maximum 31 characters#Korea Daylight Time" 62050 "(UTC+09:00) Seoul" - 50768 "Libya Standard Time" - 50769 "Libya Daylight Time" + 50768 "#msgctxt#maximum 31 characters#Libya Standard Time" + 50769 "#msgctxt#maximum 31 characters#Libya Daylight Time" 50770 "(UTC+02:00) Tripoli" - 16768 "Line Islands Standard Time" - 16769 "Line Islands Daylight Time" + 16768 "#msgctxt#maximum 31 characters#Line Islands Standard Time" + 16769 "#msgctxt#maximum 31 characters#Line Islands Daylight Time" 16770 "(UTC+14:00) Kiritimati Island" - 8656 "Lord Howe Standard Time" - 8657 "Lord Howe Daylight Time" + 8656 "#msgctxt#maximum 31 characters#Lord Howe Standard Time" + 8657 "#msgctxt#maximum 31 characters#Lord Howe Daylight Time" 8658 "(UTC+10:30) Lord Howe Island" - 8832 "Magadan Standard Time" - 8833 "Magadan Daylight Time" + 8832 "#msgctxt#maximum 31 characters#Magadan Standard Time" + 8833 "#msgctxt#maximum 31 characters#Magadan Daylight Time" 8834 "(UTC+11:00) Magadan" - 13120 "Magallanes Standard Time" - 13121 "Magallanes Daylight Time" + 13120 "#msgctxt#maximum 31 characters#Magallanes Standard Time" + 13121 "#msgctxt#maximum 31 characters#Magallanes Daylight Time" 13122 "(UTC-03:00) Punta Arenas" - 20736 "Marquesas Standard Time" - 20737 "Marquesas Daylight Time" + 20736 "#msgctxt#maximum 31 characters#Marquesas Standard Time" + 20737 "#msgctxt#maximum 31 characters#Marquesas Daylight Time" 20738 "(UTC-09:30) Marquesas Islands" - 60896 "Mauritius Standard Time" - 60897 "Mauritius Daylight Time" + 60896 "#msgctxt#maximum 31 characters#Mauritius Standard Time" + 60897 "#msgctxt#maximum 31 characters#Mauritius Daylight Time" 60898 "(UTC+04:00) Port Louis" - 15968 "Middle East Standard Time" - 15969 "Middle East Daylight Time" + 15968 "#msgctxt#maximum 31 characters#Middle East Standard Time" + 15969 "#msgctxt#maximum 31 characters#Middle East Daylight Time" 15970 "(UTC+02:00) Beirut" - 27968 "Montevideo Standard Time" - 27969 "Montevideo Daylight Time" + 27968 "#msgctxt#maximum 31 characters#Montevideo Standard Time" + 27969 "#msgctxt#maximum 31 characters#Montevideo Daylight Time" 27970 "(UTC-03:00) Montevideo" - 2992 "Morocco Standard Time" - 2993 "Morocco Daylight Time" + 2992 "#msgctxt#maximum 31 characters#Morocco Standard Time" + 2993 "#msgctxt#maximum 31 characters#Morocco Daylight Time" 2994 "(UTC+01:00) Casablanca" - 34352 "Mountain Standard Time" - 34353 "Mountain Daylight Time" + 34352 "#msgctxt#maximum 31 characters#Mountain Standard Time" + 34353 "#msgctxt#maximum 31 characters#Mountain Daylight Time" 34354 "(UTC-07:00) Mountain Time (US & Canada)" - 7248 "Mountain Standard Time (Mexico)" - 7249 "Mountain Daylight Time (Mexico)" + 7248 "#msgctxt#maximum 31 characters#Mountain Standard Time (Mexico)" + 7249 "#msgctxt#maximum 31 characters#Mountain Daylight Time (Mexico)" 7250 "(UTC-07:00) Chihuahua, La Paz, Mazatlan" - 21104 "Myanmar Standard Time" - 21105 "Myanmar Daylight Time" + 21104 "#msgctxt#maximum 31 characters#Myanmar Standard Time" + 21105 "#msgctxt#maximum 31 characters#Myanmar Daylight Time" 21106 "(UTC+06:30) Yangon (Rangoon)" - 30704 "N. Central Asia Standard Time" - 30705 "N. Central Asia Daylight Time" + 30704 "#msgctxt#maximum 31 characters#N. Central Asia Standard Time" + 30705 "#msgctxt#maximum 31 characters#N. Central Asia Daylight Time" 30706 "(UTC+07:00) Novosibirsk" - 6208 "Namibia Standard Time" - 6209 "Namibia Daylight Time" + 6208 "#msgctxt#maximum 31 characters#Namibia Standard Time" + 6209 "#msgctxt#maximum 31 characters#Namibia Daylight Time" 6210 "(UTC+02:00) Windhoek" - 1216 "Nepal Standard Time" - 1217 "Nepal Daylight Time" + 1216 "#msgctxt#maximum 31 characters#Nepal Standard Time" + 1217 "#msgctxt#maximum 31 characters#Nepal Daylight Time" 1218 "(UTC+05:45) Kathmandu" - 54896 "New Zealand Standard Time" - 54897 "New Zealand Daylight Time" + 54896 "#msgctxt#maximum 31 characters#New Zealand Standard Time" + 54897 "#msgctxt#maximum 31 characters#New Zealand Daylight Time" 54898 "(UTC+12:00) Auckland, Wellington" - 9504 "Newfoundland Standard Time" - 9505 "Newfoundland Daylight Time" + 9504 "#msgctxt#maximum 31 characters#Newfoundland Standard Time" + 9505 "#msgctxt#maximum 31 characters#Newfoundland Daylight Time" 9506 "(UTC-03:30) Newfoundland" - 47440 "Norfolk Standard Time" - 47441 "Norfolk Daylight Time" + 47440 "#msgctxt#maximum 31 characters#Norfolk Standard Time" + 47441 "#msgctxt#maximum 31 characters#Norfolk Daylight Time" 47442 "(UTC+11:00) Norfolk Island" - 19056 "North Asia East Standard Time" - 19057 "North Asia East Daylight Time" + 19056 "#msgctxt#maximum 31 characters#North Asia East Standard Time" + 19057 "#msgctxt#maximum 31 characters#North Asia East Daylight Time" 19058 "(UTC+08:00) Irkutsk" - 304 "North Asia Standard Time" - 305 "North Asia Daylight Time" + 304 "#msgctxt#maximum 31 characters#North Asia Standard Time" + 305 "#msgctxt#maximum 31 characters#North Asia Daylight Time" 306 "(UTC+07:00) Krasnoyarsk" - 35888 "North Korea Standard Time" - 35889 "North Korea Daylight Time" + 35888 "#msgctxt#maximum 31 characters#North Korea Standard Time" + 35889 "#msgctxt#maximum 31 characters#North Korea Daylight Time" 35890 "(UTC+09:00) Pyongyang" - 55952 "Omsk Standard Time" - 55953 "Omsk Daylight Time" + 55952 "#msgctxt#maximum 31 characters#Omsk Standard Time" + 55953 "#msgctxt#maximum 31 characters#Omsk Daylight Time" 55954 "(UTC+06:00) Omsk" - 65008 "Pacific SA Standard Time" - 65009 "Pacific SA Daylight Time" + 65008 "#msgctxt#maximum 31 characters#Pacific SA Standard Time" + 65009 "#msgctxt#maximum 31 characters#Pacific SA Daylight Time" 65010 "(UTC-04:00) Santiago" - 11232 "Pacific Standard Time" - 11233 "Pacific Daylight Time" + 11232 "#msgctxt#maximum 31 characters#Pacific Standard Time" + 11233 "#msgctxt#maximum 31 characters#Pacific Daylight Time" 11234 "(UTC-08:00) Pacific Time (US & Canada)" - 15584 "Pacific Standard Time (Mexico)" - 15585 "Pacific Daylight Time (Mexico)" + 15584 "#msgctxt#maximum 31 characters#Pacific Standard Time (Mexico)" + 15585 "#msgctxt#maximum 31 characters#Pacific Daylight Time (Mexico)" 15586 "(UTC-08:00) Baja California" - 28752 "Pakistan Standard Time" - 28753 "Pakistan Daylight Time" + 28752 "#msgctxt#maximum 31 characters#Pakistan Standard Time" + 28753 "#msgctxt#maximum 31 characters#Pakistan Daylight Time" 28754 "(UTC+05:00) Islamabad, Karachi" - 50224 "Paraguay Standard Time" - 50225 "Paraguay Daylight Time" + 50224 "#msgctxt#maximum 31 characters#Paraguay Standard Time" + 50225 "#msgctxt#maximum 31 characters#Paraguay Daylight Time" 50226 "(UTC-04:00) Asuncion" - 53760 "Qyzylorda Standard Time" - 53761 "Qyzylorda Daylight Time" + 53760 "#msgctxt#maximum 31 characters#Qyzylorda Standard Time" + 53761 "#msgctxt#maximum 31 characters#Qyzylorda Daylight Time" 53762 "(UTC+05:00) Qyzylorda" - 45104 "Romance Standard Time" - 45105 "Romance Daylight Time" + 45104 "#msgctxt#maximum 31 characters#Romance Standard Time" + 45105 "#msgctxt#maximum 31 characters#Romance Daylight Time" 45106 "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" - 59264 "Russia Time Zone 10" - 59265 "Russia Time Zone 10" + 59264 "#msgctxt#maximum 31 characters#Russia Time Zone 10" + 59265 "#msgctxt#maximum 31 characters#Russia Time Zone 10" 59266 "(UTC+11:00) Chokurdakh" - 46000 "Russia Time Zone 11" - 46001 "Russia Time Zone 11" + 46000 "#msgctxt#maximum 31 characters#Russia Time Zone 11" + 46001 "#msgctxt#maximum 31 characters#Russia Time Zone 11" 46002 "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" - 17920 "Russia Time Zone 3" - 17921 "Russia Time Zone 3" + 17920 "#msgctxt#maximum 31 characters#Russia Time Zone 3" + 17921 "#msgctxt#maximum 31 characters#Russia Time Zone 3" 17922 "(UTC+04:00) Izhevsk, Samara" - 44560 "Russian Standard Time" - 44561 "Russian Daylight Time" + 44560 "#msgctxt#maximum 31 characters#Russian Standard Time" + 44561 "#msgctxt#maximum 31 characters#Russian Daylight Time" 44562 "(UTC+03:00) Moscow, St. Petersburg" - 40656 "SA Eastern Standard Time" - 40657 "SA Eastern Daylight Time" + 40656 "#msgctxt#maximum 31 characters#SA Eastern Standard Time" + 40657 "#msgctxt#maximum 31 characters#SA Eastern Daylight Time" 40658 "(UTC-03:00) Cayenne, Fortaleza" - 49424 "SA Pacific Standard Time" - 49425 "SA Pacific Daylight Time" + 49424 "#msgctxt#maximum 31 characters#SA Pacific Standard Time" + 49425 "#msgctxt#maximum 31 characters#SA Pacific Daylight Time" 49426 "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" - 57120 "SA Western Standard Time" - 57121 "SA Western Daylight Time" + 57120 "#msgctxt#maximum 31 characters#SA Western Standard Time" + 57121 "#msgctxt#maximum 31 characters#SA Western Daylight Time" 57122 "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" - 5584 "Saint Pierre Standard Time" - 5585 "Saint Pierre Daylight Time" + 5584 "#msgctxt#maximum 31 characters#Saint Pierre Standard Time" + 5585 "#msgctxt#maximum 31 characters#Saint Pierre Daylight Time" 5586 "(UTC-03:00) Saint Pierre and Miquelon" - 35104 "Sakhalin Standard Time" - 35105 "Sakhalin Daylight Time" + 35104 "#msgctxt#maximum 31 characters#Sakhalin Standard Time" + 35105 "#msgctxt#maximum 31 characters#Sakhalin Daylight Time" 35106 "(UTC+11:00) Sakhalin" - 14592 "Samoa Standard Time" - 14593 "Samoa Daylight Time" + 14592 "#msgctxt#maximum 31 characters#Samoa Standard Time" + 14593 "#msgctxt#maximum 31 characters#Samoa Daylight Time" 14594 "(UTC+13:00) Samoa" - 5984 "Sao Tome Standard Time" - 5985 "Sao Tome Daylight Time" + 5984 "#msgctxt#maximum 31 characters#Sao Tome Standard Time" + 5985 "#msgctxt#maximum 31 characters#Sao Tome Daylight Time" 5986 "(UTC+00:00) Sao Tome" - 33808 "Saratov Standard Time" - 33809 "Saratov Daylight Time" + 33808 "#msgctxt#maximum 31 characters#Saratov Standard Time" + 33809 "#msgctxt#maximum 31 characters#Saratov Daylight Time" 33810 "(UTC+04:00) Saratov" - 53728 "SE Asia Standard Time" - 53729 "SE Asia Daylight Time" + 53728 "#msgctxt#maximum 31 characters#SE Asia Standard Time" + 53729 "#msgctxt#maximum 31 characters#SE Asia Daylight Time" 53730 "(UTC+07:00) Bangkok, Hanoi, Jakarta" - 61840 "Singapore Standard Time" - 61841 "Singapore Daylight Time" + 61840 "#msgctxt#maximum 31 characters#Singapore Standard Time" + 61841 "#msgctxt#maximum 31 characters#Singapore Daylight Time" 61842 "(UTC+08:00) Kuala Lumpur, Singapore" - 38896 "South Africa Standard Time" - 38897 "South Africa Daylight Time" + 38896 "#msgctxt#maximum 31 characters#South Africa Standard Time" + 38897 "#msgctxt#maximum 31 characters#South Africa Daylight Time" 38898 "(UTC+02:00) Harare, Pretoria" - 7664 "South Sudan Standard Time" - 7665 "South Sudan Daylight Time" + 7664 "#msgctxt#maximum 31 characters#South Sudan Standard Time" + 7665 "#msgctxt#maximum 31 characters#South Sudan Daylight Time" 7666 "(UTC+02:00) Juba" - 39408 "Sri Lanka Standard Time" - 39409 "Sri Lanka Daylight Time" + 39408 "#msgctxt#maximum 31 characters#Sri Lanka Standard Time" + 39409 "#msgctxt#maximum 31 characters#Sri Lanka Daylight Time" 39410 "(UTC+05:30) Sri Jayawardenepura" - 9792 "Sudan Standard Time" - 9793 "Sudan Daylight Time" + 9792 "#msgctxt#maximum 31 characters#Sudan Standard Time" + 9793 "#msgctxt#maximum 31 characters#Sudan Daylight Time" 9794 "(UTC+02:00) Khartoum" - 46576 "Syria Standard Time" - 46577 "Syria Daylight Time" + 46576 "#msgctxt#maximum 31 characters#Syria Standard Time" + 46577 "#msgctxt#maximum 31 characters#Syria Daylight Time" 46578 "(UTC+02:00) Damascus" - 26432 "Taipei Standard Time" - 26433 "Taipei Daylight Time" + 26432 "#msgctxt#maximum 31 characters#Taipei Standard Time" + 26433 "#msgctxt#maximum 31 characters#Taipei Daylight Time" 26434 "(UTC+08:00) Taipei" - 36016 "Tasmania Standard Time" - 36017 "Tasmania Daylight Time" + 36016 "#msgctxt#maximum 31 characters#Tasmania Standard Time" + 36017 "#msgctxt#maximum 31 characters#Tasmania Daylight Time" 36018 "(UTC+10:00) Hobart" - 43072 "Tocantins Standard Time" - 43073 "Tocantins Daylight Time" + 43072 "#msgctxt#maximum 31 characters#Tocantins Standard Time" + 43073 "#msgctxt#maximum 31 characters#Tocantins Daylight Time" 43074 "(UTC-03:00) Araguaina" - 16240 "Tokyo Standard Time" - 16241 "Tokyo Daylight Time" + 16240 "#msgctxt#maximum 31 characters#Tokyo Standard Time" + 16241 "#msgctxt#maximum 31 characters#Tokyo Daylight Time" 16242 "(UTC+09:00) Osaka, Sapporo, Tokyo" - 29136 "Tomsk Standard Time" - 29137 "Tomsk Daylight Time" + 29136 "#msgctxt#maximum 31 characters#Tomsk Standard Time" + 29137 "#msgctxt#maximum 31 characters#Tomsk Daylight Time" 29138 "(UTC+07:00) Tomsk" - 7216 "Tonga Standard Time" - 7217 "Tonga Daylight Time" + 7216 "#msgctxt#maximum 31 characters#Tonga Standard Time" + 7217 "#msgctxt#maximum 31 characters#Tonga Daylight Time" 7218 "(UTC+13:00) Nuku'alofa" - 31472 "Transbaikal Standard Time" - 31473 "Transbaikal Daylight Time" + 31472 "#msgctxt#maximum 31 characters#Transbaikal Standard Time" + 31473 "#msgctxt#maximum 31 characters#Transbaikal Daylight Time" 31474 "(UTC+09:00) Chita" - 24848 "Turkey Standard Time" - 24849 "Turkey Daylight Time" + 24848 "#msgctxt#maximum 31 characters#Turkey Standard Time" + 24849 "#msgctxt#maximum 31 characters#Turkey Daylight Time" 24850 "(UTC+03:00) Istanbul" - 20560 "Turks And Caicos Standard Time" - 20561 "Turks And Caicos Daylight Time" + 20560 "#msgctxt#maximum 31 characters#Turks And Caicos Standard Time" + 20561 "#msgctxt#maximum 31 characters#Turks And Caicos Daylight Time" 20562 "(UTC-05:00) Turks and Caicos" - 47200 "Ulaanbaatar Standard Time" - 47201 "Ulaanbaatar Daylight Time" + 47200 "#msgctxt#maximum 31 characters#Ulaanbaatar Standard Time" + 47201 "#msgctxt#maximum 31 characters#Ulaanbaatar Daylight Time" 47202 "(UTC+08:00) Ulaanbaatar" - 34928 "US Eastern Standard Time" - 34929 "US Eastern Daylight Time" + 34928 "#msgctxt#maximum 31 characters#US Eastern Standard Time" + 34929 "#msgctxt#maximum 31 characters#US Eastern Daylight Time" 34930 "(UTC-05:00) Indiana (East)" - 37472 "US Mountain Standard Time" - 37473 "US Mountain Daylight Time" + 37472 "#msgctxt#maximum 31 characters#US Mountain Standard Time" + 37473 "#msgctxt#maximum 31 characters#US Mountain Daylight Time" 37474 "(UTC-07:00) Arizona" - 22000 "Coordinated Universal Time" - 22001 "Coordinated Universal Time" + 22000 "#msgctxt#maximum 31 characters#Coordinated Universal Time" + 22001 "#msgctxt#maximum 31 characters#Coordinated Universal Time" 22002 "(UTC) Coordinated Universal Time" - 1200 "UTC+12" - 1201 "UTC+12" + 1200 "#msgctxt#maximum 31 characters#UTC+12" + 1201 "#msgctxt#maximum 31 characters#UTC+12" 1202 "(UTC+12:00) Coordinated Universal Time+12" - 8784 "UTC+13" - 8785 "UTC+13" + 8784 "#msgctxt#maximum 31 characters#UTC+13" + 8785 "#msgctxt#maximum 31 characters#UTC+13" 8786 "(UTC+13:00) Coordinated Universal Time+13" - 37328 "UTC-02" - 37329 "UTC-02" + 37328 "#msgctxt#maximum 31 characters#UTC-02" + 37329 "#msgctxt#maximum 31 characters#UTC-02" 37330 "(UTC-02:00) Coordinated Universal Time-02" - 3344 "UTC-08" - 3345 "UTC-08" + 3344 "#msgctxt#maximum 31 characters#UTC-08" + 3345 "#msgctxt#maximum 31 characters#UTC-08" 3346 "(UTC-08:00) Coordinated Universal Time-08" - 39152 "UTC-09" - 39153 "UTC-09" + 39152 "#msgctxt#maximum 31 characters#UTC-09" + 39153 "#msgctxt#maximum 31 characters#UTC-09" 39154 "(UTC-09:00) Coordinated Universal Time-09" - 19408 "UTC-11" - 19409 "UTC-11" + 19408 "#msgctxt#maximum 31 characters#UTC-11" + 19409 "#msgctxt#maximum 31 characters#UTC-11" 19410 "(UTC-11:00) Coordinated Universal Time-11" - 51472 "Venezuela Standard Time" - 51473 "Venezuela Daylight Time" + 51472 "#msgctxt#maximum 31 characters#Venezuela Standard Time" + 51473 "#msgctxt#maximum 31 characters#Venezuela Daylight Time" 51474 "(UTC-04:00) Caracas" - 61376 "Vladivostok Standard Time" - 61377 "Vladivostok Daylight Time" + 61376 "#msgctxt#maximum 31 characters#Vladivostok Standard Time" + 61377 "#msgctxt#maximum 31 characters#Vladivostok Daylight Time" 61378 "(UTC+10:00) Vladivostok" - 18048 "Volgograd Standard Time" - 18049 "Volgograd Daylight Time" + 18048 "#msgctxt#maximum 31 characters#Volgograd Standard Time" + 18049 "#msgctxt#maximum 31 characters#Volgograd Daylight Time" 18050 "(UTC+04:00) Volgograd" - 65376 "W. Australia Standard Time" - 65377 "W. Australia Daylight Time" + 65376 "#msgctxt#maximum 31 characters#W. Australia Standard Time" + 65377 "#msgctxt#maximum 31 characters#W. Australia Daylight Time" 65378 "(UTC+08:00) Perth" - 64976 "W. Central Africa Standard Time" - 64977 "W. Central Africa Daylight Time" + 64976 "#msgctxt#maximum 31 characters#W. Central Africa Standard Time" + 64977 "#msgctxt#maximum 31 characters#W. Central Africa Daylight Time" 64978 "(UTC+01:00) West Central Africa" - 27696 "W. Europe Standard Time" - 27697 "W. Europe Daylight Time" + 27696 "#msgctxt#maximum 31 characters#W. Europe Standard Time" + 27697 "#msgctxt#maximum 31 characters#W. Europe Daylight Time" 27698 "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" - 53952 "W. Mongolia Standard Time" - 53953 "W. Mongolia Daylight Time" + 53952 "#msgctxt#maximum 31 characters#W. Mongolia Standard Time" + 53953 "#msgctxt#maximum 31 characters#W. Mongolia Daylight Time" 53954 "(UTC+07:00) Hovd" - 49664 "West Asia Standard Time" - 49665 "West Asia Daylight Time" + 49664 "#msgctxt#maximum 31 characters#West Asia Standard Time" + 49665 "#msgctxt#maximum 31 characters#West Asia Daylight Time" 49666 "(UTC+05:00) Ashgabat, Tashkent" - 46160 "West Bank Standard Time" - 46161 "West Bank Daylight Time" + 46160 "#msgctxt#maximum 31 characters#West Bank Standard Time" + 46161 "#msgctxt#maximum 31 characters#West Bank Daylight Time" 46162 "(UTC+02:00) Gaza, Hebron" - 10224 "West Pacific Standard Time" - 10225 "West Pacific Daylight Time" + 10224 "#msgctxt#maximum 31 characters#West Pacific Standard Time" + 10225 "#msgctxt#maximum 31 characters#West Pacific Daylight Time" 10226 "(UTC+10:00) Guam, Port Moresby" - 40576 "Yakutsk Standard Time" - 40577 "Yakutsk Daylight Time" + 40576 "#msgctxt#maximum 31 characters#Yakutsk Standard Time" + 40577 "#msgctxt#maximum 31 characters#Yakutsk Daylight Time" 40578 "(UTC+09:00) Yakutsk" - 26288 "Yukon Standard Time" - 26289 "Yukon Daylight Time" + 26288 "#msgctxt#maximum 31 characters#Yukon Standard Time" + 26289 "#msgctxt#maximum 31 characters#Yukon Daylight Time" 26290 "(UTC-07:00) Yukon" } diff --git a/po/ast.po b/po/ast.po index f47892deea1..38c52ffc594 100644 --- a/po/ast.po +++ b/po/ast.po @@ -10383,10 +10383,12 @@ msgid "Select Source" msgstr "" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Hora estándar de China" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Hora braniega de China" @@ -10395,10 +10397,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Hora estándar d'Asia del Norte" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Hora braniega d'Asia del Norte" @@ -10427,10 +10431,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Hora estándar de Nepal" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Hora braniega de Nepal" @@ -10439,10 +10445,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Hora estándar de Cabu Verde" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Hora braniega de Cabu Verde" @@ -10479,10 +10487,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Hora estándar de Marruecos" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Hora braniega de Marruecos" @@ -10515,10 +10525,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Hora estándar d'Europa Central" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Hora braniega d'Europa Central" @@ -10527,6 +10539,7 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Hora estándar d'Iran" @@ -10573,10 +10586,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Hora estándar de Namibia" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Hora braniega de Namibia" @@ -10609,10 +10624,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Hora estándar de GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Hora braniega de GMT" @@ -10637,10 +10654,12 @@ msgid "(UTC+02:00) Juba" msgstr "" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Hora estándar d'Asia Central" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Hora braniega d'Asia Central" @@ -10697,10 +10716,12 @@ msgid "(UTC+11:00) Magadan" msgstr "" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Hora estándar de Newfoundland" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Hora braniega de Newfoundland" @@ -10749,10 +10770,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Hora estándar d'Azerbaixán" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Hora braniega d'Azerbaixán" @@ -10777,10 +10800,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Hora estándar de Samoa" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Hora braniega de Samoa" @@ -10789,10 +10814,12 @@ msgid "(UTC+13:00) Samoa" msgstr "" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Hora estándar de Kaliningráu" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Hora braniega de Kaliningráu" @@ -10813,6 +10840,7 @@ msgid "(UTC-08:00) Baja California" msgstr "" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Hora estándar d'Oriente Mediu" @@ -10825,10 +10853,12 @@ msgid "(UTC+02:00) Beirut" msgstr "" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Hora estándar de Tokiu" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Hora braniega de Tokiu" @@ -10865,6 +10895,7 @@ msgid "(UTC-05:00) Havana" msgstr "" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Hora estándar de Xordania" @@ -10877,10 +10908,12 @@ msgid "(UTC+02:00) Amman" msgstr "" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Hora estándar central" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Hora braniega central" @@ -10945,10 +10978,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Hora estándar d'Arxentina" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Hora braniega d'Arxentina" @@ -11009,10 +11044,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Hora estándar d'Irán" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Hora braniega d'India" @@ -11021,10 +11058,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Hora estándar de GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Hora braniega de GTB" @@ -11033,10 +11072,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Hora estándar de Turquía" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Hora braniega de Turquía" @@ -11073,10 +11114,12 @@ msgid "(UTC+12:00) Fiji" msgstr "" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Hora estándar de Canadá Central" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Hora braniega de Canadá Central" @@ -11101,10 +11144,12 @@ msgid "(UTC-07:00) Yukon" msgstr "" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Hora estándar de Taipéi" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Hora braniega de Taipéi" @@ -11125,6 +11170,7 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Hora estándar de Montevidéu" @@ -11137,10 +11183,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Hora estándar de Paquistán" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Hora braniega de Paquistán" @@ -11205,6 +11253,7 @@ msgid "Eastern Standard Time" msgstr "" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Hora braniega oriental" @@ -11245,10 +11294,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Hora estándar central (Méxicu)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Hora braniega central (Méxicu)" @@ -11341,10 +11392,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Hora estándar de Tasmania" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Hora braniega de Tasmania" @@ -11353,10 +11406,12 @@ msgid "(UTC+10:00) Hobart" msgstr "" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Hora estándar d'América Central" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Hora braniega d'América Central" @@ -11385,10 +11440,12 @@ msgid "(UTC-07:00) Arizona" msgstr "" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Hora estándar de Sudáfrica" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Hora braniega de Sudáfrica" @@ -11417,10 +11474,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Hora estándar de Sri Lanka" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Hora braniega de Sri Lanka" @@ -11429,10 +11488,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Hos estándar d'Afganistán" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Hora braniega d'Afganistán" @@ -11441,6 +11502,7 @@ msgid "(UTC+04:30) Kabul" msgstr "" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Hora estándar de Yakutsk" @@ -11505,10 +11567,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Hora estándar de Rusia" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Hora braniega de Russia" @@ -11581,10 +11645,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Hora estándar de Siria" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Hora braniega de Siria" @@ -11617,10 +11683,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Hora estándar d'Ulán Bátor" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Hora braniega d'Ulán Bátor" @@ -11645,6 +11713,7 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Hora estándar d'Israel" @@ -11657,10 +11726,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Hora estándar de Bangladex" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Hora braniega de Bangladex" @@ -11681,10 +11752,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Hora estándar d'Asia del Oeste" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Hora braniega d'Asia del Oeste" @@ -11705,10 +11778,12 @@ msgid "(UTC-09:00) Alaska" msgstr "" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Hora estándar de Paraguái" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Hora braniega de Paraguái" @@ -11729,10 +11804,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Hora estándar de Libia" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Hora braniega de Libia" @@ -11753,10 +11830,12 @@ msgid "(UTC-03:00) Salvador" msgstr "" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Hora estándar de Venezuela" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Hora braniega de Venezuela" @@ -11837,10 +11916,12 @@ msgid "(UTC+07:00) Hovd" msgstr "" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Hora estándar de Nueva Zelanda" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Hora braniega de Nueva Zelanda" @@ -11893,10 +11974,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Hora estándar de Bielorrusia" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Hora braniega de Bielorrusia" @@ -11933,6 +12016,7 @@ msgid "Easter Island Standard Time" msgstr "" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Hora braniega d'Islla de Pascua" @@ -11949,10 +12033,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Hora estándar d'Exiptu" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Hora braniega d'Exiptu" @@ -11989,10 +12075,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Hora estándar de Vladivostok" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Hora braniega de Vladivostok" @@ -12001,10 +12089,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Hora estándar de Singapur" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Hora braniega de Singapur" @@ -12013,10 +12103,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Hora estándar de Corea" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Hora braniega de Corea" @@ -12045,6 +12137,7 @@ msgid "E. Africa Standard Time" msgstr "" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Hora braniega d'África del Este" diff --git a/po/ca.po b/po/ca.po index 61776668098..27123dddcf3 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10389,10 +10389,12 @@ msgid "Select Source" msgstr "Seleccionar font" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Hora estàndard de la Xina" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Hora d'estiu de la Xina" @@ -10405,6 +10407,7 @@ msgid "North Asia Standard Time" msgstr "Hora estàndard de l'Àsia del Nord" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Hora d'estiu de l'Àsia del Nord" @@ -10413,10 +10416,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoiarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Hora estàndard de Geòrgia" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Hora d'estiu de Geòrgia" @@ -10425,6 +10430,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilissi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10433,10 +10439,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Temps universal coordinat+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Hora estàndard del Nepal" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Hora d'estiu del Nepal" @@ -10445,10 +10453,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Katmandú" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Hora estàndard de Cap Verd" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Hora d'estiu de Cap Verd" @@ -10457,10 +10467,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Illes del Cap Verd" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Hora estàndard de Haití" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Hora d'estiu de Haití" @@ -10481,10 +10493,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Varsòvia, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Hora estàndard del Marroc" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Hora d'estiu del Marroc" @@ -10493,6 +10507,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10501,10 +10516,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Temps universal coordinat-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Hora estàndard de l'Altai" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Hora d'estiu de l'Altai" @@ -10525,10 +10542,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praga" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Hora estàndard d'Iran" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Hora d'estiu d'Iran" @@ -10537,10 +10556,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Hora estàndard de Sant Pere" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Hora d'estiu de Sant Pere" @@ -10549,10 +10570,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Sant Pere i Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Hora estàndard de São Tomé" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Hora d'estiu de São Tomé" @@ -10561,10 +10584,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Hora estàndard de Namíbia" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Hora d'estiu de Namíbia" @@ -10573,10 +10598,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Hora estàndard de Tonga" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Hora d'estiu de Tonga" @@ -10597,10 +10624,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Hora estàndard GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Hora d'estiu GMT" @@ -10609,10 +10638,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublín, Edimburg, Lisboa, Londres" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Hora estàndard de Sudan del Sud" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Hora d'estiu de Sudan del Sud" @@ -10625,6 +10656,7 @@ msgid "Central Asia Standard Time" msgstr "Hora estàndard de l'Àsia central" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Hora d'estiu de l'Àsia central" @@ -10633,10 +10665,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astanà" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Hora estàndard de Lord Howe" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Hora d'estiu de Lord Howe" @@ -10645,10 +10679,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Illa de Lord Howe" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Hora estàndard àrab" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Hora d'estiu àrab" @@ -10657,6 +10693,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10665,10 +10702,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Temps universal coordinat+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Hora estàndard de Magadan" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Hora d'estiu de Magadan" @@ -10677,10 +10716,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Hora estàndard de Terranova" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Hora d'estiu de Terranova" @@ -10689,10 +10730,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Terranova" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Hora estàndard de Sudan" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Hora d'estiu de Sudan" @@ -10713,10 +10756,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Hora estàndard del Pacífic" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Hora d'estiu del Pacífic" @@ -10725,10 +10770,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Hora del Pacífic (EU i Canadà)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Hora estàndard de l'Azerbaidjan" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Hora d'estiu de l'Azerbaidjan" @@ -10737,10 +10784,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Bakú" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Hora estàndard de Magallanes" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Hora d'estiu de Magallanes" @@ -10749,10 +10798,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Hora estàndard de Samoa" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Hora d'estiu de Samoa" @@ -10761,10 +10812,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Hora estàndard de Kaliningrad" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Hora d'estiu de Kaliningrad" @@ -10789,6 +10842,7 @@ msgid "Middle East Standard Time" msgstr "Hora estàndard de l'Orient Mitjà" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Hora d'estiu de l'Orient Mitjà" @@ -10797,10 +10851,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Hora estàndard de Tokyo" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Hora d'estiu de Tokyo" @@ -10821,10 +10877,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Illa de Kiritimati" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Hora estàndard de Cuba" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Hora d'estiu de Cuba" @@ -10833,10 +10891,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) L'Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Hora estàndard de Jordània" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Hora d'estiu de Jordània" @@ -10845,10 +10905,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Hora estàndard central" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Hora d'estiu central" @@ -10857,6 +10919,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Hora central (EU i Canadà)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Zona horària russa 3" @@ -10865,10 +10928,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Ijevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Hora estàndard de Volgograd" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Hora d'estiu de Volgograd" @@ -10877,10 +10942,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Hora estàndard de les Açores" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Hora d'estiu de les Açores" @@ -10889,10 +10956,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Açores" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "Hora estàndard d'Àsia del nord" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Hora d'estiu d'Àsia del norest" @@ -10901,6 +10970,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10909,10 +10979,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Temps universal coordinat-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Hora estàndard de l'Argentina" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Hora d'estiu de l'Argentina" @@ -10925,6 +10997,7 @@ msgid "Turks And Caicos Standard Time" msgstr "Hora estàndard de Turks i Caicos" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Hora d'estiu de Turks i Caicos" @@ -10933,10 +11006,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks i Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Hora estàndard de Marqueses" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Hora d'estiu de Marqueses" @@ -10945,10 +11020,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Illes Marqueses" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Hora estàndard de Birmània" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Hora d'estiu de Birmània" @@ -10957,6 +11034,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Temps universal coordinat" @@ -10965,10 +11043,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Temps universal coordinat" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Hora estàndard de l'Índia" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Hora d'estiu de l'Índia" @@ -10977,10 +11057,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nova Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Hora estàndard GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Hora d'estiu GTB" @@ -10989,10 +11071,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Atenes, Bucarest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Hora estàndard de Turquia" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Hora d'estiu de Turquia" @@ -11001,10 +11085,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Hora estàndard d'Àstrakhan" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Hora d'estiu d'Àstrakhan" @@ -11013,10 +11099,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Àstrakhan, Uliànovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Hora estàndard de Fiji" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Hora d'estiu de Fiji" @@ -11029,6 +11117,7 @@ msgid "Canada Central Standard Time" msgstr "Hora estàndard del Canadà central" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Hora d'estiu del Canadà central" @@ -11037,10 +11126,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Hora estàndard de Yukon" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Hora d'estiu de Yukon" @@ -11049,10 +11140,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Hora estàndard de Taipei" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Hora d'estiu de Taipei" @@ -11065,6 +11158,7 @@ msgid "W. Europe Standard Time" msgstr "Hora estàndard d'Europa de l'oest" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Hora d'estiu d'Europa de l'oest" @@ -11073,10 +11167,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlín, Berna, Roma, Estocolm, Viena" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Hora estàndard de Montevideo" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Hora d'estiu de Montevideo" @@ -11085,10 +11181,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Hora estàndard del Pakistan" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Hora d'estiu del Pakistan" @@ -11097,10 +11195,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Hora estàndard de Tomsk" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Hora d'estiu de Tomsk" @@ -11109,10 +11209,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Hora estàndard del Caucas" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Hora d'estiu del Caucas" @@ -11121,10 +11223,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Erevan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "Hora estàndard oriental AUS" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Hora d'estiu de l'est AUS" @@ -11145,10 +11249,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novossibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Hora estàndard de l'est" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Hora d'estiu de l'est" @@ -11157,10 +11263,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Hora de l'est (EU i Canadà)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Hora estàndard de Transbaikal" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Hora d'estiu de Transbaikal" @@ -11173,6 +11281,7 @@ msgid "E. Europe Standard Time" msgstr "Hora estàndard d'Europa de l'est" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Hora d'estiu d'Europa de l'est" @@ -11181,10 +11290,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Hora estàndard central (Mèxic)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Hora d'estiu central (Mèxic)" @@ -11193,10 +11304,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Ciutat de Mèxic, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Hora estàndard de Saràtov" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Hora d'estiu de Saràtov" @@ -11205,10 +11318,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saràtov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Hora estàndard de l'Atlàntic" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Hora d'estiu de l'Atlàntic" @@ -11217,10 +11332,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Hora de l'Atlàntic (Canadà)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Hora estàndard de les muntanyes" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Hora d'estiu de les muntanyes" @@ -11229,10 +11346,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Hora de les muntanyes (EU i Canadà)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "Hora estàndard de l'est EUA" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "Hora d'estiu de l'est EUA" @@ -11241,10 +11360,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (est)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Hora estàndard de Sakhalín" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Hora d'estiu de Sakhalín" @@ -11257,6 +11378,7 @@ msgid "North Korea Standard Time" msgstr "Hora estàndard de Corea del Nord" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Hora d'estiu de Corea del Nord" @@ -11265,10 +11387,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Hora estàndard de Tasmània" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Hora d'estiu de Tasmània" @@ -11289,6 +11413,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Amèrica central" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11333,6 +11458,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaida" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11341,10 +11467,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Temps universal coordinat-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Hora estàndard de Sri Lanka" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Hora d'estiu de Sri Lanka" @@ -11353,10 +11481,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayewardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Hora estàndard de l'Afganistan" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Hora d'estiu de l'Afganistan" @@ -11365,10 +11495,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Hora estàndard de Iakutsk" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Hora d'estiu de Iakutsk" @@ -11389,10 +11521,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Caiena, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Hora estàndard àrab" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Hora d'estiu àrab" @@ -11401,10 +11535,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Hora estàndard de l'Àrabia" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Hora d'estiu de l'Àrabia" @@ -11413,10 +11549,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Masqat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Hora estàndard de Tocantins" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Hora d'estiu de Tocantins" @@ -11425,10 +11563,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Hora estàndard de Rússia" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Hora d'estiu de Rússia" @@ -11449,10 +11589,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Hora estàndard romànic" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Hora d'estiu romànic" @@ -11461,10 +11603,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brussel·les, Copenhaguen, Madrid, París" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Hora estàndard de Iekaterinburg" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Hora d'estiu de Iekaterinburg" @@ -11473,6 +11617,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Iekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Zona horària russa 11" @@ -11481,10 +11626,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anàdir, Petropàvlovsk-Kamtxatski" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "Hora estàndard de Cisjordània" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Hora d'estiu de Cisjordània" @@ -11493,10 +11640,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Hora estàndard de Síria" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Hora d'estiu de Síria" @@ -11505,10 +11654,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damasc" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "Hora estàndard central AUS" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Hora d'estiu central AUS" @@ -11517,10 +11668,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Hora estàndard de Greenwich" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Hora d'estiu de Greenwich" @@ -11529,10 +11682,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monròvia, Reykjavík" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Hora estàndard d'Ulan Bator" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Hora d'estiu d'Ulan Bator" @@ -11541,10 +11696,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Hora estàndard de Norfolk" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Hora d'estiu de Norfolk" @@ -11553,10 +11710,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Illa Norfolk" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Hora estàndard d'Israel" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Hora d'estiu d'Israel" @@ -11565,10 +11724,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Hora estàndard de Bangla Desh" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Hora d'estiu de Bangla Desh" @@ -11589,10 +11750,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogotà, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Hora estàndard d'Àsia de l'oest" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Hora d'estiu d'Àsia de l'oest" @@ -11601,10 +11764,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Aixkhabad, Taixkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Hora estàndard d'Alaska" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Hora d'estiu d'Alaska" @@ -11613,10 +11778,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Hora estàndard del Paraguai" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Hora d'estiu del Paraguai" @@ -11637,10 +11804,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Línia internacional de canvi de data occidental" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Hora estàndard de Líbia" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Hora d'estiu de Líbia" @@ -11649,10 +11818,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Hora estàndard de Bahia" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Hora d'estiu de Bahia" @@ -11661,10 +11832,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Hora estàndard de Veneçuela" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Hora d'estiu de Veneçuela" @@ -11673,10 +11846,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Hora estàndard de Bougainville" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Hora d'estiu de Bougainville" @@ -11685,10 +11860,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Illa de Bougainville" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hora estàndard de Hawaii" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hora d'estiu de Hawaii" @@ -11709,10 +11886,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Hora estàndard de Khizilordà" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Hora d'estiu de Khizilordà" @@ -11733,10 +11912,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Hora estàndard de Nova Zelanda" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Hora d'estiu de Nova Zelanda" @@ -11745,10 +11926,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Hora estàndard aleutiana" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Hora d'estiu aleutiana" @@ -11757,10 +11940,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Illes Aleutianes" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Hora estàndard d'Omsk" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Hora d'estiu d'Omsk" @@ -11773,6 +11958,7 @@ msgid "Central Brazilian Standard Time" msgstr "Hora estàndard del Brasil central" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Hora d'estiu del Brasil central" @@ -11781,10 +11967,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Hora estàndard de Bielorússia" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Hora d'estiu de Bielorússia" @@ -11805,10 +11993,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Hora estàndard de Groenlàndia" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Hora d'estiu de Groenlàndia" @@ -11829,6 +12019,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Illa de Pasqua" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Zona horària russa 10" @@ -11837,10 +12028,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Txokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Hora estàndard d'Egipte" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Hora d'estiu d'Egipte" @@ -11849,10 +12042,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) El Caire" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Hora estàndard de l'est (Mèxic)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Hora d'estiu de l'est (Mèxic)" @@ -11861,10 +12056,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Hora estàndard de Maurici" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Hora d'estiu de Maurici" @@ -11873,10 +12070,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Hora estàndard de Vladivostok" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Hora d'estiu de Vladivostok" @@ -11885,10 +12084,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Hora estàndard de Singapur" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Hora d'estiu de Singapur" @@ -11897,10 +12098,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Hora estàndard de Corea" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Hora d'estiu de Corea" @@ -11925,6 +12128,7 @@ msgid "E. Africa Standard Time" msgstr "Hora estàndard d'Àfrica de l'est" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Hora d'estiu d'Àfrica de l'est" @@ -11933,10 +12137,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Hora estàndard FLE" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Hora d'estiu FLE" diff --git a/po/de.po b/po/de.po index 6e27be7c6cc..b872f2f63a0 100644 --- a/po/de.po +++ b/po/de.po @@ -10377,10 +10377,12 @@ msgid "Select Source" msgstr "Quelle auswählen" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "China Normalzeit" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "China Sommerzeit" @@ -10389,10 +10391,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Peking, Chongqing, Hongkong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Nordasien Normalzeit" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Nordasien Sommerzeit" @@ -10401,10 +10405,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoyarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Georgische Normalzeit" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Georgische Sommerzeit" @@ -10413,6 +10419,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10421,10 +10428,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Koordinierte Weltzeit+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepal Normalzeit" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepal Sommerzeit" @@ -10433,10 +10442,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Katmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Kap Verde Normalzeit" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Kap Verde Sommerzeit" @@ -10445,10 +10456,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Kap Verde Is." #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haiti Normalzeit" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haiti Sommerzeit" @@ -10457,10 +10470,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Mitteleuropäische Zeit" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Mitteleuropäische Sommerzeit" @@ -10469,10 +10484,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Marokko Normalzeit" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Marokko Sommerzeit" @@ -10481,6 +10498,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10489,10 +10507,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Koordinierte Weltzeit-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altai Normalzeit" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altai Sommerzeit" @@ -10501,10 +10521,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaisk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Mitteleuropäische Zeit" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Mitteleuropäische Sommerzeit" @@ -10513,10 +10535,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Prag" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Iran Normalzeit" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Iran Sommerzeit" @@ -10525,10 +10549,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint-Pierre Normalzeit" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierre Sommerzeit" @@ -10537,10 +10563,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) St. Pierre und Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "São Tomé Normalzeit" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "São Tomé Sommerzeit" @@ -10549,10 +10577,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibia Normalzeit" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibia Sommerzeit" @@ -10561,10 +10591,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhuk" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tonga Normalzeit" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tonga Sommerzeit" @@ -10573,10 +10605,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Mountain Normalzeit (Mexiko)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Mountain Sommerzeit (Mexiko)" @@ -10585,10 +10619,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlan" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT Normalzeit" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT Sommerzeit" @@ -10597,10 +10633,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, London" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Südsudan Normalzeit" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Südsudan Sommerzeit" @@ -10609,10 +10647,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Zentralasien Normalzeit" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Zentralasien Sommerzeit" @@ -10621,10 +10661,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord-Howe Normalzeit" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord-Howe Sommerzeit" @@ -10633,10 +10675,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord-Howe-Insel" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabische Normalzeit" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabische Sommerzeit" @@ -10645,6 +10689,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10653,10 +10698,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Koordinierte Weltzeit+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadan Normalzeit" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadan Sommerzeit" @@ -10665,10 +10712,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Neufundland Normalzeit" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Neufundland Sommerzeit" @@ -10677,10 +10726,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Neufundland" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Sudan Normalzeit" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Sudan Sommerzeit" @@ -10689,10 +10740,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartum" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "Westpazifische Normalzeit" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "Westpazifische Sommerzeit" @@ -10701,10 +10754,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Pazifische Normalzeit" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Pazifische Sommerzeit" @@ -10713,10 +10768,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Pazifik-Zeit (USA & Kanada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Aserbaidschan Normalzeit" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Aserbaidschan Sommerzeit" @@ -10725,10 +10782,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magallanes Normalzeit" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magallanes Sommerzeit" @@ -10737,10 +10796,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa Normalzeit" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa Sommerzeit" @@ -10749,10 +10810,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningrad Normalzeit" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningrad Sommerzeit" @@ -10761,10 +10824,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "Pazifische Normalzeit (Mexiko)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Pazifische Sommerzeit (Mexiko)" @@ -10773,10 +10838,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Niederkalifornien" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Mittlerer Osten Normalzeit" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Mittlerer Osten Sommerzeit" @@ -10785,10 +10852,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokyo Normalzeit" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokyo Sommerzeit" @@ -10797,10 +10866,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokyo" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Linieninseln Normalzeit" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Linieninseln Sommerzeit" @@ -10809,10 +10880,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati-Insel" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Kuba Normalzeit" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Kuba Sommerzeit" @@ -10821,10 +10894,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havanna" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordanien Normalzeit" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordanien Sommerzeit" @@ -10833,10 +10908,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Central Normalzeit" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Central Sommerzeit" @@ -10845,6 +10922,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Central Time (USA & Kanada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Russland Zeitzone 3" @@ -10853,10 +10931,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Ischewsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Wolgograd Normalzeit" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Wolgograd Sommerzeit" @@ -10865,10 +10945,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Wolgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azoren Normalzeit" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azoren Sommerzeit" @@ -10877,10 +10959,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azoren" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "Ost-Nordasiatische Normalzeit" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Ost-Nordasiatische Sommerzeit" @@ -10889,6 +10973,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10897,10 +10982,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Koordinierte Weltzeit-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentinien Normalzeit" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentinien Sommerzeit" @@ -10921,10 +11008,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks- und Caicosinseln" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Marquesas Normalzeit" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Marquesas Sommerzeit" @@ -10933,10 +11022,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Marquesas-Inseln" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmar Normalzeit" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmar Sommerzeit" @@ -10945,6 +11036,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangun)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Koordinierte Weltzeit" @@ -10953,10 +11045,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Koordinierte Weltzeit" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Indien Normalzeit" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Indien Sommerzeit" @@ -10965,10 +11059,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kalkutta, Mumbai, Neu-Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Osteuropäische Zeit" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Osteuropäische Sommerzeit" @@ -10977,10 +11073,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Athen, Bucharest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Türkei Normalzeit" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Türkei Sommerzeit" @@ -10989,10 +11087,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrachan Normalzeit" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrachan Sommerzeit" @@ -11001,10 +11101,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrachan, Uljanowsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fidschi Normalzeit" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fidschi Sommerzeit" @@ -11013,10 +11115,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fidschi" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Central Normalzeit (Kanada)" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Central Sommerzeit (Kanada)" @@ -11025,10 +11129,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Yukon Normalzeit" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Yukon Sommerzeit" @@ -11037,10 +11143,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipeh Normalzeit" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipeh Sommerzeit" @@ -11049,10 +11157,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipeh" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "Mitteleuropäische Zeit" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Mitteleuropäische Sommerzeit" @@ -11061,10 +11171,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlin, Bern, Rom, Stockholm, Wien" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideo Normalzeit" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideo Sommerzeit" @@ -11073,10 +11185,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistan Normalzeit" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistan Sommerzeit" @@ -11085,10 +11199,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karatschi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomsk Normalzeit" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomsk Sommerzeit" @@ -11097,10 +11213,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Kaukasische Normalzeit" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Kaukasische Sommerzeit" @@ -11109,10 +11227,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Eriwan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "Ostaustralische Normalzeit" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Ostaustralische Sommerzeit" @@ -11121,10 +11241,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "Nordzentralasien Normalzeit" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "Nordzentralasien Sommerzeit" @@ -11133,10 +11255,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Nowosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Eastern Normalzeit" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Eastern Sommerzeit" @@ -11145,10 +11269,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Eastern Time (USA & Kanada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Transbaikal Normalzeit" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Transbaikal Sommerzeit" @@ -11157,10 +11283,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Mitteleuropäische Zeit" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Mitteleuropäische Sommerzeit" @@ -11169,10 +11297,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Central Normalzeit (Mexiko)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Central Sommerzeit (Mexiko)" @@ -11181,10 +11311,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexiko-Stadt, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratow Normalzeit" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratow Sommerzeit" @@ -11193,10 +11325,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratow" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlantic Normalzeit" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlantic Sommerzeit" @@ -11205,10 +11339,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlantic Time (Kanada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Mountain Normalzeit" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Mountain Sommerzeit" @@ -11217,10 +11353,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Mountain Time (USA & Kanada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "US Eastern Normalzeit" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "US Eastern Sommerzeit" @@ -11229,10 +11367,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (Ost)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sachalin Normalzeit" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sachalin Sommerzeit" @@ -11241,10 +11381,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sachalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Nordkorea Normalzeit" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Nordkorea Sommerzeit" @@ -11253,10 +11395,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pjöngjang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmanien Normalzeit" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmanien Sommerzeit" @@ -11265,10 +11409,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Mittelamerikanische Normalzeit" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Mittelamerikanische Sommerzeit" @@ -11277,6 +11423,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Mittelamerika" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11285,10 +11432,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Koordinierte Weltzeit-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "US Mountain Normalzeit" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "US Mountain Sommerzeit" @@ -11297,10 +11446,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Südafrika Normalzeit" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Südafrika Sommerzeit" @@ -11309,10 +11460,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Zentralaustralische Normalzeit" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Zentralaustralische Sommerzeit" @@ -11321,6 +11474,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11329,10 +11483,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Koordinierte Weltzeit-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lanka Normalzeit" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lanka Sommerzeit" @@ -11341,10 +11497,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afghanistan Normalzeit" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afghanistan Sommerzeit" @@ -11353,10 +11511,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Yakutsk Normalzeit" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Yakutsk Sommerzeit" @@ -11365,10 +11525,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "Östl. Südamerika Normalzeit" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "Östl. Südamerika Sommerzeit" @@ -11377,10 +11539,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arabische Normalzeit" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arabische Sommerzeit" @@ -11389,10 +11553,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabische Normalzeit" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabische Sommerzeit" @@ -11401,10 +11567,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Muskat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantins Normalzeit" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantins Sommerzeit" @@ -11413,10 +11581,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Russische Normalzeit" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Russische Sommerzeit" @@ -11437,10 +11607,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romanische Normalzeit" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romanische Sommerzeit" @@ -11449,10 +11621,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brüssel, Kopenhagen, Madrid, Paris" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Jekaterinburg Normalzeit" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Jekaterinburg Sommerzeit" @@ -11461,6 +11635,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Jekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Russland Zeitzone 11" @@ -11469,10 +11644,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropawlowsk-Kamtschatski" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "Westjordanland Normalzeit" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Westjordanland Sommerzeit" @@ -11481,10 +11658,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Syrien Normalzeit" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Syrien Sommerzeit" @@ -11493,10 +11672,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damaskus" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "Zentralaustralische Normalzeit" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Zentralaustralische Sommerzeit" @@ -11505,10 +11686,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Westafrikanische Normalzeit" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Westafrikanische Sommerzeit" @@ -11517,10 +11700,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulan-Bator Normalzeit" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulan-Bator Sommerzeit" @@ -11529,10 +11714,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulan-Bator" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolk Normalzeit" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolk Sommerzeit" @@ -11541,10 +11728,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolkinsel" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Israel Normalzeit" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Israel Sommerzeit" @@ -11553,10 +11742,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladesch Normalzeit" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladesch Sommerzeit" @@ -11565,10 +11756,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "Westl. Südamerika Normalzeit" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "Westl. Südamerika Sommerzeit" @@ -11577,10 +11770,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogotá, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Westasien Normalzeit" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Westasien Sommerzeit" @@ -11589,10 +11784,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Aschgabat, Taschkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaska Normalzeit" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaska Sommerzeit" @@ -11601,10 +11798,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguay Normalzeit" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguay Sommerzeit" @@ -11613,10 +11812,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Datumsgrenze Normalzeit" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Datumsgrenze Sommerzeit" @@ -11625,10 +11826,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Internationale Datumsgrenze West" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libyen Normalzeit" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libyen Sommerzeit" @@ -11637,10 +11840,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripolis" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahia Normalzeit" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahia Sommerzeit" @@ -11649,10 +11854,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuela Normalzeit" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuela Sommerzeit" @@ -11661,10 +11868,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainville Normalzeit" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainville Sommerzeit" @@ -11673,10 +11882,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bougainville-Insel" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hawaii Normalzeit" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hawaii Sommerzeit" @@ -11685,10 +11896,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "Südostasiatische Normalzeit" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "Südostasiatische Sommerzeit" @@ -11697,10 +11910,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Qysylorda Normalzeit" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Qysylorda Sommerzeit" @@ -11709,10 +11924,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Qysylorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "Westmongolei Normalzeit" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Westmongolei Sommerzeit" @@ -11721,10 +11938,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Chowd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Neuseeland Normalzeit" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Neuseeland Sommerzeit" @@ -11733,10 +11952,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleutische Normalzeit" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleutische Sommerzeit" @@ -11745,10 +11966,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleuten-Inseln" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omsk Normalzeit" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omsk Sommerzeit" @@ -11757,10 +11980,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Zentalbrasilianische Normalzeit" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Zentalbrasilianische Sommerzeit" @@ -11769,10 +11994,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Belarus Normalzeit" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Belarus Sommerzeit" @@ -11781,10 +12008,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "Mittl. Südamerika Normalzeit" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "Mittl. Südamerika Sommerzeit" @@ -11793,10 +12022,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Grönland Normalzeit" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Grönland Sommerzeit" @@ -11805,10 +12036,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Grönland" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Osterinsel Normalzeit" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Osterinsel Sommerzeit" @@ -11817,6 +12050,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Osterinsel" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Russland Zeitzone 10" @@ -11825,10 +12059,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Tschokurdach" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Ägypten Normalzeit" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Ägypten Sommerzeit" @@ -11837,10 +12073,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Kairo" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Östliche Normalzeit (Mexiko)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Östliche Sommerzeit (Mexiko)" @@ -11849,10 +12087,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritius Normalzeit" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritius Sommerzeit" @@ -11861,10 +12101,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Wladiwostok Normalzeit" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Wladiwostok Sommerzeit" @@ -11873,10 +12115,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Wladiwostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapur Normalzeit" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapur Sommerzeit" @@ -11885,10 +12129,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Koreanische Normalzeit" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Koreanische Sommerzeit" @@ -11897,10 +12143,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seoul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chathaminseln Normalzeit" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chathaminseln Sommerzeit" @@ -11909,10 +12157,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Chathaminseln" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Ostafrikanische Normalzeit" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Ostafrikanische Sommerzeit" @@ -11921,10 +12171,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Osteuropäische Zeit" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Osteuropäische Sommerzeit" @@ -11933,10 +12185,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiew, Riga, Sofia, Tallinn, Wilna" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "Östl. Südamerika Normalzeit" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "Östl. Südamerika Sommerzeit" @@ -11945,10 +12199,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilien" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Zentralpazifische Normalzeit" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Zentralpazifische Sommerzeit" @@ -11957,10 +12213,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Solomon-Inseln, Neukaledonien" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "West-Zentralafrika Normalzeit" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "West-Zentralafrika Sommerzeit" @@ -11969,10 +12227,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West-Zentralafrika" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "Chilenische Normalzeit" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Chilenische Sommerzeit" @@ -11981,10 +12241,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "Ostaustralische Normalzeit" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "Ostaustralische Sommerzeit" @@ -11993,10 +12255,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "Westaustralische Normalzeit" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "Westaustralische Sommerzeit" diff --git a/po/en.po b/po/en.po index ea620f61559..41e7e0c5923 100644 --- a/po/en.po +++ b/po/en.po @@ -10341,10 +10341,12 @@ msgid "Select Source" msgstr "Select Source" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "China Standard Time" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "China Daylight Time" @@ -10353,10 +10355,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "North Asia Standard Time" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "North Asia Daylight Time" @@ -10365,10 +10369,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoyarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Georgian Standard Time" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Georgian Daylight Time" @@ -10377,6 +10383,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10385,10 +10392,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Coordinated Universal Time+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepal Standard Time" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepal Daylight Time" @@ -10397,10 +10406,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Kathmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Cape Verde Standard Time" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Cape Verde Daylight Time" @@ -10409,10 +10420,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Cabo Verde Is." #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haiti Standard Time" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haiti Daylight Time" @@ -10421,10 +10434,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Central European Standard Time" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Central European Daylight Time" @@ -10433,10 +10448,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Morocco Standard Time" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Morocco Daylight Time" @@ -10445,6 +10462,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10453,10 +10471,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Coordinated Universal Time-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altai Standard Time" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altai Daylight Time" @@ -10465,10 +10485,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaysk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Central Europe Standard Time" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Central Europe Daylight Time" @@ -10477,10 +10499,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Iran Standard Time" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Iran Daylight Time" @@ -10489,10 +10513,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Tehran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint Pierre Standard Time" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint Pierre Daylight Time" @@ -10501,10 +10527,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint Pierre and Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Sao Tome Standard Time" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Sao Tome Daylight Time" @@ -10513,10 +10541,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibia Standard Time" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibia Daylight Time" @@ -10525,10 +10555,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tonga Standard Time" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tonga Daylight Time" @@ -10537,10 +10569,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Mountain Standard Time (Mexico)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Mountain Daylight Time (Mexico)" @@ -10549,10 +10583,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlan" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT Standard Time" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT Daylight Time" @@ -10561,10 +10597,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "South Sudan Standard Time" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "South Sudan Daylight Time" @@ -10573,10 +10611,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Central Asia Standard Time" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Central Asia Daylight Time" @@ -10585,10 +10625,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord Howe Standard Time" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord Howe Daylight Time" @@ -10597,10 +10639,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howe Island" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabic Standard Time" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabic Daylight Time" @@ -10609,6 +10653,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Baghdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10617,10 +10662,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Coordinated Universal Time+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadan Standard Time" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadan Daylight Time" @@ -10629,10 +10676,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Newfoundland Standard Time" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Newfoundland Daylight Time" @@ -10641,10 +10690,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Sudan Standard Time" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Sudan Daylight Time" @@ -10653,10 +10704,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartoum" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "West Pacific Standard Time" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "West Pacific Daylight Time" @@ -10665,10 +10718,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Pacific Standard Time" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Pacific Daylight Time" @@ -10677,10 +10732,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Pacific Time (US & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbaijan Standard Time" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbaijan Daylight Time" @@ -10689,10 +10746,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magallanes Standard Time" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magallanes Daylight Time" @@ -10701,10 +10760,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa Standard Time" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa Daylight Time" @@ -10713,10 +10774,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningrad Standard Time" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningrad Daylight Time" @@ -10725,10 +10788,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "Pacific Standard Time (Mexico)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Pacific Daylight Time (Mexico)" @@ -10737,10 +10802,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Middle East Standard Time" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Middle East Daylight Time" @@ -10749,10 +10816,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokyo Standard Time" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokyo Daylight Time" @@ -10761,10 +10830,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokyo" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Line Islands Standard Time" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Line Islands Daylight Time" @@ -10773,10 +10844,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati Island" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Cuba Standard Time" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Cuba Daylight Time" @@ -10785,10 +10858,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordan Standard Time" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordan Daylight Time" @@ -10797,10 +10872,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Central Standard Time" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Central Daylight Time" @@ -10809,6 +10886,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Central Time (US & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Russia Time Zone 3" @@ -10817,10 +10895,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Volgograd Standard Time" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Volgograd Daylight Time" @@ -10829,10 +10909,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azores Standard Time" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azores Daylight Time" @@ -10841,10 +10923,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azores" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "North Asia East Standard Time" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "North Asia East Daylight Time" @@ -10853,6 +10937,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10861,10 +10946,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Coordinated Universal Time-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentina Standard Time" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentina Daylight Time" @@ -10873,10 +10960,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) City of Buenos Aires" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "Turks And Caicos Standard Time" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Turks And Caicos Daylight Time" @@ -10885,10 +10974,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks and Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Marquesas Standard Time" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Marquesas Daylight Time" @@ -10897,10 +10988,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Marquesas Islands" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmar Standard Time" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmar Daylight Time" @@ -10909,6 +11002,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Coordinated Universal Time" @@ -10917,10 +11011,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Coordinated Universal Time" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "India Standard Time" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "India Daylight Time" @@ -10929,10 +11025,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB Standard Time" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB Daylight Time" @@ -10941,10 +11039,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Athens, Bucharest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Turkey Standard Time" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Turkey Daylight Time" @@ -10953,10 +11053,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrakhan Standard Time" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrakhan Daylight Time" @@ -10965,10 +11067,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrakhan, Ulyanovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fiji Standard Time" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fiji Daylight Time" @@ -10977,10 +11081,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Canada Central Standard Time" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Canada Central Daylight Time" @@ -10989,10 +11095,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Yukon Standard Time" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Yukon Daylight Time" @@ -11001,10 +11109,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipei Standard Time" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipei Daylight Time" @@ -11013,10 +11123,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "W. Europe Standard Time" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "W. Europe Daylight Time" @@ -11025,10 +11137,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideo Standard Time" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideo Daylight Time" @@ -11037,10 +11151,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistan Standard Time" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistan Daylight Time" @@ -11049,10 +11165,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomsk Standard Time" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomsk Daylight Time" @@ -11061,10 +11179,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Caucasus Standard Time" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Caucasus Daylight Time" @@ -11073,10 +11193,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Yerevan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "AUS Eastern Standard Time" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "AUS Eastern Daylight Time" @@ -11085,10 +11207,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "N. Central Asia Standard Time" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "N. Central Asia Daylight Time" @@ -11097,10 +11221,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Eastern Standard Time" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Eastern Daylight Time" @@ -11109,10 +11235,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Eastern Time (US & Canada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Transbaikal Standard Time" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Transbaikal Daylight Time" @@ -11121,10 +11249,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "E. Europe Standard Time" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "E. Europe Daylight Time" @@ -11133,10 +11263,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Central Standard Time (Mexico)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Central Daylight Time (Mexico)" @@ -11145,10 +11277,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexico City, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratov Standard Time" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratov Daylight Time" @@ -11157,10 +11291,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlantic Standard Time" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlantic Daylight Time" @@ -11169,10 +11305,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlantic Time (Canada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Mountain Standard Time" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Mountain Daylight Time" @@ -11181,10 +11319,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Mountain Time (US & Canada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "US Eastern Standard Time" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "US Eastern Daylight Time" @@ -11193,10 +11333,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (East)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sakhalin Standard Time" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sakhalin Daylight Time" @@ -11205,10 +11347,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sakhalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "North Korea Standard Time" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "North Korea Daylight Time" @@ -11217,10 +11361,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmania Standard Time" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmania Daylight Time" @@ -11229,10 +11375,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Central America Standard Time" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Central America Daylight Time" @@ -11241,6 +11389,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Central America" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11249,10 +11398,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Coordinated Universal Time-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "US Mountain Standard Time" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "US Mountain Daylight Time" @@ -11261,10 +11412,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "South Africa Standard Time" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "South Africa Daylight Time" @@ -11273,10 +11426,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Cen. Australia Standard Time" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Cen. Australia Daylight Time" @@ -11285,6 +11440,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11293,10 +11449,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Coordinated Universal Time-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lanka Standard Time" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lanka Daylight Time" @@ -11305,10 +11463,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afghanistan Standard Time" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afghanistan Daylight Time" @@ -11317,10 +11477,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Yakutsk Standard Time" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Yakutsk Daylight Time" @@ -11329,10 +11491,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "SA Eastern Standard Time" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "SA Eastern Daylight Time" @@ -11341,10 +11505,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arab Standard Time" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arab Daylight Time" @@ -11353,10 +11519,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riyadh" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabian Standard Time" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabian Daylight Time" @@ -11365,10 +11533,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantins Standard Time" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantins Daylight Time" @@ -11377,10 +11547,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Russian Standard Time" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Russian Daylight Time" @@ -11389,10 +11561,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moscow, St. Petersburg" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "Aus Central W. Standard Time" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "Aus Central W. Daylight Time" @@ -11401,10 +11575,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romance Standard Time" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romance Daylight Time" @@ -11413,10 +11589,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Ekaterinburg Standard Time" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Ekaterinburg Daylight Time" @@ -11425,6 +11603,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Ekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Russia Time Zone 11" @@ -11433,10 +11612,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "West Bank Standard Time" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "West Bank Daylight Time" @@ -11445,10 +11626,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Syria Standard Time" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Syria Daylight Time" @@ -11457,10 +11640,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "AUS Central Standard Time" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "AUS Central Daylight Time" @@ -11469,10 +11654,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Greenwich Standard Time" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Greenwich Daylight Time" @@ -11481,10 +11668,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulaanbaatar Standard Time" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulaanbaatar Daylight Time" @@ -11493,10 +11682,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolk Standard Time" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolk Daylight Time" @@ -11505,10 +11696,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolk Island" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Israel Standard Time" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Israel Daylight Time" @@ -11517,10 +11710,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladesh Standard Time" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladesh Daylight Time" @@ -11529,10 +11724,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "SA Pacific Standard Time" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "SA Pacific Daylight Time" @@ -11541,10 +11738,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "West Asia Standard Time" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "West Asia Daylight Time" @@ -11553,10 +11752,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ashgabat, Tashkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaskan Standard Time" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaskan Daylight Time" @@ -11565,10 +11766,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguay Standard Time" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguay Daylight Time" @@ -11577,10 +11780,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Dateline Standard Time" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Dateline Daylight Time" @@ -11589,10 +11794,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) International Date Line West" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libya Standard Time" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libya Daylight Time" @@ -11601,10 +11808,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahia Standard Time" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahia Daylight Time" @@ -11613,10 +11822,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuela Standard Time" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuela Daylight Time" @@ -11625,10 +11836,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainville Standard Time" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainville Daylight Time" @@ -11637,10 +11850,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bougainville Island" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hawaiian Standard Time" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hawaiian Daylight Time" @@ -11649,10 +11864,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "SE Asia Standard Time" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "SE Asia Daylight Time" @@ -11661,10 +11878,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Qyzylorda Standard Time" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Qyzylorda Daylight Time" @@ -11673,10 +11892,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Qyzylorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "W. Mongolia Standard Time" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "W. Mongolia Daylight Time" @@ -11685,10 +11906,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "New Zealand Standard Time" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "New Zealand Daylight Time" @@ -11697,10 +11920,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleutian Standard Time" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleutian Daylight Time" @@ -11709,10 +11934,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleutian Islands" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omsk Standard Time" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omsk Daylight Time" @@ -11721,10 +11948,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Central Brazilian Standard Time" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Central Brazilian Daylight Time" @@ -11733,10 +11962,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Belarus Standard Time" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Belarus Daylight Time" @@ -11745,10 +11976,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "SA Western Standard Time" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "SA Western Daylight Time" @@ -11757,10 +11990,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Greenland Standard Time" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Greenland Daylight Time" @@ -11769,10 +12004,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Greenland" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Easter Island Standard Time" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Easter Island Daylight Time" @@ -11781,6 +12018,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Easter Island" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Russia Time Zone 10" @@ -11789,10 +12027,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Chokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Egypt Standard Time" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Egypt Daylight Time" @@ -11801,10 +12041,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Cairo" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Eastern Standard Time (Mexico)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Eastern Daylight Time (Mexico)" @@ -11813,10 +12055,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritius Standard Time" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritius Daylight Time" @@ -11825,10 +12069,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Vladivostok Standard Time" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Vladivostok Daylight Time" @@ -11837,10 +12083,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapore Standard Time" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapore Daylight Time" @@ -11849,10 +12097,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Korea Standard Time" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Korea Daylight Time" @@ -11861,10 +12111,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seoul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chatham Islands Standard Time" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chatham Islands Daylight Time" @@ -11873,10 +12125,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Chatham Islands" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "E. Africa Standard Time" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "E. Africa Daylight Time" @@ -11885,10 +12139,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE Standard Time" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE Daylight Time" @@ -11897,10 +12153,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "E. South America Standard Time" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "E. South America Daylight Time" @@ -11909,10 +12167,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Central Pacific Standard Time" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Central Pacific Daylight Time" @@ -11921,10 +12181,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Solomon Is., New Caledonia" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "W. Central Africa Standard Time" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "W. Central Africa Daylight Time" @@ -11933,10 +12195,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West Central Africa" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "Pacific SA Standard Time" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Pacific SA Daylight Time" @@ -11945,10 +12209,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "E. Australia Standard Time" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "E. Australia Daylight Time" @@ -11957,10 +12223,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "W. Australia Standard Time" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "W. Australia Daylight Time" diff --git a/po/en_US.po b/po/en_US.po index a4e20e3045a..344c88e1f94 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -10341,10 +10341,12 @@ msgid "Select Source" msgstr "Select Source" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "China Standard Time" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "China Daylight Time" @@ -10353,10 +10355,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "North Asia Standard Time" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "North Asia Daylight Time" @@ -10365,10 +10369,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoyarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Georgian Standard Time" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Georgian Daylight Time" @@ -10377,6 +10383,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10385,10 +10392,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Coordinated Universal Time+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepal Standard Time" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepal Daylight Time" @@ -10397,10 +10406,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Kathmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Cape Verde Standard Time" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Cape Verde Daylight Time" @@ -10409,10 +10420,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Cabo Verde Is." #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haiti Standard Time" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haiti Daylight Time" @@ -10421,10 +10434,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Central European Standard Time" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Central European Daylight Time" @@ -10433,10 +10448,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Morocco Standard Time" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Morocco Daylight Time" @@ -10445,6 +10462,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10453,10 +10471,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Coordinated Universal Time-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altai Standard Time" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altai Daylight Time" @@ -10465,10 +10485,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaysk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Central Europe Standard Time" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Central Europe Daylight Time" @@ -10477,10 +10499,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Iran Standard Time" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Iran Daylight Time" @@ -10489,10 +10513,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Tehran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint Pierre Standard Time" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint Pierre Daylight Time" @@ -10501,10 +10527,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint Pierre and Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Sao Tome Standard Time" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Sao Tome Daylight Time" @@ -10513,10 +10541,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibia Standard Time" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibia Daylight Time" @@ -10525,10 +10555,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tonga Standard Time" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tonga Daylight Time" @@ -10537,10 +10569,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Mountain Standard Time (Mexico)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Mountain Daylight Time (Mexico)" @@ -10549,10 +10583,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlan" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT Standard Time" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT Daylight Time" @@ -10561,10 +10597,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "South Sudan Standard Time" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "South Sudan Daylight Time" @@ -10573,10 +10611,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Central Asia Standard Time" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Central Asia Daylight Time" @@ -10585,10 +10625,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord Howe Standard Time" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord Howe Daylight Time" @@ -10597,10 +10639,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howe Island" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabic Standard Time" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabic Daylight Time" @@ -10609,6 +10653,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Baghdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10617,10 +10662,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Coordinated Universal Time+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadan Standard Time" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadan Daylight Time" @@ -10629,10 +10676,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Newfoundland Standard Time" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Newfoundland Daylight Time" @@ -10641,10 +10690,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Sudan Standard Time" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Sudan Daylight Time" @@ -10653,10 +10704,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartoum" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "West Pacific Standard Time" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "West Pacific Daylight Time" @@ -10665,10 +10718,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Pacific Standard Time" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Pacific Daylight Time" @@ -10677,10 +10732,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Pacific Time (US & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbaijan Standard Time" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbaijan Daylight Time" @@ -10689,10 +10746,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magallanes Standard Time" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magallanes Daylight Time" @@ -10701,10 +10760,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa Standard Time" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa Daylight Time" @@ -10713,10 +10774,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningrad Standard Time" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningrad Daylight Time" @@ -10725,10 +10788,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "Pacific Standard Time (Mexico)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Pacific Daylight Time (Mexico)" @@ -10737,10 +10802,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Middle East Standard Time" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Middle East Daylight Time" @@ -10749,10 +10816,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokyo Standard Time" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokyo Daylight Time" @@ -10761,10 +10830,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokyo" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Line Islands Standard Time" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Line Islands Daylight Time" @@ -10773,10 +10844,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati Island" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Cuba Standard Time" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Cuba Daylight Time" @@ -10785,10 +10858,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordan Standard Time" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordan Daylight Time" @@ -10797,10 +10872,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Central Standard Time" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Central Daylight Time" @@ -10809,6 +10886,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Central Time (US & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Russia Time Zone 3" @@ -10817,10 +10895,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Volgograd Standard Time" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Volgograd Daylight Time" @@ -10829,10 +10909,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azores Standard Time" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azores Daylight Time" @@ -10841,10 +10923,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azores" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "North Asia East Standard Time" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "North Asia East Daylight Time" @@ -10853,6 +10937,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10861,10 +10946,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Coordinated Universal Time-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentina Standard Time" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentina Daylight Time" @@ -10873,10 +10960,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) City of Buenos Aires" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "Turks And Caicos Standard Time" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Turks And Caicos Daylight Time" @@ -10885,10 +10974,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks and Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Marquesas Standard Time" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Marquesas Daylight Time" @@ -10897,10 +10988,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Marquesas Islands" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmar Standard Time" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmar Daylight Time" @@ -10909,6 +11002,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Coordinated Universal Time" @@ -10917,10 +11011,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Coordinated Universal Time" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "India Standard Time" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "India Daylight Time" @@ -10929,10 +11025,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB Standard Time" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB Daylight Time" @@ -10941,10 +11039,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Athens, Bucharest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Turkey Standard Time" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Turkey Daylight Time" @@ -10953,10 +11053,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrakhan Standard Time" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrakhan Daylight Time" @@ -10965,10 +11067,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrakhan, Ulyanovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fiji Standard Time" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fiji Daylight Time" @@ -10977,10 +11081,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Canada Central Standard Time" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Canada Central Daylight Time" @@ -10989,10 +11095,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Yukon Standard Time" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Yukon Daylight Time" @@ -11001,10 +11109,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipei Standard Time" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipei Daylight Time" @@ -11013,10 +11123,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "W. Europe Standard Time" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "W. Europe Daylight Time" @@ -11025,10 +11137,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideo Standard Time" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideo Daylight Time" @@ -11037,10 +11151,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistan Standard Time" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistan Daylight Time" @@ -11049,10 +11165,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomsk Standard Time" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomsk Daylight Time" @@ -11061,10 +11179,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Caucasus Standard Time" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Caucasus Daylight Time" @@ -11073,10 +11193,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Yerevan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "AUS Eastern Standard Time" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "AUS Eastern Daylight Time" @@ -11085,10 +11207,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "N. Central Asia Standard Time" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "N. Central Asia Daylight Time" @@ -11097,10 +11221,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Eastern Standard Time" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Eastern Daylight Time" @@ -11109,10 +11235,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Eastern Time (US & Canada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Transbaikal Standard Time" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Transbaikal Daylight Time" @@ -11121,10 +11249,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "E. Europe Standard Time" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "E. Europe Daylight Time" @@ -11133,10 +11263,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Central Standard Time (Mexico)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Central Daylight Time (Mexico)" @@ -11145,10 +11277,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexico City, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratov Standard Time" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratov Daylight Time" @@ -11157,10 +11291,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlantic Standard Time" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlantic Daylight Time" @@ -11169,10 +11305,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlantic Time (Canada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Mountain Standard Time" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Mountain Daylight Time" @@ -11181,10 +11319,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Mountain Time (US & Canada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "US Eastern Standard Time" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "US Eastern Daylight Time" @@ -11193,10 +11333,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (East)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sakhalin Standard Time" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sakhalin Daylight Time" @@ -11205,10 +11347,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sakhalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "North Korea Standard Time" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "North Korea Daylight Time" @@ -11217,10 +11361,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmania Standard Time" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmania Daylight Time" @@ -11229,10 +11375,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Central America Standard Time" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Central America Daylight Time" @@ -11241,6 +11389,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Central America" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11249,10 +11398,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Coordinated Universal Time-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "US Mountain Standard Time" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "US Mountain Daylight Time" @@ -11261,10 +11412,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "South Africa Standard Time" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "South Africa Daylight Time" @@ -11273,10 +11426,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Cen. Australia Standard Time" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Cen. Australia Daylight Time" @@ -11285,6 +11440,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11293,10 +11449,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Coordinated Universal Time-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lanka Standard Time" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lanka Daylight Time" @@ -11305,10 +11463,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afghanistan Standard Time" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afghanistan Daylight Time" @@ -11317,10 +11477,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Yakutsk Standard Time" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Yakutsk Daylight Time" @@ -11329,10 +11491,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "SA Eastern Standard Time" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "SA Eastern Daylight Time" @@ -11341,10 +11505,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arab Standard Time" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arab Daylight Time" @@ -11353,10 +11519,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riyadh" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabian Standard Time" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabian Daylight Time" @@ -11365,10 +11533,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantins Standard Time" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantins Daylight Time" @@ -11377,10 +11547,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Russian Standard Time" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Russian Daylight Time" @@ -11389,10 +11561,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moscow, St. Petersburg" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "Aus Central W. Standard Time" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "Aus Central W. Daylight Time" @@ -11401,10 +11575,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romance Standard Time" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romance Daylight Time" @@ -11413,10 +11589,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Ekaterinburg Standard Time" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Ekaterinburg Daylight Time" @@ -11425,6 +11603,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Ekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Russia Time Zone 11" @@ -11433,10 +11612,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "West Bank Standard Time" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "West Bank Daylight Time" @@ -11445,10 +11626,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Syria Standard Time" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Syria Daylight Time" @@ -11457,10 +11640,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "AUS Central Standard Time" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "AUS Central Daylight Time" @@ -11469,10 +11654,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Greenwich Standard Time" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Greenwich Daylight Time" @@ -11481,10 +11668,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulaanbaatar Standard Time" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulaanbaatar Daylight Time" @@ -11493,10 +11682,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolk Standard Time" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolk Daylight Time" @@ -11505,10 +11696,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolk Island" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Israel Standard Time" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Israel Daylight Time" @@ -11517,10 +11710,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladesh Standard Time" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladesh Daylight Time" @@ -11529,10 +11724,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "SA Pacific Standard Time" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "SA Pacific Daylight Time" @@ -11541,10 +11738,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "West Asia Standard Time" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "West Asia Daylight Time" @@ -11553,10 +11752,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ashgabat, Tashkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaskan Standard Time" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaskan Daylight Time" @@ -11565,10 +11766,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguay Standard Time" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguay Daylight Time" @@ -11577,10 +11780,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Dateline Standard Time" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Dateline Daylight Time" @@ -11589,10 +11794,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) International Date Line West" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libya Standard Time" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libya Daylight Time" @@ -11601,10 +11808,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahia Standard Time" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahia Daylight Time" @@ -11613,10 +11822,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuela Standard Time" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuela Daylight Time" @@ -11625,10 +11836,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainville Standard Time" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainville Daylight Time" @@ -11637,10 +11850,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bougainville Island" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hawaiian Standard Time" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hawaiian Daylight Time" @@ -11649,10 +11864,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "SE Asia Standard Time" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "SE Asia Daylight Time" @@ -11661,10 +11878,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Qyzylorda Standard Time" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Qyzylorda Daylight Time" @@ -11673,10 +11892,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Qyzylorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "W. Mongolia Standard Time" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "W. Mongolia Daylight Time" @@ -11685,10 +11906,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "New Zealand Standard Time" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "New Zealand Daylight Time" @@ -11697,10 +11920,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleutian Standard Time" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleutian Daylight Time" @@ -11709,10 +11934,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleutian Islands" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omsk Standard Time" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omsk Daylight Time" @@ -11721,10 +11948,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Central Brazilian Standard Time" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Central Brazilian Daylight Time" @@ -11733,10 +11962,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Belarus Standard Time" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Belarus Daylight Time" @@ -11745,10 +11976,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "SA Western Standard Time" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "SA Western Daylight Time" @@ -11757,10 +11990,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Greenland Standard Time" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Greenland Daylight Time" @@ -11769,10 +12004,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Greenland" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Easter Island Standard Time" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Easter Island Daylight Time" @@ -11781,6 +12018,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Easter Island" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Russia Time Zone 10" @@ -11789,10 +12027,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Chokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Egypt Standard Time" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Egypt Daylight Time" @@ -11801,10 +12041,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Cairo" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Eastern Standard Time (Mexico)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Eastern Daylight Time (Mexico)" @@ -11813,10 +12055,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritius Standard Time" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritius Daylight Time" @@ -11825,10 +12069,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Vladivostok Standard Time" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Vladivostok Daylight Time" @@ -11837,10 +12083,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapore Standard Time" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapore Daylight Time" @@ -11849,10 +12097,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Korea Standard Time" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Korea Daylight Time" @@ -11861,10 +12111,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seoul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chatham Islands Standard Time" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chatham Islands Daylight Time" @@ -11873,10 +12125,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Chatham Islands" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "E. Africa Standard Time" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "E. Africa Daylight Time" @@ -11885,10 +12139,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE Standard Time" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE Daylight Time" @@ -11897,10 +12153,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "E. South America Standard Time" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "E. South America Daylight Time" @@ -11909,10 +12167,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Central Pacific Standard Time" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Central Pacific Daylight Time" @@ -11921,10 +12181,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Solomon Is., New Caledonia" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "W. Central Africa Standard Time" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "W. Central Africa Daylight Time" @@ -11933,10 +12195,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West Central Africa" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "Pacific SA Standard Time" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Pacific SA Daylight Time" @@ -11945,10 +12209,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "E. Australia Standard Time" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "E. Australia Daylight Time" @@ -11957,10 +12223,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "W. Australia Standard Time" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "W. Australia Daylight Time" diff --git a/po/es.po b/po/es.po index c3d273de392..0fbdeab2c05 100644 --- a/po/es.po +++ b/po/es.po @@ -10623,10 +10623,12 @@ msgid "Select Source" msgstr "Seleccionar Fuente" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Horario Estándar en China" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Horario de Verano en China" @@ -10635,10 +10637,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Pekín, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Horario Estándar en Asia Norte" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Horario de Verano en Asia Norte" @@ -10647,10 +10651,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoyarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Horario Estándar en Georgia" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Horario de Verano en Georgia" @@ -10659,6 +10665,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tiflis" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10667,10 +10674,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Tiempo Universal Coordinado+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Horario Estándar en Nepal" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Horario de Verano en Nepal" @@ -10679,10 +10688,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Katmandú" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Horario Estándar en Cabo Verde" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Horario de Verano en Cabo Verde" @@ -10691,10 +10702,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Cabo Verde" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Horario Estándar en Haití" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Horario de Verano en Haití" @@ -10703,6 +10716,7 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Horario Estándar Europa Central" @@ -10715,10 +10729,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopie, Varsovia, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Horario Estándar en Marruecos" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Horario de Verano en Marruecos" @@ -10727,6 +10743,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10751,6 +10768,7 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaúl, Gorno-Altaysk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Horario Estándar Europa Central" @@ -10763,10 +10781,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrado, Bratislava, Budapest, Liubliana, Praga" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Horario Estándar en Irán" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Horario de Verano en Irán" @@ -10803,10 +10823,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Santo Tomé" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Horario Estándar en Namibia" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Horario de Verano en Namibia" @@ -10815,10 +10837,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Horario Estándar en Tonga" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Horario de Verano en Tonga" @@ -10839,10 +10863,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Horario Estándar GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Horario de Verano GMT" @@ -10869,10 +10895,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Jerusalén" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Horario Estándar Asia Central" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Horario de Verano Asia Central" @@ -10881,10 +10909,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astaná" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Horario Estándar en Lord Howe" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Horario de Verano en Lord Howe" @@ -10893,10 +10923,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Isla de Lord Howe" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Horario Estándar Árabe" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Horario de Verano Árabe" @@ -10905,6 +10937,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10913,10 +10946,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Tiempo Universal Coordinado+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Horario Estándar en Magadán" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Horario de Verano en Magadán" @@ -10925,10 +10960,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadán" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Horario Estándar en Terranova" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Horario de Verano en Terranova" @@ -10965,10 +11002,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Puerto Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Horario Estándar del Pacifico" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Horario de Verano del Pacifico" @@ -10977,10 +11016,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Hora del Pacífico (US & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Horario Estándar en Azerbaiyán" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Horario de Verano en Azerbaiyán" @@ -10989,10 +11030,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Bakú" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Horario Estándar en Magallanes" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Horario de Verano en Magallanes" @@ -11001,10 +11044,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Horario Estándar en Samoa" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Horario de Verano en Samoa" @@ -11049,10 +11094,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Horario Estándar en Tokyo" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Horario de Verano en Tokyo" @@ -11073,10 +11120,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Horario Estándar en Cuba" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Horario de Verano en Cuba" @@ -11085,10 +11134,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) La Habana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Horario Estándar en Jordania" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Horario de Verano en Jordania" @@ -11097,10 +11148,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amán" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Horario Estándar Central" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Horario de Verano Central" @@ -11109,6 +11162,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Hora Central (US & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Huso horario 3 en Rusia" @@ -11133,10 +11187,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgogrado" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Horario Estándar en Azores" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Horario de Verano en Azores" @@ -11157,6 +11213,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -11165,10 +11222,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Tiempo Universal Coordinado-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Horario Estándar en Argentina" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Horario de Verano en Argentina" @@ -11193,10 +11252,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Islas Turcas y Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Horario Estándar Marquesas" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Horario de Verano Marquesas" @@ -11205,10 +11266,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Islas Marquesas" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Horario Estándar en Birmania" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Horario de Verano en Birmania" @@ -11217,6 +11280,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Tiempo Universal Coordinado" @@ -11225,10 +11289,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC)Tiempo Universal Coordinado" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Horario Estándar en India" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Horario de Verano en India" @@ -11237,10 +11303,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Calcuta, Bombay, Nueva Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Horario Estándar GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Horario de Verano GTB" @@ -11249,10 +11317,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Atenas, Bucarest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Horario Estándar en Turquía" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Horario de Verano en Turquía" @@ -11277,10 +11347,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrakhan, Uliánovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Horario Estándar en Fiyi" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Horario de Verano en Fiyi" @@ -11289,10 +11361,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiyi" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Horario Estándar en Canadá" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Horario de Verano en Canadá" @@ -11317,10 +11391,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukón" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Horario Estándar en Taipéi" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Horario de Verano en Taipéi" @@ -11341,10 +11417,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Ámsterdam, Berlín, Berna, Roma, Estocolmo, Viena" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Horario Estándar en Montevideo" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Horario de Verano en Montevideo" @@ -11353,10 +11431,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Horario Estándar en Pakistán" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Horario de Verano en Pakistán" @@ -11381,10 +11461,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Horario Estándar en Cáucaso" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Horario de Verano en Cáucaso" @@ -11417,10 +11499,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Horario del este" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Horario de verano del este" @@ -11553,10 +11637,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pionyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Horario Estándar en Tasmania" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Horario de Verano en Tasmania" @@ -11577,6 +11663,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) América Central" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11597,10 +11684,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Horario Estándar en Sudáfrica" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Horario de Verano en Sudáfrica" @@ -11621,6 +11710,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaida" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11629,10 +11719,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Tiempo Universal Coordinado-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Horario Estándar en Sri Lanka" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Horario de Verano en Sri Lanka" @@ -11641,6 +11733,7 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenapura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Horario Estándar en Afgnanistán" @@ -11653,10 +11746,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Horario Estándar en Yakutsk" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Horario de Verano en Yakutsk" @@ -11701,10 +11796,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Mascate" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Horario Estándar en Tocantins" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Horario de Verano en Tocantins" @@ -11713,10 +11810,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Horario Estándar en Rusia" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Horario de Verano en Rusia" @@ -11761,6 +11860,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Ekaterimburgo" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Huso horario 11 en Rusia" @@ -11785,10 +11885,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebrón" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Horario Estándar en Siria" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Horario de Verano en Siria" @@ -11809,10 +11911,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Horario Estándar en Greenwich" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Horario de Verano en Greenwich" @@ -11821,10 +11925,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reikiavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Horario Estándar en Ulán Bator" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Horario de Verano en Ulán Bator" @@ -11849,10 +11955,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Isla Norfolk" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Horario Estándar en Israel" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Horario de Verano en Israel" @@ -11861,10 +11969,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalén" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Horario Estándar en Bangladés" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Horario de Verano en Bangladés" @@ -11897,10 +12007,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Asjabad, Taskent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Horario Estándar en Alaska" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Horario de Verano en Alaska" @@ -11909,10 +12021,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Horario Estándar en Paraguay" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Horario de Verano en Paraguay" @@ -11921,6 +12035,7 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Horario Estándar Linea del Dia" @@ -11933,10 +12048,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Línea internacional de cambio de fecha Oeste" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Horario Estándar en Libia" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Horario de Verano en Libia" @@ -11945,10 +12062,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Horario Estándar en Bahia" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Horario de Verano en Bahia" @@ -11957,10 +12076,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Horario Estándar en Venezuela" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Horario de Verano en Venezuela" @@ -11981,10 +12102,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Isla Bougainville" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Horario Estándar en Hawái" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Horario de Verano en Hawái" @@ -12089,6 +12212,7 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Horario Estándar en Bielorrusia" @@ -12113,6 +12237,7 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Horario Estándar en Groenlandia" @@ -12137,6 +12262,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Isla de Pascua" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Huso horario 10 en Rusia" @@ -12145,10 +12271,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Chokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Horario Estándar en Egipto" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Horario de Verano en Egipto" @@ -12169,10 +12297,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Horario Estándar en Mauricio" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Horario de Verano en Mauricio" @@ -12181,6 +12311,7 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Horario Estándar en Vladivostok" @@ -12193,10 +12324,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Horario Estándar en Singapur" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Horario de Verano en Singapur" @@ -12205,10 +12338,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Horario Estándar en Corea" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Horario de Verano en Corea" @@ -12217,6 +12352,7 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seúl" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Horario Estándar Islas Chatham" @@ -12241,6 +12377,7 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Horario Estándar en FLE" diff --git a/po/fi.po b/po/fi.po index 7282fed5768..695d6f5cf77 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10331,10 +10331,12 @@ msgid "Select Source" msgstr "Valitse lähde" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Kiinan normaaliaika" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Kiinan kesäaika" @@ -10343,10 +10345,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Peking, Chongqing, Hongkong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Pohjois-Aasian normaaliaika" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Pohjois-Aasian kesäaika" @@ -10355,10 +10359,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnojarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Georgian normaaliaika" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Georgian kesäaika" @@ -10367,6 +10373,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10375,10 +10382,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Koordinoitu yleisaika +12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepalin normaaliaika" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepalin kesäaika" @@ -10387,10 +10396,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Katmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Kap Verden normaaliaika" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Kap Verden kesäaika" @@ -10399,10 +10410,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Kap Verde" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haitin normaaliaika" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haitin kesäaika" @@ -10411,10 +10424,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Keski-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Keski-Euroopan kesäaika" @@ -10423,10 +10438,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Varsova, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Marokon normaaliaika" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Marokon kesäaika" @@ -10435,6 +10452,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10443,10 +10461,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Koordinoitu yleisaika -08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altain normaaliaika" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altain kesäaika" @@ -10455,10 +10475,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaisk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Keski-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Keski-Euroopan kesäaika" @@ -10467,10 +10489,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praha" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Iranin normaaliaika" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Iranin kesäaika" @@ -10479,10 +10503,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint-Pierren normaaliaika" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierren kesäaika" @@ -10491,10 +10517,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint-Pierre ja Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Sao Tomen normaaliaika" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Sao Tomen kesäaika" @@ -10503,10 +10531,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibian normaaliaika" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibian kesäaika" @@ -10515,10 +10545,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tongan normaaliaika" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tongan kesäaika" @@ -10539,10 +10571,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlan" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT-normaaliaika" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT-kesäaika" @@ -10551,10 +10585,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Lontoo" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Etelä-Sudanin normaaliaika" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Etelä-Sudanin kesäaika" @@ -10563,10 +10599,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Keski-Aasian normaaliaika" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Keski-Aasian kesäaika" @@ -10575,10 +10613,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord Howen normaaliaika" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord Howen kesäaika" @@ -10587,10 +10627,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howen saari" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabian normaaliaika" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabian kesäaika" @@ -10599,6 +10641,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10607,10 +10650,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Koordinoitu yleisaika +13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadanin normaaliaika" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadanin kesäaika" @@ -10619,10 +10664,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Newfoundlandin normaaliaika" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Newfoundlandin kesäaika" @@ -10631,10 +10678,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Sudanin normaaliaika" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Sudanin kesäaika" @@ -10643,10 +10692,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartum" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "Länsi-Tyynenmeren normaaliaika" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "Länsi-Tyynenmeren kesäaika" @@ -10655,10 +10706,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Tyynenmeren normaaliaika" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Tyynenmeren kesäaika" @@ -10667,10 +10720,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Tyynenmeren aika (USA ja Kanada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbaidžanin normaaliaika" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbaidžanin kesäaika" @@ -10679,10 +10734,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magallanesin normaaliaika" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magallanesin kesäaika" @@ -10691,10 +10748,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoan normaaliaika" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoan kesäaika" @@ -10703,10 +10762,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningradin normaaliaika" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningradin kesäaika" @@ -10719,6 +10780,7 @@ msgid "Pacific Standard Time (Mexico)" msgstr "Tyynenmeren normaaliaika (Meksiko)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Tyynenmeren kesäaika (Meksiko)" @@ -10727,10 +10789,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Lähi-idän normaaliaika" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Lähi-idän kesäaika" @@ -10739,10 +10803,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokion normaaliaika" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokion kesäaika" @@ -10751,10 +10817,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokio" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Linesaarten normaaliaika" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Linesaarten kesäaika" @@ -10763,10 +10831,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Kuuban normaaliaika" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Kuuban kesäaika" @@ -10775,10 +10845,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havanna" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordanian normaaliaika" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordanian kesäaika" @@ -10787,10 +10859,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Keskinen normaaliaika" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Keskinen kesäaika" @@ -10799,6 +10873,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Yhdysvaltain keskinen aika" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Venäjän aikavyöhyke 3" @@ -10807,10 +10882,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Iževsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Volgogradin normaaliaika" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Volgogradin kesäaika" @@ -10819,10 +10896,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azorien normaaliaika" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azorien kesäaika" @@ -10835,6 +10914,7 @@ msgid "North Asia East Standard Time" msgstr "Itäisen Pohjois-Aasian normaaliaika" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Itäisen Pohjois-Aasian kesäaika" @@ -10843,6 +10923,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10851,10 +10932,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Koordinoitu yleisaika -11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentiinan normaaliaika" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentiinan kesäaika" @@ -10875,10 +10958,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks- ja Caicossaaret" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Marquesassaarten normaaliaika" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Marquesassaarten kesäaika" @@ -10887,10 +10972,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Marquesassaaret" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmarin normaaliaika" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmarin kesäaika" @@ -10899,6 +10986,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Koordinoitu yleisaika" @@ -10907,10 +10995,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Koordinoitu yleisaika" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Intian normaaliaika" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Intian kesäaika" @@ -10919,10 +11009,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kalkutta, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GT-normaaliaika" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GT-kesäaika" @@ -10931,10 +11023,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Ateena, Bukarest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Turkin normaaliaika" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Turkin kesäaika" @@ -10943,10 +11037,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrahanin normaaliaika" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrahanin kesäaika" @@ -10955,10 +11051,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrahan, Uljanovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fidžin normaaliaika" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fidžin kesäaika" @@ -10967,10 +11065,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fidži" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Kanadan keskinen normaaliaika" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Kanadan keskinen kesäaika" @@ -10979,10 +11079,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Yukonin normaaliaika" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Yukonin kesäaika" @@ -10991,10 +11093,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipein normaaliaika" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipein kesäaika" @@ -11003,10 +11107,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "Länsi-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Länsi-Euroopan kesäaika" @@ -11015,10 +11121,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berliini, Bern, Rooma, Tukholma, Wien" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideon normaaliaika" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideon kesäaika" @@ -11027,10 +11135,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistanin normaaliaika" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistanin kesäaika" @@ -11039,10 +11149,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomskin normaaliaika" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomskin kesäaika" @@ -11051,10 +11163,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Kaukasuksen normaaliaika" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Kaukasuksen kesäaika" @@ -11063,10 +11177,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "Australian itäinen normaaliaika" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Australian itäinen kesäaika" @@ -11079,6 +11195,7 @@ msgid "N. Central Asia Standard Time" msgstr "Pohjoisen Keski-Aasian normaaliaika" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "Pohjoisen Keski-Aasian kesäaika" @@ -11087,10 +11204,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Itäinen normaaliaika" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Itäinen kesäaika" @@ -11099,10 +11218,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Yhdysvaltain itäinen aika" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Taka-Baikalian normaaliaika" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Taka-Baikalian kesäaika" @@ -11111,10 +11232,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Tšita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Itä-Euroopan normaaliaika" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Itä-Euroopan kesäaika" @@ -11123,10 +11246,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chişinău" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Keskinen normaaliaika (Meksiko)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Keskinen kesäaika (Meksiko)" @@ -11135,10 +11260,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexico City, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratovin normaaliaika" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratovin kesäaika" @@ -11147,10 +11274,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlantin normaaliaika" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlantin kesäaika" @@ -11159,10 +11288,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlantin aika (Kanada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Kalliovuorten normaaliaika" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Kalliovuorten kesäaika" @@ -11171,10 +11302,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Kalliovuorten normaaliaika (USA ja Kanada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "Itäinen normaaliaika (USA)" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "Itäinen kesäaika (USA)" @@ -11183,10 +11316,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (itä)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sahalinin normaaliaika" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sahalinin kesäaika" @@ -11195,10 +11330,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sahalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Pohjois-Korean normaaliaika" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Pohjois-Korean kesäaika" @@ -11207,10 +11344,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pjongjang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmanian normaaliaika" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmanian kesäaika" @@ -11219,10 +11358,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Keski-Amerikan normaaliaika" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Keski-Amerikan kesäaika" @@ -11231,6 +11372,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Keski-Amerikka" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11243,6 +11385,7 @@ msgid "US Mountain Standard Time" msgstr "Kalliovuorten normaaliaika (USA)" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "Kalliovuorten kesäaika (USA)" @@ -11251,10 +11394,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Etelä-Afrikan normaaliaika" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Etelä-Afrikan kesäaika" @@ -11263,10 +11408,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Keski-Australian normaaliaika" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Keski-Australian kesäaika" @@ -11275,6 +11422,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11283,10 +11431,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Koordinoitu yleisaika -09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lankan normaaliaika" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lankan kesäaika" @@ -11295,10 +11445,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Kotte (Sri Jayawardenepura)" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afganistanin normaaliaika" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afganistanin kesäaika" @@ -11307,10 +11459,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Jakutskin normaaliaika" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Jakutskin kesäaika" @@ -11323,6 +11477,7 @@ msgid "SA Eastern Standard Time" msgstr "Etelä-Amerikan itäinen normaaliaika" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "Etelä-Amerikan itäinen kesäaika" @@ -11331,10 +11486,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Saudi-Arabian normaaliaika" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Saudi-Arabian kesäaika" @@ -11343,10 +11500,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabian normaaliaika" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabian kesäaika" @@ -11355,10 +11514,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Masqat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantinsin normaaliaika" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantinsin kesäaika" @@ -11367,10 +11528,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Venäjän normaaliaika" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Venäjän kesäaika" @@ -11383,6 +11546,7 @@ msgid "Aus Central W. Standard Time" msgstr "Australian keskilännen normaaliaika" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "Australian keskilännen kesäaika" @@ -11391,10 +11555,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romaaninen normaaliaika" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romaaninen kesäaika" @@ -11403,10 +11569,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brysseli, Kööpenhamina, Madrid, Pariisi" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Jekaterinburgin normaaliaika" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Jekaterinburgin kesäaika" @@ -11415,6 +11583,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Jekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Venäjän aikavyöhyke 11" @@ -11423,10 +11592,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtšatski" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "Länsirannikon normaaliaika" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Länsirannikon kesäaika" @@ -11435,10 +11606,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Syyrian normaaliaika" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Syyrian kesäaika" @@ -11451,6 +11624,7 @@ msgid "AUS Central Standard Time" msgstr "Australian keskinen normaaliaika" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Australian keskinen kesäaika" @@ -11459,10 +11633,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Greenwichin normaaliaika" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Greenwichin kesäaika" @@ -11471,10 +11647,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulaanbaatarin normaaliaika" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulaanbaatarin kesäaika" @@ -11483,10 +11661,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolkinsaaren normaaliaika" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolkinsaaren kesäaika" @@ -11495,10 +11675,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolkinsaari" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Israelin normaaliaika" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Israelin kesäaika" @@ -11507,10 +11689,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladeshin normaaliaika" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladeshin kesäaika" @@ -11531,10 +11715,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Länsi-Aasian normaaliaika" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Länsi-Aasian kesäaika" @@ -11543,10 +11729,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ašgabat, Taškent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaskan normaaliaika" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaskan kesäaika" @@ -11555,10 +11743,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguayn normaaliaika" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguayn kesäaika" @@ -11567,10 +11757,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Päivämäärärajan normaaliaika" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Päivämäärärajan kesäaika" @@ -11579,10 +11771,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Läntinen kansainvälinen päivämääräraja" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libyan normaaliaika" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libyan kesäaika" @@ -11591,10 +11785,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahian normaaliaika" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahian kesäaika" @@ -11603,10 +11799,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuelan normaaliaika" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuelan kesäaika" @@ -11615,10 +11813,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainvillen normaaliaika" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainvillen kesäaika" @@ -11627,10 +11827,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bougainville" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Havaijin normaaliaika" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Havaijin kesäaika" @@ -11639,10 +11841,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Havaiji" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "Kaakkois-Aasian normaaliaika" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "Kaakkois-Aasian kesäaika" @@ -11651,10 +11855,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Qızılordan normaaliaika" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Qızılordan kesäaika" @@ -11663,10 +11869,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Qızılorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "Länsi-Mongolian normaaliaika" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Länsi-Mongolian kesäaika" @@ -11675,10 +11883,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Uuden-Seelannin normaaliaika" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Uuden-Seelannin kesäaika" @@ -11687,10 +11897,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleuttien normaaliaika" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleuttien kesäaika" @@ -11699,10 +11911,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleutit" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omskin normaaliaika" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omskin kesäaika" @@ -11711,10 +11925,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Keski-Brasilian normaaliaika" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Keski-Brasilian kesäaika" @@ -11723,10 +11939,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Valko-Venäjän normaaliaika" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Valko-Venäjän kesäaika" @@ -11747,10 +11965,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Grönlannin normaaliaika" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Grönlannin kesäaika" @@ -11759,10 +11979,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Grönlanti" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Pääsiäissaarten normaaliaika" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Pääsiäissaarten kesäaika" @@ -11771,6 +11993,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Pääsiäissaari" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Venäjän aikavyöhyke 10" @@ -11779,10 +12002,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Tšokurdah" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Egyptin normaaliaika" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Egyptin kesäaika" @@ -11791,10 +12016,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Kairo" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Itäinen normaaliaika (Meksiko)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Itäinen kesäaika (Meksiko)" @@ -11803,10 +12030,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritiuksen normaaliaika" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritiuksen kesäaika" @@ -11815,10 +12044,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Vladivostokin normaaliaika" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Vladivostokin kesäaika" @@ -11827,10 +12058,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singaporen normaaliaika" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singaporen kesäaika" @@ -11839,10 +12072,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Korean normaaliaika" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Korean kesäaika" @@ -11851,10 +12086,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Soul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chathamsaarten normaaliaika" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chathamsaarten kesäaika" @@ -11863,10 +12100,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Chathamsaaret" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Itä-Afrikan normaaliaika" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Itä-Afrikan kesäaika" @@ -11875,10 +12114,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Suomen normaaliaika" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Suomen kesäaika" @@ -11891,6 +12132,7 @@ msgid "E. South America Standard Time" msgstr "Itäisen Etelä-Amerikan normaaliaika" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "Itäisen Etelä-Amerikan kesäaika" @@ -11899,10 +12141,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Keski-Tyynenmeren normaaliaika" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Keski-Tyynenmeren kesäaika" @@ -11915,6 +12159,7 @@ msgid "W. Central Africa Standard Time" msgstr "Läntisen Keski-Afrikan normaaliaika" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "Läntisen Keski-Afrikan kesäaika" @@ -11935,10 +12180,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "Itä-Australian normaaliaika" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "Itä-Australian kesäaika" @@ -11947,10 +12194,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "Länsi-Australian normaaliaika" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "Länsi-Australian kesäaika" diff --git a/po/fr.po b/po/fr.po index e9ab33dbd61..3f6931ed26a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10428,10 +10428,12 @@ msgid "Select Source" msgstr "Sélectionnez une source" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Heure de Chine" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Heure d'été de Chine" @@ -10464,6 +10466,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10496,10 +10499,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Heure d'Haïti" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Heure d'Haïti" @@ -10508,10 +10513,12 @@ msgid "(UTC-05:00) Haiti" msgstr "Heure d'été d'Haïti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Heure d'été Europe centrale" @@ -10540,10 +10547,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Heure d'Altaï" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Heure d'été d'Altaï" @@ -10552,10 +10561,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Heure d'été Europe centrale" @@ -10576,10 +10587,12 @@ msgid "(UTC+03:30) Tehran" msgstr "" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Heure de Saint-Pierre" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Heure d'été Saint Pierre" @@ -10588,10 +10601,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint Pierre et Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Heure de Sao Tomé" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Heure d'été de Sao Tomé" @@ -10636,10 +10651,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Heure GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Heure d'été GMT" @@ -10648,10 +10665,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Heure du Sud Soudan" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Heure d'été du Sud Soudan" @@ -10672,10 +10691,12 @@ msgid "(UTC+06:00) Astana" msgstr "" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Heure de Lord Lowe" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Heure d'été de Lord Howe" @@ -10728,10 +10749,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Heure du Soudan" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Heure d'été du Soudan" @@ -10864,10 +10887,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Heure de Cuba" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Heure d'été de Cuba" @@ -10908,10 +10933,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Heure de Volgograd" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Heure d'été de Volgograd" @@ -10976,10 +11003,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Heure des Îles Marquises" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Heure d'été des Îles Marquises" @@ -11020,10 +11049,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Heure GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Heure d'été GTB" @@ -11044,10 +11075,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Heure d'Astrakhan" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Heure d'été d'Astrakhan" @@ -11080,10 +11113,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Heure du Yucon" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Heure d'été du Yucon" @@ -11140,10 +11175,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Heure de Tomsk" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Heure d'été de Tomsk" @@ -11200,10 +11237,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Heure du Transbaïkal" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Heure d'été du Transbaïkal" @@ -11212,10 +11251,12 @@ msgid "(UTC+09:00) Chita" msgstr "" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Heure d'Europe de l'Est" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Heure d'été d'Europe de l'Est" @@ -11236,10 +11277,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Heure de Saratov" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Heure d'été de Saratov" @@ -11284,10 +11327,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Heure de Sakhaline" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Heure d'été de Sakhaline" @@ -11296,10 +11341,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Heure de Corée du Nord" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Heure d'été de Corée du Nord" @@ -11456,10 +11503,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Heure du Tocantins" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Heure d'été du Tocantins" @@ -11728,10 +11777,12 @@ msgid "(UTC-04:00) Caracas" msgstr "" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Heure de Bougainville" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Heure d'été de Bougainville" @@ -11764,10 +11815,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Heure du Kyzylorda" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Heure d'été du Kyzylorda" @@ -11776,10 +11829,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "Heure de l'Ouest Mongolie" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Heure d'été de l'Ouest Mongolie" @@ -11800,6 +11855,7 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Heure des Îles Aléoutiennes" @@ -11812,10 +11868,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Heure d'Omsk" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Heure d'été d'Omsk" @@ -11872,10 +11930,12 @@ msgid "(UTC-03:00) Greenland" msgstr "" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Heure de l'Île de Pâques" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Heure d'été de l'Île de Pâques" @@ -11996,10 +12056,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Heure FLE" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Heure d'été FLE" diff --git a/po/ja.po b/po/ja.po index 7da4b0de40a..a28e5795247 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10344,10 +10344,12 @@ msgid "Select Source" msgstr "ソースの選択" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "中国標準時" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "中国夏時間" @@ -10356,10 +10358,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) 北京、重慶、香港、ウルムチ" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "北アジア標準時" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "北アジア夏時間" @@ -10368,10 +10372,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) クラスノヤルスク" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "ジョージア標準時" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "ジョージア夏時間" @@ -10380,6 +10386,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) トビリシ" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10388,10 +10395,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) 協定世界時+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "ネパール標準時" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "ネパール夏時間" @@ -10400,10 +10409,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) カトマンズ" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "カーボベルデ標準時" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "カーボベルデ夏時間" @@ -10412,10 +10423,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) ベルデ岬諸島" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "ハイチ標準時" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "ハイチ夏時間" @@ -10424,10 +10437,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) ハイチ" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "中央ヨーロピアン標準時" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "中央ヨーロピアン夏時間" @@ -10436,10 +10451,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) サラエボ、スコピエ、ワルシャワ、ザグレブ" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "モロッコ標準時" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "モロッコ夏時間" @@ -10448,6 +10465,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) カサブランカ" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10456,10 +10474,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) 協定世界時-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "アルタイ標準時" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "アルタイ夏時間" @@ -10468,10 +10488,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) バルナウル、ゴルノ・アルタイスク" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "中央ヨーロッパ標準時" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "中央ヨーロッパ夏時間" @@ -10481,10 +10503,12 @@ msgstr "" "(UTC+01:00) ベオグラード、ブラチスラバ、ブダペスト、リュブリャナ、プラハ" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "イラン標準時" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "イラン夏時間" @@ -10493,10 +10517,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) テヘラン" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "サンピエール標準時" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "サンピエール夏時間" @@ -10505,10 +10531,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) サンピエール・ミクロン" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "サントメ標準時" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "サントメ夏時間" @@ -10517,10 +10545,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) サントメ" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "ナミビア標準時" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "ナミビア夏時間" @@ -10529,10 +10559,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) ウィントフック" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "トンガ標準時" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "トンガ夏時間" @@ -10541,10 +10573,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) ヌクアロファ" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "山地標準時 (メキシコ)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "山地夏時間 (メキシコ)" @@ -10553,10 +10587,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) チワワ、ラパス、マサトラン" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT 標準時" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT 夏時間" @@ -10565,10 +10601,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) ダブリン、エディンバラ、リスボン、ロンドン" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "南スーダン標準時" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "南スーダン夏時間" @@ -10577,10 +10615,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) ジュバ" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "中央アジア標準時" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "中央アジア夏時間" @@ -10589,10 +10629,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) アスタナ" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "ロードハウ標準時" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "ロードハウ夏時間" @@ -10601,10 +10643,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) ロードハウ島" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "アラビック標準時" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "アラビック夏時間" @@ -10613,6 +10657,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) バグダッド" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10621,10 +10666,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) 協定世界時+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "マガダン標準時" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "マガダン夏時間" @@ -10633,10 +10680,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) マガダン" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "ニューファンドランド標準時" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "ニューファンドランド夏時間" @@ -10645,10 +10694,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) ニューファンドランド" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "スーダン標準時" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "スーダン夏時間" @@ -10657,10 +10708,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) ハルツーム" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "西太平洋標準時" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "西太平洋夏時間" @@ -10669,10 +10722,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) グアム、ポートモレスビー" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "太平洋標準時" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "太平洋夏時間" @@ -10681,10 +10736,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) 太平洋時間 (米国およびカナダ)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "アゼルバイジャン標準時" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "アゼルバイジャン夏時間" @@ -10693,10 +10750,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) バクー" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "マガヤネス標準時" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "マガヤネス夏時間" @@ -10705,10 +10764,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) プンタアレナス" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "サモア標準時" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "サモア夏時間" @@ -10717,10 +10778,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) サモア" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "カリーニングラード標準時" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "カリーニングラード夏時間" @@ -10729,10 +10792,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) カリーニングラード" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "太平洋標準時 (メキシコ)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "太平洋夏時間 (メキシコ)" @@ -10741,10 +10806,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) バハカリフォルニア" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "中東標準時" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "中東夏時間" @@ -10753,10 +10820,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) ベイルート" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "東京 (標準時)" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "東京 (夏時間)" @@ -10765,10 +10834,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) 大阪、札幌、東京" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "ライン諸島標準時" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "ライン諸島夏時間" @@ -10777,10 +10848,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) キリティマティ島" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "キューバ標準時" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "キューバ夏時間" @@ -10789,10 +10862,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) ハバナ" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "ヨルダン標準時" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "ヨルダン夏時間" @@ -10801,10 +10876,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) アンマン" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "中部標準時" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "中部夏時間" @@ -10813,6 +10890,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) 中部時間 (米国およびカナダ)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "ロシア第3標準時" @@ -10821,10 +10899,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) イジェフスク、サマーラ" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "ボルゴグラード標準時" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "ボルゴグラード夏時間" @@ -10833,10 +10913,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) ボルゴグラード" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "アゾレス標準時" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "アゾレス夏時間" @@ -10845,10 +10927,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) アゾレス" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "北アジア東部標準時" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "北アジア東部夏時間" @@ -10857,6 +10941,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) イルクーツク" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10865,10 +10950,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) 協定世界時-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "アルゼンチン標準時" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "アルゼンチン夏時間" @@ -10877,10 +10964,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) ブエノスアイレス" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "タークス・カイコス標準時" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "タークス・カイコス夏時間" @@ -10889,10 +10978,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) タークス・カイコス" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "マルキーズ標準時" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "マルキーズ夏時間" @@ -10901,10 +10992,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) マルキーズ諸島" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "ミャンマー標準時" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "ミャンマー夏時間" @@ -10913,6 +11006,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) ヤンゴン (ラングーン)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "協定世界時" @@ -10921,10 +11015,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) 協定世界時" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "インド標準時" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "インド夏時間" @@ -10933,10 +11029,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) チェンナイ、コルカタ、ムンバイ、ニューデリー" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB 標準時" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB 夏時間" @@ -10945,10 +11043,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) アテネ、ブカレスト" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "トルコ標準時" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "トルコ夏時間" @@ -10957,10 +11057,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) イスタンブール" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "アストラハニ標準時" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "アストラハニ夏時間" @@ -10969,10 +11071,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) アストラハニ、ウリヤノフスク" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "フィジー標準時" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "フィジー夏時間" @@ -10981,10 +11085,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) フィジー" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "カナダ中部標準時" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "カナダ中部夏時間" @@ -10993,10 +11099,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) サスカチュワン" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "ユーコン標準時" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "ユーコン夏時間" @@ -11005,10 +11113,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) ユーコン" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "台北 (標準時)" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "台北 (夏時間)" @@ -11017,10 +11127,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "西ヨーロッパ標準時" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "西ヨーロッパ夏時間" @@ -11031,10 +11143,12 @@ msgstr "" "ン" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "モンテビデオ標準時" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "モンテビデオ夏時間" @@ -11043,10 +11157,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) モンテビデオ" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "パキスタン標準時" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "パキスタン夏時間" @@ -11055,10 +11171,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) イスラマバード、カラチ" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "トムスク標準時" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "トムスク夏時間" @@ -11067,10 +11185,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) トムスク" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "カフカス標準時" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "カフカス夏時間" @@ -11079,10 +11199,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) エレバン" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "オーストラリア東部標準時" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "オーストラリア東部夏時間" @@ -11091,10 +11213,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) キャンベラ、メルボルン、シドニー" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "北中央アジア標準時" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "北中央アジア夏時間" @@ -11103,10 +11227,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) ノボシビルスク" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "東部標準時" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "東部夏時間" @@ -11115,10 +11241,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) 東部時間 (米国およびカナダ)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "ザバイカル標準時" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "ザバイカル夏時間" @@ -11127,10 +11255,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) チタ" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "東ヨーロッパ標準時" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "東ヨーロッパ夏時間" @@ -11139,10 +11269,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) キシナウ" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "中部標準時 (メキシコ)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "中部夏時間 (メキシコ)" @@ -11151,10 +11283,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) グアダラハラ、メキシコシティ、モンテレー" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "サラトフ標準時" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "サラトフ夏時間" @@ -11163,10 +11297,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) サラトフ" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "大西洋標準時" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "大西洋夏時間" @@ -11175,10 +11311,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) 大西洋時間 (カナダ)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "山地標準時" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "山地夏時間" @@ -11187,10 +11325,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) 山地時間 (米国およびカナダ)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "米国東部標準時" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "米国東部夏時間" @@ -11199,10 +11339,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) インディアナ (東部)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "サハリン標準時" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "サハリン夏時間" @@ -11211,10 +11353,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) サハリン" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "北朝鮮標準時" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "北朝鮮夏時間" @@ -11223,10 +11367,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) 平壌" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "タスマニア標準時" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "タスマニア夏時間" @@ -11235,10 +11381,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) ホバート" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "中央アメリカ標準時" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "中央アメリカ夏時間" @@ -11247,6 +11395,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) 中央アメリカ" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11255,10 +11404,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) 協定世界時-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "米国山地標準時" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "米国山地夏時間" @@ -11267,10 +11418,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) アリゾナ" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "南アフリカ標準時" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "南アフリカ夏時間" @@ -11279,10 +11432,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) ハラレ、プレトリア" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "中央オーストラリア標準時" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "中央オーストラリア夏時間" @@ -11291,6 +11446,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) アデレード" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11299,10 +11455,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) 協定世界時-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "スリランカ標準時" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "スリランカ夏時間" @@ -11311,10 +11469,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) スリジャヤワルダナプラ" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "アフガニスタン標準時" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "アフガニスタン夏時間" @@ -11323,10 +11483,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) カブール" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "ヤクーツク標準時" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "ヤクーツク夏時間" @@ -11335,10 +11497,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) ヤクーツク" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "南アメリカ東部標準時" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "南アメリカ東部標準時" @@ -11347,10 +11511,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) カエンヌ、フォルタレーザ" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "アラブ標準時" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "アラブ夏時間" @@ -11359,10 +11525,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) クウェート、リヤド" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "アラビアン標準時" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "アラビアン夏時間" @@ -11371,10 +11539,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) アブダビ、マスカット" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "トカンチンス標準時" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "トカンチンス夏時間" @@ -11383,10 +11553,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) アラグアイナ" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "ロシア標準時" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "ロシア夏時間" @@ -11395,10 +11567,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) モスクワ、サンクトペテルブルク" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "オーストラリア中西部標準時" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "オーストラリア中西部夏時間" @@ -11407,10 +11581,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) ユークラ" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "ロマンス標準時" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "ロマンス夏時間" @@ -11419,10 +11595,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) ブリュッセル、コペンハーゲン、マドリード、パリ" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "エカテリンブルク標準時" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "エカテリンブルク夏時間" @@ -11431,6 +11609,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) エカテリンブルク" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "ロシア第11標準時" @@ -11439,10 +11618,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) アナドゥイリ、ペトロパブロフスク・カムチャツキー" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "ヨルダン川西岸標準時" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "ヨルダン川西岸夏時間" @@ -11451,10 +11632,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) ガザ、ヘブロン" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "シリア標準時" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "シリア夏時間" @@ -11463,10 +11646,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) ダマスカス" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "オーストラリア中部標準時" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "オーストラリア中部夏時間" @@ -11475,10 +11660,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) ダーウィン" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "グリニッジ標準時" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "グリニッジ夏時間" @@ -11487,10 +11674,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) モンロビア、レイキャビク" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "ウランバートル標準時" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "ウランバートル夏時間" @@ -11499,10 +11688,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) ウランバートル" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "ノーフォーク標準時" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "ノーフォーク夏時間" @@ -11511,10 +11702,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) ノーフォーク島" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "イスラエル標準時" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "イスラエル夏時間" @@ -11523,10 +11716,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) エルサレム" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "バングラデシュ標準時" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "バングラデシュ夏時間" @@ -11535,10 +11730,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) ダッカ" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "南アメリカ太平洋標準時" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "南アメリカ太平洋夏時間" @@ -11547,10 +11744,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) ボゴタ、リマ、キト、リオブランコ" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "西アジア標準時" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "西アジア夏時間" @@ -11559,10 +11758,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) アシガバット、タシケント" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "アラスカ標準時" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "アラスカ夏時間" @@ -11571,10 +11772,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) アラスカ" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "パラグアイ標準時" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "パラグアイ夏時間" @@ -11583,10 +11786,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) アスンシオン" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "日付変更線 (標準時)" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "日付変更線 (夏時間)" @@ -11595,10 +11800,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) 国際日付変更線西側" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "リビア標準時" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "リビア夏時間" @@ -11607,10 +11814,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) トリポリ" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "バイア標準時" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "バイア夏時間" @@ -11619,10 +11828,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) サルバドル" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "ベネズエラ標準時" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "ベネズエラ夏時間" @@ -11631,10 +11842,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) カラカス" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "ブーゲンビル標準時" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "ブーゲンビル夏時間" @@ -11643,10 +11856,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) ブーゲンビル島" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "ハワイ標準時" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "ハワイ夏時間" @@ -11655,10 +11870,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) ハワイ" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "東南アジア標準時" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "東南アジア夏時間" @@ -11667,10 +11884,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) バンコク、ハノイ、ジャカルタ" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "クズルオルダ標準時" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "クズルオルダ夏時間" @@ -11679,10 +11898,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) クズルオルダ" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "西モンゴル標準時" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "西モンゴル夏時間" @@ -11691,10 +11912,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) ホブド" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "ニュージーランド標準時" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "ニュージーランド夏時間" @@ -11703,10 +11926,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) オークランド、ウェリントン" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "アリューシャン標準時" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "アリューシャン夏時間" @@ -11715,10 +11940,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) アリューシャン列島" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "オムスク標準時" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "オムスク夏時間" @@ -11727,10 +11954,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) オムスク" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "ブラジル中部標準時" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "ブラジル中部夏時間" @@ -11739,10 +11968,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) クイアバ" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "ベラルーシ標準時" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "ベラルーシ夏時間" @@ -11751,10 +11982,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) ミンスク" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "南アメリカ西部標準時" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "南アメリカ西部標準時" @@ -11763,10 +11996,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) ジョージタウン、ラパス、マナオス、サンフアン" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "グリーンランド標準時" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "グリーンラインド夏時間" @@ -11775,10 +12010,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) グリーンランド" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "イースター島標準時" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "イースター島夏時間" @@ -11787,6 +12024,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) イースター島" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "ロシア第10標準時" @@ -11795,10 +12033,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) チョクルダフ" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "エジプト標準時" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "エジプト夏時間" @@ -11807,10 +12047,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) カイロ" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "東部標準時 (メキシコ)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "東部夏時間 (メキシコ)" @@ -11819,10 +12061,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) チェトゥマル" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "モーリシャス標準時" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "モーリシャス夏時間" @@ -11831,10 +12075,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) ポートルイス" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "ウラジオストク標準時" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "ウラジオストク夏時間" @@ -11843,10 +12089,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) ウラジオストク" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "シンガポール標準時" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "シンガポール夏時間" @@ -11855,10 +12103,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) クアランプール、シンガポール" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "韓国 (標準時)" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "韓国 (夏時間)" @@ -11867,10 +12117,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) ソウル" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "チャタム諸島標準時" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "チャタム諸島夏時間" @@ -11879,10 +12131,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) チャタム諸島" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "アフリカ東部標準時" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "アフリカ東部夏時間" @@ -11891,10 +12145,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) ナイロビ" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE 標準時" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE 夏時間" @@ -11903,10 +12159,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) ヘルシンキ、キエフ、リガ、ソフィア、タリン、ビリニュス" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "南アメリカ東部標準時" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "南アメリカ東部夏時間" @@ -11915,10 +12173,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) ブラジリア" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "中央太平洋標準時" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "中央太平洋夏時間" @@ -11927,10 +12187,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) ソロモン諸島、ニューカレドニア" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "中央アフリカ西部標準時" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "中央アフリカ西部夏時間" @@ -11939,10 +12201,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) 中央アフリカ西部" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "南アメリカ太平洋標準時" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "南アメリカ太平洋夏時間" @@ -11951,10 +12215,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) サンティアゴ" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "オーストラリア東部標準時" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "オーストラリア東部夏時間" @@ -11963,10 +12229,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) ブリズベン" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "オーストラリア西部標準時" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "オーストラリア西部夏時間" diff --git a/po/ko.po b/po/ko.po index 1349d9ccbff..3c04256b495 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10327,10 +10327,12 @@ msgid "Select Source" msgstr "원본 선택" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "중국 표준시" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "중국 일광 절약시" @@ -10339,10 +10341,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) 베이징, 충칭, 홍콩 특별 행정구, 우루무치" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "북아시아 표준시" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "북아시아 일광 절약시" @@ -10351,10 +10355,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) 크라스노야르스크" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "그루지아 표준시" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "그루지아 일광 절약시" @@ -10363,6 +10369,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) 트빌리시" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10371,10 +10378,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) 협정 세계시+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "네팔 표준시" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "네팔 일광 절약시" @@ -10383,10 +10392,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) 카트만두" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "카보베르데 표준시" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "카보베르데 일광 절약시" @@ -10395,10 +10406,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) 카보베르데 제도" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "아이티 표준시" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "아이티 일광 절약시" @@ -10407,10 +10420,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) 아이티" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "중앙 유럽 표준시" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "중앙 유럽 일관 절약시" @@ -10419,10 +10434,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) 사라예보, 스코페, 바르샤바, 자그레브" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "모로코 표준시" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "모로코 일광 절약시" @@ -10431,6 +10448,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) 카사블랑카" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10439,10 +10457,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) 협정 세계시-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "알타이 표준시" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "알타이 일광 절약시" @@ -10451,10 +10471,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) 바르나울, 고르노알타이스크" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "중앙 유럽 표준시" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "중앙 유럽 일광 절약시" @@ -10463,10 +10485,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) 베오그라드, 브라티슬라바, 부다페스트, 류블랴나, 프라하" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "이란 표준시" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "이란 일광 절약시" @@ -10475,10 +10499,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) 테헤란" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "생피에르 표준시" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "생피에르 일광 절약시" @@ -10487,10 +10513,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) 세인트 피에르 미켈론" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "상투메 표준시" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "상투메 일광 절약시" @@ -10499,10 +10527,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) 상투메" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "나미비아 표준시" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "나미비아 일광 절약시" @@ -10511,10 +10541,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) 빈트후크" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "통가 표준시" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "통가 일괄 절약시" @@ -10523,10 +10555,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) 누쿠알로파" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "산지 표준시 (멕시코)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "산지 일광 절약시 (멕시코)" @@ -10535,10 +10569,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) 치와와, 라파스, 마사틀란" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT 표준시" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT 일광 절약시" @@ -10547,10 +10583,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 더블린, 에든버러, 리스본, 런던" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "남수단 표준시" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "남수단 일광 절약시" @@ -10559,10 +10597,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) 주바" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "중앙 아시아 표준시" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "중앙 아시아 일광 절약시" @@ -10571,10 +10611,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) 아스타나" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "로드하우 표준시" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "로드하우 일광 절약시" @@ -10583,10 +10625,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) 로드하우 섬" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "아랍 표준시" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "아랍 일광 절약시" @@ -10595,6 +10639,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) 바그다드" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10603,10 +10648,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) 협정 세계시+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "마가단 표준시" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "마가단 일광 절약시" @@ -10615,10 +10662,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) 마가단" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "뉴펀들랜드 표준시" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "뉴펀들랜드 일광 절약시" @@ -10627,10 +10676,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) 뉴펀들랜드" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "수단 표준시" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "수단 일광 절약시" @@ -10639,10 +10690,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) 하르툼" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "서태평양 표준시" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "서태평양 일광 절약시" @@ -10651,10 +10704,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) 괌, 포트모르즈비" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "태평양 표준시" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "태평양 일광 절약시" @@ -10663,10 +10718,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) 태평양 표준시(미국과 캐나다)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "아제르바이잔 표준시" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "아제르바이잔 일광 절약시" @@ -10675,10 +10732,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) 바쿠" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "마갈란스 표준시" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "마갈란스 일광 절약시" @@ -10687,10 +10746,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) 푼타 아레나스" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "사모아 표준시" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "사모아 일광 절약시" @@ -10699,10 +10760,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) 사모아" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "칼리닌그라드 표준시" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "칼리닌그라드 일광 절약시" @@ -10711,10 +10774,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) 칼리닌그라드" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "태평양 표준시 (멕시코)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "태평양 일광 절약시 (멕시코)" @@ -10723,10 +10788,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) 바하 캘리포니아" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "중동 표준시" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "중동 일광 절약시" @@ -10735,10 +10802,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) 베이루트" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "도쿄 표준시" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "도쿄 일광 절약시" @@ -10747,10 +10816,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) 오사카, 삿포로, 도쿄" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "라인 제도 표준시" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "라인 제도 일광 절약시" @@ -10759,10 +10830,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) 키리티마티 섬" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "쿠바 표준시" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "쿠바 일광 절약시" @@ -10771,10 +10844,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) 하바나" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "요르단 표준시" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "요르단 일광 절약시" @@ -10783,10 +10858,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) 암만" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "중부 표준시" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "중부 일광 절약시" @@ -10795,6 +10872,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) 중부 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "러시아 표준 시간대 3" @@ -10803,10 +10881,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) 이젭스크, 사마라" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "볼고그라드 표준시" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "볼고그라드 일광 절약시" @@ -10815,10 +10895,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) 볼고그라드" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "아조레스 표준시" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "아조레스 일광 절약시" @@ -10827,10 +10909,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) 아조레스" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "북아시아 동부 표준시" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "북아시아 동부 일광 절약시" @@ -10839,6 +10923,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) 이르쿠츠크" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10847,10 +10932,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) 협정 세계시-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "아르헨티나 표준시" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "아르헨티나 일광 절약시" @@ -10859,10 +10946,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) 부에노스아이레스" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "터크스 케이커스 표준시" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "터크스 케이커스 일광 절약시" @@ -10871,10 +10960,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) 터크스 케이커스" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "마키저스 표준시" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "마키저스 일광 절약시" @@ -10883,10 +10974,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) 마키저스 제도" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "미얀마 표준시" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "미얀마 일광 절약시" @@ -10895,6 +10988,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) 양곤 (랑군)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "협정 세계시" @@ -10903,10 +10997,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) 협정 세계시" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "인도 표준시" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "인도 일광 절약시" @@ -10915,10 +11011,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) 첸나이, 콜카타, 뭄바이, 뉴델리" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB 표준시" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB 일광 절약시" @@ -10927,10 +11025,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) 아테네, 부카레스트" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "터키 표준시" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "터키 일광 절약시" @@ -10939,10 +11039,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) 이스탄불" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "아스트라한 표준시" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "아스트라한 일광 절약시" @@ -10951,10 +11053,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) 아스트라한, 울랴노브스크" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "피지 표준시" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "피지 일광 절약시" @@ -10963,10 +11067,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) 피지" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "캐나다 중부 표준시" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "캐나다 중부 일광 절약시" @@ -10975,10 +11081,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) 서스캐처원" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "유콘 표준시" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "유콘 일광 절약시" @@ -10987,10 +11095,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) 유콘" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "타이페이 표준시" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "타이페이 일광 절약시" @@ -10999,10 +11109,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) 타이페이" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "서유럽 표준시" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "서유럽 일광 절약시" @@ -11011,10 +11123,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) 암스테르담, 베를린, 베른, 로마, 스톡홀름, 빈" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "몬테비데오 표준시" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "몬테비데오 일광 절약시" @@ -11023,10 +11137,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) 몬테비데오" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "파키스탄 표준시" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "파키스탄 일광 절약시" @@ -11035,10 +11151,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) 이슬라마바드, 카라치, 타슈켄트" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "톰스크 표준시" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "톰스크 일광 절약시" @@ -11047,10 +11165,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) 톰스크" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "코카서스 표준시" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "코카서스 일광 절약시" @@ -11059,10 +11179,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) 예레반" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "오스트레일리아 동부 표준시" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "오스트레일리아 동부 일광 절약시" @@ -11071,10 +11193,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) 캔버라, 멜버른, 시드니" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "중앙 아시아 북부 표준시" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "중앙 아시아 북부 일광 절약시" @@ -11083,10 +11207,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) 노보시비르스크" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "동부 표준시" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "동부 일광 절약시" @@ -11095,10 +11221,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) 동부 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "트란스바이칼 표준시" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "트란스바이칼 일광 절약시" @@ -11107,10 +11235,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) 치타" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "동유럽 표준시" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "동유럽 일광 절약시" @@ -11119,10 +11249,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) 키시네프" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "중부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "중부 일광 절약시 (멕시코)" @@ -11131,10 +11263,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) 과달라하라, 멕시코시티, 몬테레이" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "사라토브 표준시" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "사라토브 일광 절약시" @@ -11143,10 +11277,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) 사라토브" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "대서양 표준시" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "대서양 일광 절약시" @@ -11155,10 +11291,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) 대서양 표준시 (캐나다)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "산지 표준시" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "산지 일광 절약시" @@ -11167,10 +11305,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) 산지 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "미국 동부 표준시" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "미국 동부 일광 절약시" @@ -11179,10 +11319,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) 인디애나 (동부)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "사할린 표준시" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "사할린 일광 절약시" @@ -11191,10 +11333,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) 사할린" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "북한 표준시" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "북한 일광 절약시" @@ -11203,10 +11347,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) 평양" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "태즈매이니아 표준시" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "태즈매이니아 일광 절약시" @@ -11215,10 +11361,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) 호바트" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "중앙 아메리카 표준시" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "중앙 아메리카 일광 절약시" @@ -11227,6 +11375,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) 중앙아메리카" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11235,10 +11384,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) 협정 세계시-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "미국 산지 표준시" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "미국 산지 일광 절약시" @@ -11247,10 +11398,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) 아리조나" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "남아프리카 표준시" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "남아프리카 일광 절약시" @@ -11259,10 +11412,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) 하라레, 프리토리아" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "중부 오스트레일리아 표준시" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "중부 오스트레일리아 일광 절약시" @@ -11271,6 +11426,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) 애들레이드" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11279,10 +11435,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) 협정 세계시-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "스리랑카 표준시" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "스리랑카 일광 절약시" @@ -11291,10 +11449,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) 스리자야와르데네푸라" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "아프가니스탄 표준시" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "아프가니스탄 일광 절약시" @@ -11303,10 +11463,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) 카불" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "야쿠츠크 표준시" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "야쿠츠크 일광 절약시" @@ -11315,10 +11477,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) 야쿠츠크" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "SA 동부 표준시" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "SA 동부 일광 절약시" @@ -11327,10 +11491,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) 카옌, 포르탈레자" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "아랍 표준시" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "아랍 일광 절약시" @@ -11339,10 +11505,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) 쿠웨이트, 리야드" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "아라비아 표준시" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "아라비아 일광 절약시" @@ -11351,10 +11519,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) 아부다비, 무스카트" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "토칸칭스 표준시" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "토칸칭스 일광 절약시" @@ -11363,10 +11533,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) 아라구아이나" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "러시아 표준시" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "러시아 일광 절약시" @@ -11375,10 +11547,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) 모스크바, 상트페테르부르크" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "오스트레일리아 중부 일광 절약시" @@ -11387,10 +11561,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) 유클라" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "로망스 표준시" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "로망스 일광 절약시" @@ -11399,10 +11575,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) 브뤼셀, 코펜하겐, 마드리드, 파리" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "예카테린부르크 표준시" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "예카테린부르크 일광 절약시" @@ -11411,6 +11589,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) 예카테린부르크" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "러시아 표준 시간대 11" @@ -11419,10 +11598,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) 아나디리, 페트로파블로프스크-캄차스키" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "웨스트 뱅크 표준시" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "웨스트 뱅크 일광 절약시" @@ -11431,10 +11612,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) 가자, 헤브론" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "시리아 표준시" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "시리아 일광 절약시" @@ -11443,10 +11626,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) 다마스커스" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "오스트레일리아 중부 일광 절약시" @@ -11455,10 +11640,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) 다윈" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "그리니치 표준시" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "그리니치 일광 절약시" @@ -11467,10 +11654,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) 몬로비아, 레이캬비크" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "울란바토르 표준시" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "울란바토르 일광 절약시" @@ -11479,10 +11668,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) 울란바토르" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "노퍽 표준시" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "노퍽 일광 절약시" @@ -11491,10 +11682,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) 노퍽 섬" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "이스라엘 표준시" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "이스라엘 일광 절약시" @@ -11503,10 +11696,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) 예루살렘" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "발글라데시 표준시" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "방글라데시 일광 절약시" @@ -11515,10 +11710,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) 다카" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "SA 태평양 표준시" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "SA 태평양 일광 절약시" @@ -11527,10 +11724,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) 보고타, 리마, 키토, 리오 브랑코" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "서아시아 표준시" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "서아시아 일광 절약시" @@ -11539,10 +11738,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) 아슈하바트, 타슈켄트" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "알래스카 표준시" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "알래스카 일광 절약시" @@ -11551,10 +11752,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) 알래스카" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "파라과이 표준시" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "파라과이 일광 절약시" @@ -11563,10 +11766,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) 아순시온" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "날짜 변경선 표준시" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "날짜 변경선 일광 절약시" @@ -11575,10 +11780,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) 날짜 변경선 서쪽" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "리비아 표준시" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "리비아 일광 절약시" @@ -11587,10 +11794,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) 트리폴리" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "바이아 표준시" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "바이아 일광 절약시" @@ -11599,10 +11808,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) 살바도르" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "베네수엘라 표준시" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "베네수엘라 일광 절약시" @@ -11611,10 +11822,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) 카라카스" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "부건빌 표준시" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "부건빌 일광 절약시" @@ -11623,10 +11836,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) 부건빌 섬" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "하와이 표준시" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "하와이 일광 절약시" @@ -11635,10 +11850,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) 하와이" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "동남 아시아 표준시" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "동남 아시아 일광 절약시" @@ -11647,10 +11864,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) 방콕, 하노이, 자카르타" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "키질로르다 표준시" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "키질로르다 일광 절약시" @@ -11659,10 +11878,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) 키질로르다" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "서몽골 표준시" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "서몽골 일광 절약시" @@ -11671,10 +11892,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) 호브드" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "뉴질랜드 표준시" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "뉴질랜드 일광 절약시" @@ -11683,10 +11906,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) 오클랜드, 웰링턴" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "알류샨 표준시" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "알류샨 일광 절약시" @@ -11695,10 +11920,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) 알류샨 열도" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "옴스크 표준시" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "옴스크 일광 절약시" @@ -11707,10 +11934,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) 옴스크" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "브라질 중부 표준시" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "브라질 중부 일광 절약시" @@ -11719,10 +11948,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) 쿠이아바" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "벨로루시 표준시" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "벨로루시 표준시" @@ -11731,10 +11962,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) 민스크" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "SA 서부 표준시" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "SA 서부 일광 절약시" @@ -11743,10 +11976,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) 조지타운, 라파스, 마노스, 산후안" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "그린란드 표준시" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "그린란드 일광 절약시" @@ -11755,10 +11990,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) 그린란드" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "이스터 섬 표준시" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "이스터 섬 일광 절약시" @@ -11767,6 +12004,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) 이스터 섬" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "러시아 표준 시간대 10" @@ -11775,10 +12013,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) 초쿠르다흐" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "이집트 표준시" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "이집트 일광 절약시" @@ -11787,10 +12027,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) 카이로" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "동부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "동부 일광 절약시 (멕시코)" @@ -11799,10 +12041,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) 체투말" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "모리셔스 표준시" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "모리셔스 일광 절약시" @@ -11811,10 +12055,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) 포트루이스" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "블라디보스토크 표준시" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "블라디보스토크 일광 절약시" @@ -11823,10 +12069,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) 블라디보스토크" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "싱가포르 표준시" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "싱가포르 일광 절약시" @@ -11835,10 +12083,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) 콸라룸푸르, 싱가포르" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "대한민국 표준시" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "대한민국 일광 절약시" @@ -11847,10 +12097,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) 서울" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "채텀 섬 표준시" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "채텀 섬 일광 절약시" @@ -11859,10 +12111,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) 채텀 제도" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "동아프리카 표준시" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "동아프리카 일광 절약시" @@ -11871,10 +12125,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) 나이로비" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE 표준시" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE 일광 절약시" @@ -11883,10 +12139,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) 헬싱키, 키예프, 리가, 소피아, 탈린, 빌뉴스" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "남아메리카 동부 표준시" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "남아메리카 동부 일광 절약시" @@ -11895,10 +12153,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) 브라질리아" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "중앙 태평양 표준시" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "중앙 태평양 일광 절약시" @@ -11907,10 +12167,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) 마가단, 솔로몬 제도, 뉴칼레도니아" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "중앙아프리카 서부 표준시" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "중앙아프리카 서부 일광 절약시" @@ -11919,10 +12181,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) 서중앙 아프리카" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "태평양 SA 표준시" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "태평양 SA 일광 절약시" @@ -11931,10 +12195,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) 산티아고" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "오스트레일리아 동부 표준시" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "오스트레일리아 동부 일광 절약시" @@ -11943,10 +12209,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) 브리즈번" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "오스트레일리아 서부 표준시" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "오스트레일리아 서부 일광 절약시" diff --git a/po/lt.po b/po/lt.po index 996fed9b72d..3d4c6dd0231 100644 --- a/po/lt.po +++ b/po/lt.po @@ -10341,10 +10341,12 @@ msgid "Select Source" msgstr "Parinkite šaltinį" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Kinijos juostinis laikas" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Kinijos vasaros laikas" @@ -10353,10 +10355,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Pekinas, Čongčingas, Honkongas, Urumčis" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Šiaurės Azijos juostinis laikas" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Šiaurės Azijos vasaros laikas" @@ -10365,10 +10369,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnojarskas" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Gruzijos juostinis laikas" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Gruzijos vasaros laikas" @@ -10377,6 +10383,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisis" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10385,10 +10392,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Pasaulinis koordinuotasis laikas+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepalo juostinis laikas" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepalo vasaros laikas" @@ -10401,6 +10410,7 @@ msgid "Cape Verde Standard Time" msgstr "Žaliojo Kyšulio juostinis laikas" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Žaliojo Kyšulio vasaros laikas" @@ -10409,10 +10419,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Žaliojo Kyšulio s." #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haičio juostinis laikas" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haičio vasaros laikas" @@ -10425,6 +10437,7 @@ msgid "Central European Standard Time" msgstr "Vidurio Europos juostinis laikas" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Vidurio Europos vasaros laikas" @@ -10433,10 +10446,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevas, Skopjė, Varšuva, Zagrebas" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Maroko juostinis laikas" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Maroko vasaros laikas" @@ -10445,6 +10460,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Kasablanka" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10453,10 +10469,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Pasaulinis koordinuotasis laikas-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altajaus juostinis laikas" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altajaus vasaros laikas" @@ -10469,6 +10487,7 @@ msgid "Central Europe Standard Time" msgstr "Vidurio Europos juostinis laikas" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Vidurio Europos vasaros laikas" @@ -10477,10 +10496,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgradas, Bratislava, Budapeštas, Liubliana, Praha" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Irano juostinis laikas" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Irano vasaros laikas" @@ -10489,10 +10510,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheranas" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Sen Pjero juostinis laikas" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Sen Pjero vasaros laikas" @@ -10501,10 +10524,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Sen Pjeras ir Mikelonas" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "San Tomė juostinis laikas" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "San Tomė vasaros laikas" @@ -10513,10 +10538,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) San Tomė" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibijos juostinis laikas" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibijos vasaros laikas" @@ -10525,10 +10552,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Vindhukas" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tongos juostinis laikas" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tongos vasaros laikas" @@ -10541,6 +10570,7 @@ msgid "Mountain Standard Time (Mexico)" msgstr "Kalnų juostinis laikas (Meksika)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Kalnų vasaros laikas (Meksika)" @@ -10549,10 +10579,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Čihuahua, La Pasas, Masatlanas" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Grinvičo laikas" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Grinvičo vasaros laikas" @@ -10561,10 +10593,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublinas, Edinburgas, Lisabona, Londonas" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Pietų Sudano juostinis laikas" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Pietų Sudano vasaros laikas" @@ -10573,10 +10607,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Džuba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Vidurio Azijos juostinis laikas" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Vidurio Azijos vasaros laikas" @@ -10585,10 +10621,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lordo Hau juostinis laikas" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lordo Hau vasaros laikas" @@ -10597,10 +10635,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lordo Hau sala" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabų juostinis laikas" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabų vasaros laikas" @@ -10609,6 +10649,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdadas" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10617,10 +10658,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Pasaulinis koordinuotasis laikas+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadano juostinis laikas" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadano vasaros laikas" @@ -10629,10 +10672,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadanas" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Niufaundlando juostinis laikas" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Niufaundlando vasaros laikas" @@ -10641,10 +10686,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Niufaundlandas" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Sudano juostinis laikas" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Sudano vasaros laikas" @@ -10677,10 +10724,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Ramiojo vandenyno laikas (JAV ir Kanada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbaidžano juostinis laikas" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbaidžano vasaros laikas" @@ -10689,10 +10738,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magelano juostinis laikas" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magelano vasaros laikas" @@ -10701,10 +10752,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenasas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa juostinis laikas" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa vasaros laikas" @@ -10713,10 +10766,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Karaliaučiaus juostinis laikas" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Karaliaučiaus vasaros laikas" @@ -10737,10 +10792,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Žemutinė Kalifornija" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Vidurinių Rytų juostinis laikas" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Vidurinių Rytų vasaros laikas" @@ -10749,10 +10806,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirutas" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokijo juostinis laikas" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokijo vasaros laikas" @@ -10761,10 +10820,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Saporas, Tokijas" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Linijinių salų juostinis laikas" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Linijinių salų vasaros laikas" @@ -10773,10 +10834,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimatis" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Kubos juostinis laikas" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Kubos vasaros laikas" @@ -10785,10 +10848,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordanijos juostinis laikas" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordanijos vasaros laikas" @@ -10797,10 +10862,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amanas" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Centrinis juostinis laikas" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Centrinis vasaros laikas" @@ -10809,6 +10876,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-08:00) Centrinis laikas (JAV ir Kanada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Rusijos laiko juosta 3" @@ -10817,10 +10885,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Iževskas, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Volgogrado juostinis laikas" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Volgogrado vasaros laikas" @@ -10829,10 +10899,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgogradas" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azorų juostinis laikas" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azorų vasaros laikas" @@ -10853,6 +10925,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutskas" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10861,10 +10934,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Pasaulinis koordinuotasis laikas-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentinos juostinis laikas" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentinos vasaros laikas" @@ -10885,10 +10960,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Terksas ir Kaikosas" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Markizo juostinis laikas" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Markizo vasaros laikas" @@ -10897,10 +10974,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Markizo salos" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Mianmaro juostinis laikas" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Mianmaro vasaros laikas" @@ -10917,10 +10996,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Pasaulinis koordinuotasis laikas" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Indijos juostinis laikas" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Indijos vasaros laikas" @@ -10929,10 +11010,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Čenajus, Kolkata, Mumbajus, Naujasis Delis" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB juostinis laikas" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB vasaros laikas" @@ -10941,10 +11024,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Atėnai, Bukareštas" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Turkijos juostinis laikas" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Turkijos vasaros laikas" @@ -10953,10 +11038,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Stambulas" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrachanės juostinis laikas" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrachanės vasaros laikas" @@ -10965,10 +11052,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrachanė, Uljanovskas" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fidžio juostinis laikas" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fidžio vasaros laikas" @@ -10989,10 +11078,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskačevanas" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Jukono juostinis laikas" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Jukono vasaros laikas" @@ -11001,10 +11092,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Jukonas" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipėjaus juostinis laikas" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipėjaus vasaros laikas" @@ -11025,10 +11118,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdamas, Berlynas, Bernas, Roma, Stokholmas, Viena" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevidėjo juostinis laikas" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevidėjo vasaros laikas" @@ -11037,10 +11132,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevidėjas" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistano juostinis laikas" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistano vasaros laikas" @@ -11049,10 +11146,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabadas, Karačis" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomsko juostinis laikas" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomsko vasaros laikas" @@ -11061,10 +11160,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomskas" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Kaukazo juostinis laikas" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Kaukazo vasaros laikas" @@ -11073,10 +11174,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Jerevanas" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "AUS Rytinis juostinis laikas" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "AUS Rytinis vasaros laikas" @@ -11097,10 +11200,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirskas" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Rytinis juostinis laikas" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Rytinis vasaros laikas" @@ -11109,10 +11214,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Rytinis laikas (JAV ir Kanada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Užbaikalės juostinis laikas" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Užbaikalės vasaros laikas" @@ -11121,10 +11228,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Čita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "R. Europos juostinis laikas" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "R. Europos vasaros laikas" @@ -11145,10 +11254,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Gvadalachara, Meksikas, Monterėjus" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratovo juostinis laikas" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratovo vasaros laikas" @@ -11169,10 +11280,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlanto vandenyno laikas (Kanada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Kalnų juostinis laikas" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Kalnų vasaros laikas" @@ -11181,10 +11294,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Kalnų laikas (JAV ir Kanada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "JAV Rytinis juostinis laikas" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "JAV Rytinis vasaros laikas" @@ -11193,10 +11308,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (Rytų)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sachalino juostinis laikas" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sachalino vasaros laikas" @@ -11209,6 +11326,7 @@ msgid "North Korea Standard Time" msgstr "Šiaurės Korėjos juostinis laikas" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Šiaurės Korėjos vasaros laikas" @@ -11217,10 +11335,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pchenjanas" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmanijos juostinis laikas" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmanijos vasaros laikas" @@ -11241,6 +11361,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Centrinė Amerika" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11249,10 +11370,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Pasaulinis koordinuotasis laikas-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "JAV Kalnų juostinis laikas" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "JAV Kalnų vasaros laikas" @@ -11261,10 +11384,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Pietų Afrikos juostinis laikas" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Pietų Afrikos vasaros laikas" @@ -11277,6 +11402,7 @@ msgid "Cen. Australia Standard Time" msgstr "Vid. Australijos juostinis laikas" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Vid. Australijos vasaros laikas" @@ -11285,6 +11411,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaidė" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11293,10 +11420,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Pasaulinis koordinuotasis laikas-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Šri Lankos juostinis laikas" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Šri Lankos vasaros laikas" @@ -11305,10 +11434,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Šri Džajavardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afganistano juostinis laikas" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afganistano vasaros laikas" @@ -11317,10 +11448,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabulas" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Jakutsko juostinis laikas" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Jakutsko vasaros laikas" @@ -11329,10 +11462,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Jakutskas" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "PA Rytinis juostinis laikas" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "PA Rytinis vasaros laikas" @@ -11341,10 +11476,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Kajena, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arabų juostinis laikas" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arabų vasaros laikas" @@ -11353,10 +11490,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuveitas, Rijadas" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabų juostinis laikas" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabų vasaros laikas" @@ -11365,10 +11504,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dabis, Maskatas" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tokantinso juostinis laikas" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tokantinso vasaros laikas" @@ -11377,10 +11518,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Rusijos juostinis laikas" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Rusijos vasaros laikas" @@ -11393,6 +11536,7 @@ msgid "Aus Central W. Standard Time" msgstr "AUS Centrinis v. juostinis laikas" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "AUS Centrinis v. vasaros laikas" @@ -11401,10 +11545,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Jukla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romanų juostinis laikas" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romanų vasaros laikas" @@ -11413,10 +11559,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Briuselis, Kopenhaga, Madridas, Paryžius" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Jekaterinburgo juostinis laikas" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Jekaterinburgo vasaros laikas" @@ -11425,6 +11573,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Jekaterinburgas" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Rusijos laiko juosta 11" @@ -11433,10 +11582,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyris, Kamčiatkos Petropavlovskas" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "Vakarų Kranto juostinis laikas" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Vakarų Kranto vasaros laikas" @@ -11445,10 +11596,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebronas" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Sirijos juostinis laikas" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Sirijos vasaros laikas" @@ -11457,10 +11610,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damaskas" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "AUS Centrinis juostinis laikas" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "AUS Centrinis vasaros laikas" @@ -11469,10 +11624,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darvinas" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Grinvičo juostinis laikas" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Grinvičo vasaros laikas" @@ -11481,10 +11638,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovija, Reikjavikas" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulan Batoro juostinis laikas" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulan Batoro vasaros laikas" @@ -11493,10 +11652,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulan Batoras" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolko juostinis laikas" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolko vasaros laikas" @@ -11505,10 +11666,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolko sala" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Izraelio juostinis laikas" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Izraelio vasaros laikas" @@ -11517,10 +11680,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jeruzalė" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladešo juostinis laikas" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladešo vasaros laikas" @@ -11541,10 +11706,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Kitas, Rio Brankas" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Vakarų Azijos juostinis laikas" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Vakarų Azijos vasaros laikas" @@ -11553,10 +11720,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ašchabadas, Taškentas" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Aliaskos juostinis laikas" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Aliaskos vasaros laikas" @@ -11565,10 +11734,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Aliaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paragvajaus juostinis laikas" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paragvajaus vasaros laikas" @@ -11589,10 +11760,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Datos keitimosi linija vakarų" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libijos juostinis laikas" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libijos vasaros laikas" @@ -11601,10 +11774,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripolis" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahijos juostinis laikas" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahijos vasaros laikas" @@ -11613,10 +11788,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvadoras" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venesuelos juostinis laikas" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venesuelos vasaros laikas" @@ -11625,10 +11802,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Karakasas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bugenvilio juostinis laikas" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bugenvilio vasaros laikas" @@ -11637,10 +11816,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bugenvilio sala" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Havajų juostinis laikas" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Havajų vasaros laikas" @@ -11653,6 +11834,7 @@ msgid "SE Asia Standard Time" msgstr "Pietryčių Azijos juostinis laikas" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "Pietryčių Azijos vasaros laikas" @@ -11661,10 +11843,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bankokas, Hanojus, Džakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Kyzylordos juostinis laikas" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Kyzylordos vasaros laikas" @@ -11673,10 +11857,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Kyzylorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "V. Mongolijos juostinis laikas" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "V. Mongolijos vasaros laikas" @@ -11697,10 +11883,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Oklandas, Velingtonas" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleutų juostinis laikas" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleutų vasaros laikas" @@ -11709,10 +11897,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleutų salos" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omsko juostinis laikas" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omsko vasaros laikas" @@ -11733,10 +11923,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Kujaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Baltarusijos juostinis laikas" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Baltarusijos vasaros laikas" @@ -11745,10 +11937,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minskas" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "PA Vakarinis juostinis laikas" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "PA Vakarinis vasaros laikas" @@ -11757,10 +11951,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Džordžtaunas, La Pasas, Manausas, San Chuanas" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Grenlandijos juostinis laikas" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Grenlandijos vasaros laikas" @@ -11769,10 +11965,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Grenlandija" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Velykų salos juostinis laikas" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Velykų salos vasaros laikas" @@ -11781,6 +11979,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Velykų sala" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Rusijos laiko juosta 10" @@ -11789,10 +11988,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Čokurdachas" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Egipto juostinis laikas" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Egipto vasaros laikas" @@ -11813,10 +12014,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Četumalis" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauricijaus juostinis laikas" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauricijaus vasaros laikas" @@ -11825,10 +12028,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Luisas" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Vladivostoko juostinis laikas" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Vladivostoko vasaros laikas" @@ -11837,10 +12042,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostokas" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapūro juostinis laikas" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapūro vasaros laikas" @@ -11849,10 +12056,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kvala Lumpūras, Singapūras" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Korėjos juostinis laikas" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Korėjos vasaros laikas" @@ -11861,10 +12070,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seulas" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Čatamo salų juostinis laikas" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Čatamo salų vasaros laikas" @@ -11873,10 +12084,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Čatamo salos" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "R. Afrikos juostinis laikas" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "R. Afrikos vasaros laikas" @@ -11885,10 +12098,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobis" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "SLE juostinis laikas" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "SLE vasaros laikas" @@ -11945,10 +12160,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santjagas" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "R. Australijos juostinis laikas" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "R. Australijos vasaros laikas" @@ -11957,10 +12174,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbanas" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "V. Australijos juostinis laikas" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "V. Australijos vasaros laikas" diff --git a/po/nl.po b/po/nl.po index ae7e2db4424..6895b3474bb 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10362,10 +10362,12 @@ msgid "Select Source" msgstr "Selecteer Bron" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "China Standaard Tijd" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "China Zomertijd" @@ -10374,10 +10376,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+8:00) Peking, Tsjoengking, Hongkong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Noord-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Noord-Azië Zomertijd" @@ -10386,10 +10390,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnojarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Georgië Standaard Tijd" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Georgië Zomertijd" @@ -10398,6 +10404,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10406,10 +10413,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00 Gecoördineerde Wereldtijd+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepal Standaard Tijd" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepal Zomertijd" @@ -10418,10 +10427,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Kathmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Kaapverdië Standaard Tijd" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Kaapverdië Zomertijd" @@ -10430,10 +10441,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Kaapverdië" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haïti Standaard Tijd" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haïti Zomertijd" @@ -10442,10 +10455,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haïti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Midden-Europese Tijd" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Midden-Europese Zomertijd" @@ -10454,10 +10469,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajevo, Skopje, Warschau, Zagreb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Marokko Standaard Tijd" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Marokko Zomertijd" @@ -10466,6 +10483,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10474,10 +10492,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Gecoördineerde Wereldtijd-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Altaj Standaard Tijd" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Altaj Zomertijd" @@ -10486,10 +10506,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00 Barnaoel, Gorno-Altajsk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Centraal Europa Standaard Tijd" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Centraal Europa Zomertijd" @@ -10498,10 +10520,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrado, Bratislava, Boedapest, Ljubljana, Praag" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Iran Standaard Tijd" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Iran Zomertijd" @@ -10510,10 +10534,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint-Pierre Standaard Tijd" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint-Pierre Zomertijd" @@ -10522,10 +10548,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint-Pierre en Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Sao Tomé Standaard Tijd" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Sao Tomé Zomertijd" @@ -10534,10 +10562,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Sao Tomé" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibië Standaard Tijd" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibië Zomertijd" @@ -10546,10 +10576,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tonga Standaard Tijd" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tonga Zomertijd" @@ -10562,6 +10594,7 @@ msgid "Mountain Standard Time (Mexico)" msgstr "Mountain Standaard Tijd (Mexico)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Mountain Zomertijd (Mexico)" @@ -10570,10 +10603,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT (Standaard Tijd)" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT Zomertijd" @@ -10582,10 +10617,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, Londen" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Zuid-Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Zuid-Soedan Zomertijd" @@ -10594,10 +10631,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Centraal Azië Standaard Tijd" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Centraal Azië Zomertijd" @@ -10606,10 +10645,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord Howe Standaard Tijd" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord Howe Zomertijd" @@ -10622,6 +10663,7 @@ msgid "Arabic Standard Time" msgstr "Arabisch Schiereiland Standaard Tijd" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabisch Schiereiland Zomertijd" @@ -10630,6 +10672,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10638,10 +10681,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Gecoördineerde Wereldtijd+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadan Standaard Tijd" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadan Zomertijd" @@ -10650,10 +10695,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Newfoundland Standaard Tijd" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Newfoundland Zomertijd" @@ -10662,10 +10709,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Newfoundland" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Soedan Standaard Tijd" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Soedan Zomertijd" @@ -10674,10 +10723,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartoem" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "West Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "West Pacific Zomertijd" @@ -10686,10 +10737,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Pacific Zomertijd" @@ -10698,10 +10751,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Pacific Time (VS & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbeidzjan Standaard Tijd" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbeidzjan Zomertijd" @@ -10710,10 +10765,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Bakoe" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Magallanes Standaard Tijd" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Magallanes Zomertijd" @@ -10722,10 +10779,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa Standaard Tijd" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa Zomertijd" @@ -10734,10 +10793,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningrad Standaard Tijd" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningrad Zomertijd" @@ -10746,10 +10807,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "Pacific Standaard Tijd (Mexico)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Pacific Zomertijd (Mexico)" @@ -10758,10 +10821,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baja California" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Midden-Oosten Standaard Tijd" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Midden-Oosten Zomertijd" @@ -10770,10 +10835,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beiroet" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokio Standaard Tijd" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokio Zomertijd" @@ -10782,10 +10849,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokio" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Line-eilanden Standaard Tijd" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Line-eilanden Zomertijd" @@ -10794,10 +10863,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Kiritimati-eiland" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Cuba Standaard Tijd" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Cuba Zomertijd" @@ -10806,10 +10877,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Jordanië Standaard Tijd" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Jordanië Zomertijd" @@ -10818,10 +10891,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "CST (Standaard Tijd)" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "CST Zomertijd" @@ -10830,6 +10905,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Central Time (VS & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Rusland tijdzone 3" @@ -10838,10 +10914,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Wolgograd Standaard Tijd" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Wolgograd Zomertijd" @@ -10850,10 +10928,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Wolgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azoren Standaard Tijd" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azoren Zomertijd" @@ -10862,10 +10942,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azoren" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "Noord-Oost Azië Standaard Tijd" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Noord-Oost Azië Zomertijd" @@ -10874,6 +10956,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkoetsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10882,10 +10965,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Gecoördineerde Wereldtijd-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Argentinië Standaard Tijd" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Argentinië Zomertijd" @@ -10906,10 +10991,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks- en Caicoseilanden" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Marquesas Standaard Tijd" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Marquesas Zomertijd" @@ -10918,10 +11005,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Marquesaseilanden" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmar Standaard Tijd" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmar Zomertijd" @@ -10930,6 +11019,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Gecoördineerde Wereldtijd" @@ -10938,10 +11028,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Gecoördineerde Wereldtijd" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "India Standaard Tijd" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "India Zomertijd" @@ -10950,10 +11042,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Madras, Calcutta, Mumbai, New Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB Standaard Tijd" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB Zomertijd" @@ -10962,10 +11056,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Athene, Boekarest" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Turkije Standaard Tijd" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Turkije Zomertijd" @@ -10974,10 +11070,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanboel" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Astrachan Standaard Tijd" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Astrachan Zomertijd" @@ -10986,10 +11084,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrachan, Oeljanovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fiji Standaard Tijd" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fiji Zomertijd" @@ -10998,10 +11098,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Centraal Canada Standaard Tijd" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Centraal Canada Zomertijd" @@ -11010,10 +11112,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Yukon Standaard Tijd" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Yukon Zomertijd" @@ -11022,10 +11126,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taiwan Standaard Tijd" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taiwan Zomertijd" @@ -11034,10 +11140,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taiwan" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "West-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "West-Europa Zomertijd" @@ -11046,10 +11154,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlijn, Bern, Rome, Stockholm, Wenen" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideo Standaard Tijd" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideo Zomertijd" @@ -11058,10 +11168,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistan Standaard Tijd" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistan Zomertijd" @@ -11070,10 +11182,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Tomsk Standaard Tijd" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Tomsk Zomertijd" @@ -11082,10 +11196,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Kaukasus Standaard Tijd" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Kaukasus Zomertijd" @@ -11094,10 +11210,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Jerevan" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "Oost-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Oost-Australië Zomertijd" @@ -11110,6 +11228,7 @@ msgid "N. Central Asia Standard Time" msgstr "Noordcentraal-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "Noordcentraal-Azië Zomertijd" @@ -11118,10 +11237,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Oostkust Standaard Tijd" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Oostkust Zomertijd" @@ -11130,10 +11251,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Oostkust (VS & Canada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Transbaikal Standaard Tijd" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Transbaikal Zomertijd" @@ -11142,10 +11265,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Oost-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Oost-Europa Zomertijd" @@ -11154,10 +11279,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "CST (Mexico)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "CST Zomertijd (Mexico)" @@ -11166,10 +11293,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexico-Stad, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Saratov Standaard Tijd" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Saratov Zomertijd" @@ -11178,10 +11307,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlantische Standaard Tijd" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlantische tijd Zomertijd" @@ -11190,10 +11321,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Atlantische tijd (Canada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Mountain Standaard tijd" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Mountain Zomertijd" @@ -11202,10 +11335,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Mountain Tijd (VS & Canada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "VS Oost Standaard Tijd" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "VS Oost Zomertijd" @@ -11214,10 +11349,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (Oost)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Sachalin Standaard Tijd" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Sachalin Zomertijd" @@ -11226,10 +11363,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sachalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Noord-Korea Standaard Tijd" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Noord-Korea Zomertijd" @@ -11238,10 +11377,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tasmanië Standaard Tijd" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tasmanië Zomertijd" @@ -11250,10 +11391,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Centraal-Amerika Standaard Tijd" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Centraal-Amerika Zomertijd" @@ -11262,6 +11405,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Centraal-Amerika" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11270,10 +11414,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Gecoördineerde Wereldtijd-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "VS Mountain Standaard Tijd" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "VS Mountain Zomertijd" @@ -11282,10 +11428,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Zuid-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Zuid-Afrika Zomertijd" @@ -11298,6 +11446,7 @@ msgid "Cen. Australia Standard Time" msgstr "Centraal Australië Standaard Tijd" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Centraal Australië Zomertijd" @@ -11306,6 +11455,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11314,10 +11464,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Gecoördineerde Wereldtijd-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lanka Standaard Tijd" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lanka Zomertijd" @@ -11326,10 +11478,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afghanistan Standaard Tijd" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afghanistan Zomertijd" @@ -11338,10 +11492,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Yakutsk Standaard Tijd" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Yakutsk Zomertijd" @@ -11354,6 +11510,7 @@ msgid "SA Eastern Standard Time" msgstr "Zuid-Amerika Oost Standaard Tijd" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "Zuid-Amerika Oost Zomertijd" @@ -11362,10 +11519,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arabische Standaard Tijd" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arabische Zomertijd" @@ -11374,10 +11533,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Koeweit, Riyad" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabische Standaard Tijd" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabische Zomertijd" @@ -11386,10 +11547,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantins Standaard Tijd" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantins Zomertijd" @@ -11398,10 +11561,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Rusland Standaard Tijd" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Rusland Zomertijd" @@ -11414,6 +11579,7 @@ msgid "Aus Central W. Standard Time" msgstr "W-Centraal Australië Standaard Tijd" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "W-Centraal Australië Zomertijd" @@ -11422,10 +11588,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Rome Standaard Tijd" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Rome Zomertijd" @@ -11434,10 +11602,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Brussel, Kopenhagen, Madrid, Parijs" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Jekaterinenburg Standaard Tijd" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Jekaterinenburg Zomertijd" @@ -11446,6 +11616,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Jekaterinenburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Rusland tijdzone 11" @@ -11466,10 +11637,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Syrië Standaard Tijd" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Syrië Zomertijd" @@ -11482,6 +11655,7 @@ msgid "AUS Central Standard Time" msgstr "Centraal-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Centraal-Australië Zomertijd" @@ -11490,10 +11664,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Greenwich Standaard Tijd" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Greenwich Zomertijd" @@ -11502,10 +11678,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulaanbaatar Standaard Tijd" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulaanbaatar Zomertijd" @@ -11514,10 +11692,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Norfolk Standaard Tijd" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Norfolk Zomertijd" @@ -11526,10 +11706,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Norfolk-Eiland" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Israël Standaard Tijd" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Israël Zomertijd" @@ -11538,10 +11720,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jeruzalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladesh Standaard Tijd" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladesh Zomertijd" @@ -11554,6 +11738,7 @@ msgid "SA Pacific Standard Time" msgstr "Zuid-Amerika West Standaard Tijd" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "Zuid-Amerika West Zomertijd" @@ -11562,10 +11747,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "West-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "West-Azië Zomertijd" @@ -11574,10 +11761,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Asjchabad, Tasjkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaska Standaard Tijd" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaska Zomertijd" @@ -11586,10 +11775,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguay Standaard Tijd" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguay Zomertijd" @@ -11598,10 +11789,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Datumgrens Standaard Tijd" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Datumgrens Zomertijd" @@ -11610,10 +11803,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Internationale westelijke datumgrens" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libië Standaard Tijd" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libië Zomertijd" @@ -11622,10 +11817,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahia Standaard Tijd" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahia Zomertijd" @@ -11634,10 +11831,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuela Standaard Tijd" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuela Zomertijd" @@ -11646,10 +11845,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainville Standaard Tijd" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainville Zomertijd" @@ -11658,10 +11859,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Bougainville (eiland)" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hawaï Standaard Tijd" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hawaï Zomertijd" @@ -11670,10 +11873,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Hawaï" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "Zuid-Oost-Azië Standaard Tijd" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "Zuid-Oost-Azië Zomertijd" @@ -11682,10 +11887,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Qizilorda Standaard Tijd" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Qizilorda Zomertijd" @@ -11694,10 +11901,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Qizilorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "West-Mongolië Standaard Tijd" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "West-Mongolië Zomertijd" @@ -11706,10 +11915,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Nieuw-Zeeland Standaard Tijd" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Nieuw-Zeeland Zomertijd" @@ -11718,10 +11929,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleoeten Standaard Tijd" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleoeten Zomertijd" @@ -11730,10 +11943,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Aleoeten" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Omsk Standaard Tijd" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Omsk Zomertijd" @@ -11746,6 +11961,7 @@ msgid "Central Brazilian Standard Time" msgstr "Centraal Brazilië Standaard Tijd" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Centraal Brazilië Zomertijd" @@ -11754,10 +11970,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Wit-Rusland Standaard Tijd" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Wit-Rusland Zomertijd" @@ -11770,6 +11988,7 @@ msgid "SA Western Standard Time" msgstr "Zuid-Amerika West Standaard Tijd" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "Zuid-Amerika West Zomertijd" @@ -11778,10 +11997,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Groenland Standaard Tijd" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Groenland Zomertijd" @@ -11790,10 +12011,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Groenland" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Paaseiland Standaard Tijd" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Paaseiland Zomertijd" @@ -11802,6 +12025,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Paaseiland" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Rusland tijdzone 10" @@ -11810,10 +12034,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Tsjokoerdach" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Egypte Standaard Tijd" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Egypte Zomertijd" @@ -11822,10 +12048,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Caïro" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "EST (Mexico)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "EST Zomertijd (Mexico)" @@ -11834,10 +12062,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritius Standaard Tijd" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritius Zomertijd" @@ -11846,10 +12076,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Wladiwostok Standaard Tijd" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Wladiwostok Zomertijd" @@ -11858,10 +12090,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Wladiwostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapore Standaard Tijd" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapore Zomertijd" @@ -11870,10 +12104,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapore" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Korea Standaard Tijd" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Korea Zomertijd" @@ -11882,10 +12118,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seoel" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chathameilanden Standaard Tijd" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chathameilanden Zomertijd" @@ -11894,10 +12132,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Chathameilanden" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Oost-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Oost-Afrika Zomertijd" @@ -11906,10 +12146,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Oost-Europa Standaard Tijd" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Oost-Europa Zomertijd" @@ -11922,6 +12164,7 @@ msgid "E. South America Standard Time" msgstr "Oost Zuid-Amerika Standaard Tijd" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "Oost Zuid-Amerika Zomertijd" @@ -11930,10 +12173,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Central Pacific Standaard Tijd" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Central Pacific Zomertijd" @@ -11946,6 +12191,7 @@ msgid "W. Central Africa Standard Time" msgstr "West Centraal-Afrika Standaard Tijd" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "West Centraal-Afrika Zomertijd" @@ -11958,6 +12204,7 @@ msgid "Pacific SA Standard Time" msgstr "Pacific Zuid-Amerika Stand. Tijd" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Pacific Zuid-Amerika Zomertijd" @@ -11966,10 +12213,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "Oost-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "Oost-Australië Zomertijd" @@ -11978,10 +12227,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "West-Australië Standaard Tijd" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "West-Australië Zomertijd" diff --git a/po/pl.po b/po/pl.po index 3a465cb7b80..7094c7cf318 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10377,10 +10377,12 @@ msgid "Select Source" msgstr "Zaznacz źródło" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Czas urzędowy Chin" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Czas letni Chin" @@ -10389,10 +10391,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Czas urzędowy Azji północnej" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Czas letni Azji północnej" @@ -10401,10 +10405,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnojarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Czas urzędowy Gruzji" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Czas letni Gruzji" @@ -10413,6 +10419,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tbilisi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10421,10 +10428,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Uniwersalny Czas Koordynowany+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Czas urzędowy Nepalu" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Czas letni Nepalu" @@ -10437,6 +10446,7 @@ msgid "Cape Verde Standard Time" msgstr "Czas urzędowy Zielonego Przylądka" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Czas letni Zielonego Przylądka" @@ -10445,10 +10455,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Wyspy Zielonego Przylądka" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Czas urzędowy Haiti" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Czas letni Haiti" @@ -10457,10 +10469,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Czas urzędowy Europy środkowej" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Czas letni Europy środkowej" @@ -10469,10 +10483,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Sarajewo, Skopia, Warszawa, Zagrzeb" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Czas urzędowy Maroka" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Czas letni Maroka" @@ -10481,6 +10497,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanka" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10489,10 +10506,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Uniwersalny Czas Koordynowany-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Czas urzędowy Altai" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Czas letni Altai" @@ -10501,10 +10520,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaysk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Czas urzędowy Europy środkowej" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Czas letni Europy środkowej" @@ -10513,10 +10534,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrad, Bratysława, Budapeszt, Ljubljana, Praga" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Czas urzędowy Iranu" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Czas letni Iranu" @@ -10525,10 +10548,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Czas urzędowy Saint Pierre" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Czas letni Saint Pierre" @@ -10537,10 +10562,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Saint Pierre i Miquelon" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Czas urzędowy Sao Tome" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Czas letni Sao Tome" @@ -10549,10 +10576,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Sao Tome" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Czas urzędowy Namibii" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Czas letni Namibii" @@ -10561,10 +10590,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Windhuk" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Czas urzędowy Tonga" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Czas letni Tonga" @@ -10573,10 +10604,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Czas urzędowy górski (Meksyk)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Czas letni górski (Meksyk)" @@ -10585,10 +10618,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlan" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Czas urzędowy GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Czas letni GMT" @@ -10615,10 +10650,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Jeruzalem" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Czas urzędowy Azji środkowej" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Czas letni Azji środkowej" @@ -10627,10 +10664,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Czas urzędowy Lord Howe" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Czas letni Lord Howe" @@ -10639,10 +10678,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Wyspy Lord Howe" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Czas urzędowy arabski" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Czas letni arabski" @@ -10651,6 +10692,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10659,10 +10701,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Uniwersalny Czas Koordynowany+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Czas urzędowy Magadan" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Czas letni Magadan" @@ -10671,10 +10715,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Czas urzędowy Nowej Fundlandii" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Czas letni Nowej Fundlandii" @@ -10683,10 +10729,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Nowa Fundlandia" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Czas urzędowy Sudanu" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Czas letni Sudanu" @@ -10699,6 +10747,7 @@ msgid "West Pacific Standard Time" msgstr "Czas urzędowy pacyficzny zachodni" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "Czas letni pacyficzny zachodni" @@ -10707,10 +10756,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Czas urzędowy pacyficzny" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Czas letni pacyficzny" @@ -10719,10 +10770,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Czas pacyficzny (US & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Czas urzędowy Azerbejdżanu" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Czas letni Azerbejdżanu" @@ -10731,10 +10784,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Baku" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Czas urzędowy Magallanes" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Czas letni Magallanes" @@ -10743,10 +10798,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Czas urzędowy Samoa" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Czas letni Samoa" @@ -10755,10 +10812,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Czas urzędowy Kaliningradu" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Czas letni Kaliningradu" @@ -10771,6 +10830,7 @@ msgid "Pacific Standard Time (Mexico)" msgstr "Czas urzędowy pacyficzny (Meksyk)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Czas letni pacyficzny (Meksyk)" @@ -10779,10 +10839,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baja Kalifornia" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Czas urzędowy bliskiego wschodu" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Czas letni Bliskiego Wschodu" @@ -10791,10 +10853,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Bejrut" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Czas urzędowy Tokyo" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Czas letni Tokyo" @@ -10803,10 +10867,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tokio" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Czas urzędowy Wysp Line" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Czas letni Wysp Line" @@ -10815,10 +10881,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Wyspy Kiritimati" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Czas urzędowy Kuby" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Czas letni Kuby" @@ -10827,10 +10895,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Hawana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Czas urzędowy Jordanu" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Czas letni Jordanu" @@ -10839,10 +10909,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Czas urzędowy środkowy" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Czas letni środkowy" @@ -10851,6 +10923,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Czas środkowy (US & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Rosyjska strefa czasowa 3" @@ -10859,10 +10932,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Izhevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Czas urzędowy Wołgogradu" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Czas letni Wołgogradu" @@ -10871,10 +10946,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Wołgograd" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Czas urzędowy Azorów" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Czas letni Azorów" @@ -10895,6 +10972,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkuck" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10903,10 +10981,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Uniwersalny Czas Koordynowany-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Czas urzędowy Argentyny" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Czas letni Argentyny" @@ -10915,10 +10995,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Miasto Buenos Aires" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "Czas urzędowy Turks i Caicos" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Czas letni Turks i Caicos" @@ -10927,10 +11009,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) Turks i Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Czas urzędowy Marquesas" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Czas letni Marquesas" @@ -10939,10 +11023,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Wyspy Marquesas" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Czas urzędowy Myanmaru" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Czas letni Myanmar" @@ -10951,6 +11037,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Uniwersalny Czas Koordynowany" @@ -10959,10 +11046,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Uniwersalny Czas Koordynowany" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Czas urzędowy Indii" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Czas letni Indii" @@ -10971,10 +11060,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nowe Delhi" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Czas urzędowy GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Czas letni GTB" @@ -10983,10 +11074,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Ateny, Bukareszt" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Czas urzędowy Turcji" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Czas letni Turcji" @@ -10995,10 +11088,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istambuł" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Czas urzędowy Astrakhan" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Czas letni Astrakhanu" @@ -11007,10 +11102,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astrakhan, Ulyanovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Czas urzędowy Fidżi" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Czas letni Fidżi" @@ -11019,10 +11116,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fidżi" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Czas urzędowy Kanady środkowej" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Czas letni Kanady środkowej " @@ -11031,10 +11130,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Czas urzędowy Jukonu" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Czas letni Jukonu" @@ -11043,10 +11144,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Jukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Czas urzędowy Taipei" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Czas letni Taipei" @@ -11055,10 +11158,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Tajpej" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "Czas urzędowy Europy zachodniej" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Czas letni Europy zachodniej" @@ -11067,10 +11172,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdam, Berlin, Brno, Rzym, Sztokholm, Wiedeń" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Czas urzędowy Montevideo" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Czas letni Montevideo" @@ -11079,10 +11186,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Czas urzędowy Pakistanu" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Czas letni Pakistanu" @@ -11091,10 +11200,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Czas urzędowy Tomska" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Czas letni Tomska" @@ -11103,10 +11214,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Czas urzędowy kaukaski" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Czas letni kaukaski" @@ -11119,6 +11232,7 @@ msgid "AUS Eastern Standard Time" msgstr "Czas urzędowy Australii wschodni" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Czas letni Australii wschodniej" @@ -11139,10 +11253,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Nowosybirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Czas urzędowy wschodni" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Czas letni wschodni" @@ -11151,10 +11267,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Czas wschodni (US & Canada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Czas urzędowy Transbajkału" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Czas letni Transbajkału" @@ -11163,10 +11281,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Chita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Czas urzędowy Europy wschodniej" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Czas letni Europy wschodniej" @@ -11175,10 +11295,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Kiszyniów" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Czas urzędowy środkowy (Meksyk)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "Czas letni środkowy (Meksyk)" @@ -11187,10 +11309,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Mexico City, Monterrey" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Czas urzędowy Saratowa" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Czas letni Saratowa" @@ -11199,10 +11323,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratów" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Czas urzędowy atlantycki" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Czas letni atlantycki" @@ -11211,10 +11337,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Czas atlantycki (Canada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Czas urzędowy górski" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Czas letni górski" @@ -11235,10 +11363,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (Wschód)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Czas urzędowy Sachalina" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Czas letni Sachalinu" @@ -11247,10 +11377,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sachalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Czas urzędowy Korei Północnej" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Czas letni Korei Północnej" @@ -11259,10 +11391,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pjongjang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Czas urzędowy Tasmanii" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Czas letni Tasmanii" @@ -11271,10 +11405,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Czas urzędowy Ameryki środkowej" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Czas letni Ameryki środkowej" @@ -11283,6 +11419,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Ameryka środkowa" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11307,6 +11444,7 @@ msgid "South Africa Standard Time" msgstr "Czas urzędowy Afryki południowej" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Czas letni Afryki południowej" @@ -11319,6 +11457,7 @@ msgid "Cen. Australia Standard Time" msgstr "Czas urzędowy Australii środkowej" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Czas letni Australii środkowej" @@ -11327,6 +11466,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelajda" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11335,10 +11475,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Uniwersalny Czas Koordynowany-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Czas urzędowy Sri Lanki" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Czas letni Sri Lanki" @@ -11347,10 +11489,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Sri Jayawardenepura" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Czas urzędowy Afganistanu" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Czas letni Afganistanu" @@ -11359,10 +11503,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Czas urzędowy Jakucka" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Czas letni Jakucka" @@ -11383,10 +11529,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Cayenne, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Czas urzędowy arabski" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Czas letni arabski" @@ -11395,10 +11543,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwejt, Rijad" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Czas urzędowy arabski" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Czas letni arabski" @@ -11407,10 +11557,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Muscat" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Czas urzędowy Tocantins" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Czas letni Tocantins" @@ -11419,10 +11571,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Czas urzędowy Rosji" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Czas letni Rosji" @@ -11443,10 +11597,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Czas urzędowy romański" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Czas letni romański" @@ -11455,10 +11611,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Bruksela, Kopenhaga, Madryt, Paryż" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Czas urzędowy Jekaterynburga" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Czas letni Jekaterynburga" @@ -11467,6 +11625,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Jekaterynburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Rosyjska strefa czasowa 11" @@ -11479,6 +11638,7 @@ msgid "West Bank Standard Time" msgstr "Czas urzędowy zachodniego wybrzeża" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Czas letni zachodniego wybrzeża" @@ -11487,10 +11647,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Czas urzędowy Syrii" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Czas letni Syrii" @@ -11503,6 +11665,7 @@ msgid "AUS Central Standard Time" msgstr "Czas urzędowy Australii środkowej" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Czas letni Australii środkowej" @@ -11511,10 +11674,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Czas urzędowy Greenwich" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Czas letni Greenwich" @@ -11523,10 +11688,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monrovia, Reykjavik" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Czas urzędowy Ułan Batoru" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Czas letni Ułan Batoru" @@ -11535,10 +11702,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ułanbator" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Czas urzędowy Norfolku" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Czas letni Norfolku" @@ -11547,10 +11716,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Wyspy Norfolk" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Czas urzędowy Izraelu" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Czas letni Izraelu" @@ -11559,10 +11730,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jeruzalem" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Czas urzędowy Bangladeszu" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Czas letni Bangladeszu" @@ -11583,10 +11756,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Czas urzędowy Azji zachodniej" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Czas letni Azji zachodniej" @@ -11595,10 +11770,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ashgabat, Taszkent" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Czas urzędowy Alaski" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Czas letni Alaski" @@ -11607,10 +11784,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Czas urzędowy Paragwaju" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Czas letni Paragwaju" @@ -11619,10 +11798,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asuncion" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Czas urzędowy linii zmiany daty" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Czas letni linii zmiany daty" @@ -11631,10 +11812,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Międzynarodowa linia daty zachodnia" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Czas urzędowy Libii" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Czas letni Libii" @@ -11643,10 +11826,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Tripoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Czas urzędowy Bahia" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Czas letni Bahia" @@ -11655,10 +11840,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salwador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Czas urzędowy Wenezueli" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Czas letni Wenezueli" @@ -11667,10 +11854,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Karakas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Czas urzędowy Bougainville" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Czas letni Bougainville" @@ -11679,10 +11868,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Wyspy Bougainville" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Czas urzędowy Hawajów" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Czas letni Hawajów" @@ -11703,10 +11894,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Czas urzędowy Qyzylorda" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Czas letni Qyzylorda" @@ -11719,6 +11912,7 @@ msgid "W. Mongolia Standard Time" msgstr "Czas urzędowy zachodniej Mongolii" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Czas letni zachodniej Mongolii" @@ -11727,10 +11921,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Czas urzędowy Nowej Zelandii" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Czas letni Nowej Zelandii" @@ -11739,10 +11935,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Czas urzędowy Aleut" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Czas letni Aleut" @@ -11751,10 +11949,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Wyspy Aleutian" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Czas urzędowy Omska" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Czas letni Omska" @@ -11767,6 +11967,7 @@ msgid "Central Brazilian Standard Time" msgstr "Czas urzędowy Brazylii środkowej" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Czas letni Brazylii środkowej" @@ -11775,10 +11976,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiaba" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Czas urzędowy Białorusi" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Czas letni Białorusi" @@ -11799,10 +12002,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Czas urzędowy Grenlandii" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Czas letni Grenlandii" @@ -11815,6 +12020,7 @@ msgid "Easter Island Standard Time" msgstr "Czas urzędowy Wysp Wielkanocnych" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Czas letni Wysp Wielkanocnych" @@ -11823,6 +12029,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Wyspa Wielkanocna" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Rosyjska strefa czasowa 10" @@ -11831,10 +12038,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Chokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Czas urzędowy Egiptu" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Czas letni Egiptu" @@ -11843,10 +12052,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Kair" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Czas urzędowy wschodni (Meksyk)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Czas letni wschodni (Meksyk)" @@ -11855,10 +12066,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Czas urzędowy Mauritiusa" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Czas letni Mauritiusa" @@ -11867,10 +12080,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Czas urzędowy Władywostoku" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Czas letni Władywostoku" @@ -11879,10 +12094,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Władywostok" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Czas urzędowy Singapuru" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Czas letni Singapuru" @@ -11891,10 +12108,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Czas urzędowy Korei" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Czas letni Korei" @@ -11903,10 +12122,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Czas urzędowy Wysp Chatham" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Czas letni Wysp Chatham" @@ -11915,10 +12136,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Wyspy Chatham" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Czas urzędowy Afryki wschodniej" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Czas letni Afryki wschodniej" @@ -11927,10 +12150,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Czas urzędowy FLE" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Czas letni FLE" @@ -11955,6 +12180,7 @@ msgid "Central Pacific Standard Time" msgstr "Czas urzędowy pacyficzny środkowy" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Czas letni pacyficzny środkowy" @@ -11991,6 +12217,7 @@ msgid "E. Australia Standard Time" msgstr "Czas urzędowy Australii wschodniej" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "Czas letni Australii wschodniej" @@ -12003,6 +12230,7 @@ msgid "W. Australia Standard Time" msgstr "Czas urzędowy Australii zachodniej" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "Czas letni Australii zachodniej" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3e424326978..a53e26d32eb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10373,10 +10373,12 @@ msgid "Select Source" msgstr "Selecionar Pasta" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Hora padrão da China" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Horário de verão da China" @@ -10385,10 +10387,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Pequim, Xunquim, Hong Kong, Ürümqi" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Hora padrão do Norte da Asia" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Horário de verão Norte da Asia" @@ -10397,10 +10401,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Krasnoyarsk" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Hora padrão da Georgia" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Horário de verão da Georgia" @@ -10409,6 +10415,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Tiblíssi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10417,10 +10424,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00)Coordenada Universal de Tempo+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Hora padrão do Nepal" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Horário de verão do Nepal" @@ -10429,10 +10438,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Catmandu" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Hora padrão de Cabo Verde" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Horário de verão de Cabo Verde" @@ -10441,10 +10452,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Ilha de Cabo Verde." #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Hora padrão do Haiti" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Horário de verão do Haiti" @@ -10453,6 +10466,7 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haiti" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Hora padrão da Europa Central" @@ -10465,10 +10479,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Saraievo, Escópia, Varsóvia, Zagrebe" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Hora padrão do Marrocos" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Horário de verão do Marrocos" @@ -10477,6 +10493,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10485,10 +10502,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Coordenada Universal de Tempo-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Hora padrão de Altai" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Horário de verão de Altai" @@ -10497,6 +10516,7 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaul, Gorno-Altaysk" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Hora padrão da Europa Central" @@ -10509,10 +10529,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Belgrado, Bratislava, Budapeste, Liubliana, Praga" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Hora padrão do Irã" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Horário de verão do Irã" @@ -10521,10 +10543,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Teerã" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Hora padrão de São Pedro" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Horário de verão de São Pedro" @@ -10533,10 +10557,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "Hora padrão de São Pedro e Miquelão" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Hora padrão de São Tomé" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Horário de verão de São Tomé" @@ -10545,10 +10571,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Hora padrão da Namíbia" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Horário de verão da Namíbia" @@ -10557,10 +10585,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Vinduque" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Hora padrão de Tonga" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Horário de verão de Tonga" @@ -10569,10 +10599,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nucualofa" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Hora padrão de Montanha" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Horário de verão de Montanha" @@ -10581,10 +10613,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Hora padrão GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Horário de verão GMT" @@ -10611,6 +10645,7 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Jerusalém" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Hora padrão da Asia Central" @@ -10623,10 +10658,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) Astana" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Hora padrão de Lord Howe" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Horário de verão de Lord Howe" @@ -10635,10 +10672,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Ilha de Lord Howe" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Hora padrão Árabe" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Horário de verão da Arábia" @@ -10647,6 +10686,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Bagdá" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10655,10 +10695,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Coordenada Universal de Tempo+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Hora padrão de Magadan" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Horário de verão Magadan" @@ -10667,10 +10709,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Hora padrão de Terra Nova" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Horário de verão Nova Zelândia" @@ -10679,10 +10723,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Terra Nova e Labrador" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Hora padrão do Sudão" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Horário de verão do Sudão" @@ -10695,6 +10741,7 @@ msgid "West Pacific Standard Time" msgstr "Hora padrão do Pacífico Ocidental" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "Horário de verão Pacífico Oeste" @@ -10703,10 +10750,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Guam, Porto Moresby" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Hora padrão do Pacífico" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Horário de verão Pacífico" @@ -10715,10 +10764,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) Hora do Pacífico (EUA & Canada)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Hora padrão do Azerbaijão" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Horário de verão do Azerbaijão" @@ -10727,10 +10778,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Bacu" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Hora padrão de Magalhães" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Horário de verão Magalhães" @@ -10739,10 +10792,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Hora padrão de Samoa" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Horário de verão de Samoa" @@ -10751,6 +10806,7 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Hora padrão de Kaliningrado" @@ -10763,6 +10819,7 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrado" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "Hora padrão do Pacífico(México)" @@ -10775,6 +10832,7 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baixa Califórnia" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Hora padrão do Oriente Médio" @@ -10787,10 +10845,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Beirute" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Hora padrão de Tóquio" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Horário de verão Tóquio" @@ -10811,10 +10871,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Ilha Christmas" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Hora padrão da Cuba" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Horário de verão da Cuba" @@ -10823,10 +10885,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Havana" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Hora padrão da Jordânia" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Horário de verão da Jordânia" @@ -10835,10 +10899,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Amã" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Hora padrão Central" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Horário de verão Central" @@ -10847,6 +10913,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) Hora Central (EUA & Canada)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "Zora Horária da Rússia 3" @@ -10855,10 +10922,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Ijevsk, Samara" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Hora padrão de Volgogrado" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Horário de verão de Volgogrado" @@ -10867,10 +10936,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Volgogrado" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Hora padrão de Açores" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Horário de verão de Açores" @@ -10879,10 +10950,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Açores" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "Hora padrão do Norte da Ásia" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Horário de verão Norte da Asia" @@ -10891,6 +10964,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10899,10 +10973,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Coordenada Universal de Tempo-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Hora padrão da Argentina" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Horário de verão da Argentina" @@ -10923,6 +10999,7 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) lhas Turcas e Caicos" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Hora padrão das Ilhas Marquesas" @@ -10935,10 +11012,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Arquipélago das Marquesas" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Hora padrão de Myanmar" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Horário de verão de Myanmar" @@ -10947,6 +11026,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Yangon (Rangum)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Tempo Universal Coordenado" @@ -10955,10 +11035,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Coordenada Universal de Tempo" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Hora padrão da Índia" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Horário de verão da Índia" @@ -10967,10 +11049,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Chenai, Calcutá, Mumbai, Nova Deli" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "Hora padrão GTB" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "Horário de verão GTB" @@ -10979,10 +11063,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Atenas, Bucareste" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Hora padrão da Turquia" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Horário de verão da Turquia" @@ -10991,10 +11077,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Hora padrão de Astracã" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Horário de verão de Astracã" @@ -11003,10 +11091,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Astracã, Ulianovsk" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Hora padrão de Fiji" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Horário de verão de Fiji" @@ -11015,10 +11105,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Hora padrão do Canadá Central" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Horário de verão Canada Central" @@ -11027,10 +11119,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Sascachevão" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Hora padrão de Yukon" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Horário de verão de Yukon" @@ -11039,10 +11133,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Hora padrão de Taipei" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Horário de verão de Taipei" @@ -11051,6 +11147,7 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipé" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "Hora padrão da Europa Ocidental" @@ -11063,10 +11160,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Amsterdã, Berlim, Berna, Roma, Estocolmo, Viena" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Hora padrão de Montevidéu" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Horário de verão de Montevidéu" @@ -11075,10 +11174,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Hora padrão do Paquistão" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Horário de verão do Paquistão" @@ -11087,10 +11188,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Islamabade, Carachi" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Hora padrão de Tomsk" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Horário de verão Tomsk" @@ -11099,10 +11202,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Hora padrão do Cáucaso" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Horário de verão do Cáucaso" @@ -11123,6 +11228,7 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Camberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "Hora padrão do Norte da Ásia" @@ -11135,10 +11241,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Novosibirsk" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Hora padrão do Leste" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Horário de verão do Leste" @@ -11147,10 +11255,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Zona de Tempo Oriental (EUA & Canada)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Hora padrão de Transbaikal" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Horário de verão de Transbaikal" @@ -11159,6 +11269,7 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Tchita" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "Hora padrão da Europa Oriental" @@ -11171,6 +11282,7 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) Quixinau" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "Hora padrão Central(México)" @@ -11183,10 +11295,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Guadalajara, Cidade do México, Monterrei" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Hora padrão de Saratov" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Horário de verão de Saratov" @@ -11195,10 +11309,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Saratov" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Hora padrão do Atlântico" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Horário de verão do Atlântico" @@ -11207,10 +11323,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Hora do Atlantic (Canada)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Hora padrão de Montanha" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Horário de verão de Montanha" @@ -11219,10 +11337,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Horario de Montanha (EUA & Canada)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "Hora padrão do Leste dos EUA" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "Horário de verão do Leste EUA" @@ -11231,10 +11351,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Indiana (Oriente)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Hora padrão do Sacalina" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Horário de verão do Sacalina" @@ -11243,6 +11365,7 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sakhalin" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Hora padrão da Coreia do Norte" @@ -11255,10 +11378,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Hora padrão da Tasmânia" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Horário de verão da Tasmânia" @@ -11267,6 +11392,7 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Hora padrão da América Central" @@ -11279,6 +11405,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) América Central" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11287,6 +11414,7 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Coordenada Universal de Tempo-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "Hora padrão de Montanha(EUA)" @@ -11299,6 +11427,7 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Hora padrão da África do Sul" @@ -11311,6 +11440,7 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretória" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Hora padrão da Austrália" @@ -11323,6 +11453,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Adelaide" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11331,10 +11462,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Coordenada Universal de Tempo-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Hora padrão do Sri Lanka" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Horário de verão do Sri Lanka" @@ -11343,10 +11476,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Seri Jaiavardenapura-Cota" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Hora padrão do Afeganistão" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Horário de verão do Afeganistão" @@ -11355,10 +11490,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Cabul" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Hora padrão de Iacutusque" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Horário de verão de Iacutusque" @@ -11379,10 +11516,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Caiena, Fortaleza" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Hora padrão da Arábia" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Horário de verão Árabe" @@ -11391,6 +11530,7 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Kuwait, Riade" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Hora padrão da Arábia Saudita" @@ -11403,10 +11543,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Abu Dhabi, Mascate" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Hora padrão de Tocantins" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Horário de verão de Tocantins" @@ -11415,10 +11557,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Araguaina" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Hora padrão da Rússia" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Horário de verão da Rússia" @@ -11439,10 +11583,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Hora padrão Românica" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Horário de verão da România" @@ -11451,6 +11597,7 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Bruxelas, Copenhague, Madri, Paris" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Hora padrão de Ecaterimburgo" @@ -11463,6 +11610,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) Ecaterimburgo" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "Zora Horária da Rússia 11" @@ -11471,10 +11619,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatskiy" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "Hora padrão da Cisjordânia" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "Horário de verão da Cisjordânia" @@ -11483,10 +11633,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Gaza, Hebrom" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Hora padrão da Síria" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Horário de verão da Síria" @@ -11507,10 +11659,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Hora padrão de Greenwich" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Horário de verão de Greenwich" @@ -11519,10 +11673,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Monróvia, Reiquiavique" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Hora padrão do Norte da Ásia" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Horário de verão de Ulaanbaatar" @@ -11531,10 +11687,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Ulan Bator" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Hora padrão do Norfolk" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Horário de verão do Norfolk" @@ -11543,10 +11701,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Ilha de Norfolk" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Hora padrão de Israel" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Horário de verão de Israel" @@ -11555,10 +11715,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Jerusalém" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Hora padrão de Bangladesh" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Horário de verão de Bangladesh" @@ -11579,6 +11741,7 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) Bogotá, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Hora padrão do Oeste da Ásia" @@ -11591,10 +11754,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Asgabade, Tasquente" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Hora padrão do Alasca" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Horário de verão do Alasca" @@ -11603,10 +11768,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Hora padrão do Paraguai" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Horário de verão do Paraguai" @@ -11615,10 +11782,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Hora padrão do Meridiano" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Horário de verão do Meridiano" @@ -11627,10 +11796,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Linha Internacional de Data West" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Hora padrão da Líbia" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Horário de verão da Líbia" @@ -11639,10 +11810,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Hora padrão da Bahia" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Horário de verão da Bahia" @@ -11651,10 +11824,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Hora padrão da Venezuela" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Horário de verão da Venezuela" @@ -11663,6 +11838,7 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Hora padrão de Bougainville" @@ -11675,10 +11851,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Ilha Bougainville" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hora padrão do Avaí" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Horário de verão do Avaí" @@ -11687,6 +11865,7 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Havaí" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "Hora padrão do Sudeste da Ásia" @@ -11699,10 +11878,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Bancoque, Hanói, Jacarta" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Hora padrão da Kyzylorda" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Horário de verão da Kyzylorda" @@ -11711,10 +11892,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Kyzylorda" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "Hora padrão de Mongólia" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Horário de verão de Mongólia" @@ -11723,6 +11906,7 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Hora padrão da Nova Zelândia" @@ -11735,10 +11919,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Hora padrão da Aleutas" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Horário de verão da Aleutas" @@ -11747,10 +11933,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Ilhas Aleutas" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Hora padrão de Omsk" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Horário de verão de Omsk" @@ -11759,10 +11947,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Hora padrão Central do Brasil" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Horário de verão Brasil Central" @@ -11771,10 +11961,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Hora padrão de Belarus" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Horário de verão de Belarus" @@ -11795,10 +11987,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Hora padrão da Groenlândia" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Horário de verão da Groenlândia" @@ -11807,6 +12001,7 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Gronelândia" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Hora padrão da Ilha da Páscoa" @@ -11819,6 +12014,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) Ilha de Páscoa" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "Zora Horária da Rússia 10" @@ -11827,10 +12023,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Chokurdakh" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Hora padrão do Egito" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Horário de verão do Egito" @@ -11839,6 +12037,7 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) Cairo" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "Hora padrão Oriental(México)" @@ -11851,10 +12050,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Hora padrão da Mauritânia" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Horário de verão da Mauritânia" @@ -11863,6 +12064,7 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Porto Luís" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Hora padrão de Vladivostoque" @@ -11875,10 +12077,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Vladivostoque" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Hora padrão de Singapura" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Horário de verão de Singapura" @@ -11887,10 +12091,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Kuala Lumpur, Singapura" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Hora padrão da Coreia" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Horário de verão da Coreia" @@ -11899,6 +12105,7 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seul" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Hora padrão da Ilhas Chatham" @@ -11911,6 +12118,7 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Ilhas Chatham" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Hora padrão da África Oriental" @@ -11923,10 +12131,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Hora padrão FLE" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Horário de verão FLE" @@ -11935,6 +12145,7 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinque, Kiev, Riga, Sófia, Talim, Vilna" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "Hora padrão de Brasília" @@ -11947,6 +12158,7 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasilia" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Hora padrão do Pacífico Central" diff --git a/po/ru.po b/po/ru.po index 7d433bd5373..1bd9769f180 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10408,10 +10408,12 @@ msgid "Select Source" msgstr "Выберите источник" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Китайское стандартное время" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Китайское летнее время" @@ -10432,10 +10434,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Красноярск" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Грузинское стандартное время" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Грузинское летнее время" @@ -10444,6 +10448,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Тбилиси" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10452,10 +10457,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Непальское стандартное время" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Непальское летнее время" @@ -10476,10 +10483,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Гаитянское стандартное время" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Гаитянское летнее время" @@ -10500,10 +10509,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Сараево, Скопье, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Марокканское стандартное время" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Марокканское летнее время" @@ -10512,6 +10523,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Касабланка" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10520,10 +10532,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Алтайское стандартное время" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Алтайское летнее время" @@ -10544,10 +10558,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Любляна, Прага" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Иранское стандартное время" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Иранское летнее время" @@ -10556,10 +10572,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Сен-Пьер стандартное время" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Сен-Пьер летнее время" @@ -10568,10 +10586,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Сен-Пьер и Микелон" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Сан-Томе стандартное время" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Сан-Томе летнее время" @@ -10580,10 +10600,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Сан-Томе" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Намибийское стандартное время" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Намибийское летнее время" @@ -10592,10 +10614,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) Виндхук" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Тонга стандартное время" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Тонга летнее время" @@ -10616,10 +10640,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "Стандартное время GMT" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "Стандартное время GMT" @@ -10628,10 +10654,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Дублин, Эдинбург, Лиссабон, Лондон" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "Южный Судан стандартное время" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Южный Судан летнее время" @@ -10664,10 +10692,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Арабское летнее время" @@ -10676,6 +10706,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Багдад" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10684,10 +10715,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Магаданское стандартное время" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Магаданское летнее время" @@ -10708,10 +10741,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Суданское стандартное время" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Суданское летнее время" @@ -10748,6 +10783,7 @@ msgid "Azerbaijan Standard Time" msgstr "Азербайджанское стандартное время" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Азербайджанское летнее время" @@ -10768,10 +10804,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Пунта-Аренас" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Стандартное время Самоа" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Летнее время Самоа" @@ -10784,6 +10822,7 @@ msgid "Kaliningrad Standard Time" msgstr "Калининградское стандартное время" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Калининградское летнее время" @@ -10808,6 +10847,7 @@ msgid "Middle East Standard Time" msgstr "Ближневосточное стандартное время" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Ближневосточное летнее время" @@ -10816,10 +10856,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Стандартное время Токио" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Летнее время Токио" @@ -10840,10 +10882,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Кирибати" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Кубинское стандартное время" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Кубинское летнее время" @@ -10852,10 +10896,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Иорданское стандартное время" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Иорданское летнее время" @@ -10864,10 +10910,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Центральное время" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Центральное летнее время" @@ -10884,10 +10932,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Ижевск, Самара" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Волгоградское стандартное время" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Волгоградское летнее время" @@ -10896,10 +10946,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Азорское стандартное время" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Азорское летнее время" @@ -10920,6 +10972,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Иркутск" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10928,10 +10981,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Аргентинское стандартное время" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Аргентинское летнее время" @@ -10944,6 +10999,7 @@ msgid "Turks And Caicos Standard Time" msgstr "Теркс и Кайкос стандартное время" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Теркс и Кайкос летнее время" @@ -10956,6 +11012,7 @@ msgid "Marquesas Standard Time" msgstr "Маркизские острова стандартное время" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Маркизские острова летнее время" @@ -10984,10 +11041,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Индийское стандартное время" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Индийское летнее время" @@ -11008,10 +11067,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Афины, Бухарест" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Турецкое стандартное время" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Турецкое летнее время" @@ -11020,10 +11081,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Астраханское стандартное время" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Астраханское летнее время" @@ -11032,10 +11095,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Астрахань, Ульяновск" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Стандартное время Фиджи" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Летнее время Фиджи" @@ -11044,6 +11109,7 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Фиджи" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Центральное канадское время" @@ -11056,10 +11122,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Саскачеван" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Стандартное время Юкон" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Летнее время Юкон" @@ -11068,10 +11136,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Тайбэйское стандартное время" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Тайбэйское летнее время" @@ -11084,6 +11154,7 @@ msgid "W. Europe Standard Time" msgstr "Западноевропейское стандартное время" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Западноевропейское летнее время" @@ -11092,10 +11163,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Амстердам, Берлин, Берн, Стокгольм, Вена" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Монтевидео стандартное время" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Монтевидео летнее время" @@ -11104,10 +11177,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Монтевидео" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Пакистанское стандартное время" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Пакистанское летнее время" @@ -11116,10 +11191,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Исламабад, Карачи" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Томское стандартное время" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Томское летнее время" @@ -11128,10 +11205,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Томск" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Кавказское стандартное время" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Кавказское летнее время" @@ -11164,10 +11243,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Новосибирск" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Восточное стандартное время" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Восточное летнее время" @@ -11212,10 +11293,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Гвадалахара, Мехико, Монтеррей" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Саратовское стандартное время" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Саратовское летнее время" @@ -11224,10 +11307,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Атлантическое стандартное время" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Атлантическое летнее время" @@ -11260,10 +11345,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Индиана (запад)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Сахалинское стандартное время" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Сахалинское летнее время" @@ -11276,6 +11363,7 @@ msgid "North Korea Standard Time" msgstr "Северокорейское стандартное время" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Северокорейское летнее время" @@ -11284,10 +11372,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Пхеньян" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Тасманийское стандартное время" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Тасманийское летнее время" @@ -11308,6 +11398,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Центральная Америка" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11332,6 +11423,7 @@ msgid "South Africa Standard Time" msgstr "Южноафриканское стандартное время" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Южноафриканское летнее время" @@ -11352,6 +11444,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Аделаида" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11372,10 +11465,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Афганское стандартное время" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Афганское летнее время" @@ -11384,10 +11479,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Якутское стандартное время" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Якутское летнее время" @@ -11408,10 +11505,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Арабское стандартное время" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Арабское летнее время" @@ -11420,10 +11519,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Кувейт, Риад" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Аравийское стандартное время" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Аравийское летнее время" @@ -11444,10 +11545,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Арагуаина" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Российское стандартное время" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Российское летнее время" @@ -11484,6 +11587,7 @@ msgid "Ekaterinburg Standard Time" msgstr "Екатеринбургское стандартное время" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Екатеринбургское летнее время" @@ -11512,10 +11616,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Газа, Хеврон" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Сирийское стандартное время" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Сирийское летнее время" @@ -11560,10 +11666,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Улан-Батор" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Норфолк стандартное время" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Норфолк летнее время" @@ -11572,10 +11680,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Остров Норфолк" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Израильское стандартное время" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Израильское летнее время" @@ -11656,10 +11766,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Ливийское стандартное время" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Ливийское летнее время" @@ -11680,10 +11792,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Венесуэльское стандартное время" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Венесуэльское летнее время" @@ -11692,10 +11806,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Каракас" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Бугенвиль стандартное время" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Бугенвиль летнее время" @@ -11704,10 +11820,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Остров Бугенвиль" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Гавайское стандартное время" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Гавайское летнее время" @@ -11764,10 +11882,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Окленд, Веллингтон" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Алеутское стандартное время" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Алеутское летнее время" @@ -11776,10 +11896,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Алеутские острова" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Омское стандартное время" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Омское летнее время" @@ -11800,10 +11922,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Куяба" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Белорусское стандартное время" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Белорусское летнее время" @@ -11824,10 +11948,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Гренландское стандартное время" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Гренландское летнее время" @@ -11856,10 +11982,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Чокурдах" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Египетское стандартное время" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Египетское летнее время" @@ -11896,6 +12024,7 @@ msgid "Vladivostok Standard Time" msgstr "Владивостокское стандартное время" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Владивостокское летнее время" @@ -11904,10 +12033,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Сингапурское стандартное время" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Сингапурское летнее время" @@ -11916,10 +12047,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Куала-Лумпур, Сингапур" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Корейское стандартное время" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Корейское летнее время" diff --git a/po/si.po b/po/si.po index 70dfc5909bd..28652d23c2c 100644 --- a/po/si.po +++ b/po/si.po @@ -10446,10 +10446,12 @@ msgid "Select Source" msgstr "මූලය තෝරන්න" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "චීනයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "චීනයේ දිවා ආලෝකය වෙලාව" @@ -10458,10 +10460,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "උතුරු ආසියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "උතුරු ආසියාවේ දිවා ආලෝකය වෙලාව" @@ -10470,10 +10474,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "ජෝර්ජියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "ජෝර්ජියාවේ දිවා ආලෝකය වෙලාව" @@ -10492,10 +10498,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "නේපාලයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "නේපාලයේ දිවා ආලෝකය වෙලාව" @@ -10504,10 +10512,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "කේප් වර්ඩෙ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "කේප් වර්ඩෙ දිවා ආලෝකය වෙලාව" @@ -10532,10 +10542,12 @@ msgid "(UTC-05:00) Haiti" msgstr "" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "මධ්‍යම යුරෝපයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "මධ්‍යම යුරෝපයේ දිවා ආලෝකය වෙලාව" @@ -10544,10 +10556,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "මොරොක්කෝවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "මොරොක්කෝවේ දිවා ආලෝකය වෙලාව" @@ -10582,10 +10596,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "මධ්‍යම යුරෝපයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "මධ්‍යම යුරෝපයේ දිවා ආලෝකය වෙලාව" @@ -10594,10 +10610,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "ඉරානයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "ඉරානයේ දිවා ආලෝකය වෙලාව" @@ -10640,10 +10658,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "නැමීබියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "නැමීබියාවේ දිවා ආලෝකය වෙලාව" @@ -10652,10 +10672,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "ටොන්ගාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "ටොන්ගාවේ දිවා ආලෝකය වෙලාව" @@ -10664,6 +10686,7 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "කන්දේ සම්මත වෙලාව (මෙක්සිකෝව)" @@ -10676,10 +10699,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT සම්මත වෙලාව" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT දිවා ආලෝකය වෙලාව" @@ -10704,10 +10729,12 @@ msgid "(UTC+02:00) Juba" msgstr "" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "මධ්‍යම ආසියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "මධ්‍යම ආසියාවේ දිවා ආලෝකය වෙලාව" @@ -10732,10 +10759,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "අරාබි සම්මත වෙලාව" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "අරාබි දිවා ආලෝකය වෙලාව" @@ -10754,10 +10783,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "මාගඩාන් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "මාගඩාන් දිවා ආලෝකය වෙලාව" @@ -10766,6 +10797,7 @@ msgid "(UTC+11:00) Magadan" msgstr "" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "නිව්ෆවුන්ඩ්ලන්තයේ සම්මත වෙලාව" @@ -10794,6 +10826,7 @@ msgid "(UTC+02:00) Khartoum" msgstr "" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "බටහිර පැසිෆිකයේ සම්මත වෙලාව" @@ -10806,10 +10839,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "පැසිෆිකයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "පැසිෆිකයේ දිවා ආලෝකය වෙලාව" @@ -10818,10 +10853,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "අසර්බයිජානයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "අසර්බයිජානයේ දිවා ආලෝකය වෙලාව" @@ -10846,10 +10883,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "සැමෝවා සම්මත වෙලාව" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "සැමෝවා දිවා ආලෝකය වෙලාව" @@ -10858,10 +10897,12 @@ msgid "(UTC+13:00) Samoa" msgstr "" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "කලිනින්ග්රාඩ් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "කලිනින්ග්රාඩ් දිවා ආලෝකය වෙලාව" @@ -10882,10 +10923,12 @@ msgid "(UTC-08:00) Baja California" msgstr "" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "මැද පෙරදිගයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "මැද පෙරදිගයේ දිවා ආලෝකය වෙලාව" @@ -10894,10 +10937,12 @@ msgid "(UTC+02:00) Beirut" msgstr "" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "ටෝකියෝවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "ටෝකියෝවේ දිවා ආලෝකය වෙලාව" @@ -10906,10 +10951,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "රේඛිය දූපත් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "රේඛිය දූපත් දිවා ආලෝකය වෙලාව" @@ -10934,10 +10981,12 @@ msgid "(UTC-05:00) Havana" msgstr "" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "පෝර්දානයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "පෝර්දානයේ දිවා ආලෝකය වෙලාව" @@ -10946,10 +10995,12 @@ msgid "(UTC+02:00) Amman" msgstr "" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "මධ්‍යම සම්මත වෙලාව" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "මධ්‍යම දිවා ආලෝකය වෙලාව" @@ -10982,10 +11033,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "ඇසෝරස් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "ඇසෝරස් දිවා ආලෝකය වෙලාව" @@ -11016,10 +11069,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "ආර්ජන්ටිනාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "ආර්ජන්ටිනාවේ දිවා ආලෝකය වෙලාව" @@ -11060,10 +11115,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "මියන්මාරයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "මියන්මාරයේ දිවා ආලෝකය වෙලාව" @@ -11072,6 +11129,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "සම්බන්ධිත විශ්ව වෙලාව" @@ -11082,10 +11140,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "ඉන්දියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "ඉන්දියාවේ දිවා ආලෝකය වෙලාව" @@ -11094,10 +11154,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB සම්මත වෙලාව" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB දිවා ආලෝකය වෙලාව" @@ -11106,10 +11168,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "තුර්කියේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "තුර්කියේ දිවා ආලෝකය වෙලාව" @@ -11134,10 +11198,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "ෆිජියේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "ෆිජියේ දිවා ආලෝකය වෙලාව" @@ -11146,10 +11212,12 @@ msgid "(UTC+12:00) Fiji" msgstr "" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "මධ්‍යම කැනඩාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "මධ්‍යම කැනඩාවේ දිවා ආලෝකය වෙලාව" @@ -11174,10 +11242,12 @@ msgid "(UTC-07:00) Yukon" msgstr "" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "තායිපේයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "තායිපේයේ දිවා ආලෝකය වෙලාව" @@ -11186,10 +11256,12 @@ msgid "(UTC+08:00) Taipei" msgstr "" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "බටහිර යුරෝපයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "බටහිර යුරෝපයේ දිවා ආලෝකය වෙලාව" @@ -11198,10 +11270,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "මොන්ටෙවිඩෝ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "මොන්ටෙවිඩෝ දිවා ආලෝකය වෙලාව" @@ -11210,10 +11284,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "පකිස්ථානයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "පකිස්ථානයේ දිවා ආලෝකය වෙලාව" @@ -11238,10 +11314,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "කොකේසස් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "කොකේසස් දිවා ආලෝකය වෙලාව" @@ -11274,10 +11352,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "නැගෙනහිර සම්මත වේලාව" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "නැගෙනහිර දිවා ආලෝකය වේලාව" @@ -11318,6 +11398,7 @@ msgid "(UTC+02:00) Chisinau" msgstr "" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "මධ්‍යම සම්මත වෙලාව (මෙක්සිකෝව)" @@ -11346,10 +11427,12 @@ msgid "(UTC+04:00) Saratov" msgstr "" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "අත්ලාන්තිකයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "අත්ලාන්තිකයේ දිවා ආලෝකය වෙලාව" @@ -11358,10 +11441,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "කන්දේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "කන්දේ දිවා ආලෝකය වෙලාව" @@ -11414,10 +11499,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "ටැස්මේනියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "ටැස්මේනියාවේ දිවා ආලෝකය වෙලාව" @@ -11426,6 +11513,7 @@ msgid "(UTC+10:00) Hobart" msgstr "" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "මධ්‍යම ඇමරිකාවේ සම්මත වෙලාව" @@ -11448,6 +11536,7 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "එක්සත් ජනපදයේ කන්දේ සම්මත වෙලාව" @@ -11460,6 +11549,7 @@ msgid "(UTC-07:00) Arizona" msgstr "" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "දකුණු අප්රිකාවේ සම්මත වෙලාව" @@ -11472,6 +11562,7 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "මධ්යම ඕස්ට්රේලියාවේ සම්මත වෙලාව" @@ -11494,10 +11585,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "සම්බන්ධිත විශ්ව වෙලාව" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "ශ්‍රී ලංකාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "ශ්‍රී ලංකාවේ දිවා ආලෝකය වෙලාව" @@ -11506,10 +11599,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "ඇෆ්ඝනිස්ථානයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "ඇෆ්ඝනිස්ථානයේ දිවා ආලෝකය වෙලාව" @@ -11518,10 +11613,12 @@ msgid "(UTC+04:30) Kabul" msgstr "" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "යකුට්ස්ක් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "යකුට්ස්ක් දිවා ආලෝකය වෙලාව" @@ -11530,10 +11627,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "SA නැගෙනහිර සම්මත වෙලාව" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "SA නැගෙනහිර දිවා ආලෝකය වෙලාව" @@ -11542,10 +11641,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "අරාබි සම්මත වෙලාව" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "අරාබි දිවා ආලෝකය වෙලාව" @@ -11554,10 +11655,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "අරාබි ජාතිකයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "අරාබි ජාතිකයේ දිවා ආලෝකය වෙලාව" @@ -11582,10 +11685,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "රුසියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "රුසියාවේ දිවා ආලෝකය වෙලාව" @@ -11610,10 +11715,12 @@ msgid "(UTC+08:45) Eucla" msgstr "" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romance සම්මත වෙලාව" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romance දිවා ආලෝකය වෙලාව" @@ -11622,6 +11729,7 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "ඊකේටර්බින්බර්ග් සම්මත වෙලාව" @@ -11658,10 +11766,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "සිරියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "සිරියාවේ දිවා ආලෝකය වෙලාව" @@ -11682,10 +11792,12 @@ msgid "(UTC+09:30) Darwin" msgstr "" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "ග්රිනිච් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "ග්රිනිච් දිවා ආලෝකය වෙලාව" @@ -11694,10 +11806,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "උලාන්බාටර් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "උලාන්බාටර් දිවා ආලෝකය වෙලාව" @@ -11722,10 +11836,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "ඊශ්රායෙලයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "ඊශ්රායෙලයේ දිවා ආලෝකය වෙලාව" @@ -11734,10 +11850,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "බංගලාදේශයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "බංගලාදේශයේ දිවා ආලෝකය වෙලාව" @@ -11746,10 +11864,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "SA පැසිෆිකයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "SA පැසිෆිකයේ දිවා ආලෝකය වෙලාව" @@ -11758,10 +11878,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "බටහිර ආසියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "බටහිර ආසියාවේ දිවා ආලෝකය වෙලාව" @@ -11770,10 +11892,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "ඇලස්කාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "ඇලස්කාවේ දිවා ආලෝකය වෙලාව" @@ -11782,10 +11906,12 @@ msgid "(UTC-09:00) Alaska" msgstr "" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "පැරගුවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "පැරගුවේ දිවා ආලෝකය වෙලාව" @@ -11794,10 +11920,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Dateline සම්මත වෙලාව" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Dateline දිවා ආලෝකය වෙලාව" @@ -11806,10 +11934,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "ලිබියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "ලිබියාවේ දිවා ආලෝකය වෙලාව" @@ -11818,10 +11948,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "බහියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "බහියාවේ දිවා ආලෝකය වෙලාව" @@ -11830,10 +11962,12 @@ msgid "(UTC-03:00) Salvador" msgstr "" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "වෙනිසියුලාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "වෙනිසියුලාවේ දිවා ආලෝකය වෙලාව" @@ -11858,10 +11992,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "හවායි සම්මත වෙලාව" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "හවායි දිවා ආලෝකය වෙලාව" @@ -11870,10 +12006,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "SE ආසියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "SE ආසියාවේ දිවා ආලෝකය වෙලාව" @@ -11914,10 +12052,12 @@ msgid "(UTC+07:00) Hovd" msgstr "" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "නවසීලන්තයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "නවසීලන්තයේ දිවා ආලෝකය වෙලාව" @@ -11958,6 +12098,7 @@ msgid "(UTC+06:00) Omsk" msgstr "" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "මධ්‍යම බ්‍රසීලයේ සම්මත වෙලාව" @@ -11970,10 +12111,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "බෙලාරස් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "බෙලාරස් දිවා ආලෝකය වෙලාව" @@ -11982,10 +12125,12 @@ msgid "(UTC+03:00) Minsk" msgstr "" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "SA බටහිර සම්මත වෙලාව" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "SA බටහිර දිවා ආලෝකය වෙලාව" @@ -11994,10 +12139,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "ග්රීන්ලන්තයේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "ග්රීන්ලන්තයේ දිවා ආලෝකය වෙලාව" @@ -12006,10 +12153,12 @@ msgid "(UTC-03:00) Greenland" msgstr "" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "ඊස්ටර් දූපතේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "ඊස්ටර් දූපතේ දිවා ආලෝකය වෙලාව" @@ -12026,10 +12175,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "ඊජිප්තුවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "ඊජිප්තුවේ දිවා ආලෝකය වෙලාව" @@ -12054,10 +12205,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "මෞරිටුයුස් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "මෞරිටුයුස් දිවා ආලෝකය වෙලාව" @@ -12066,10 +12219,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "ලාඩිවොස්ටොක් සම්මත වෙලාව" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "ලාඩිවොස්ටොක් දිවා ආලෝකය වෙලාව" @@ -12078,10 +12233,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "සිංගප්පූරුවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "සිංගප්පූරුවේ දිවා ආලෝකය වෙලාව" @@ -12090,10 +12247,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "කොරියාවේ සම්මත වෙලාව" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "කොරියාවේ දිවා ආලෝකය වෙලාව" @@ -12118,6 +12277,7 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "නැගෙනහිර අප්රිකාවේ සම්මත වෙලාව" @@ -12130,10 +12290,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE සම්මත වෙලාව" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE දිවා ආලෝකය වෙලාව" @@ -12154,6 +12316,7 @@ msgid "(UTC-03:00) Brasilia" msgstr "" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "මධ්‍යම පැසිෆිකයේ සම්මත වෙලාව" @@ -12178,10 +12341,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "පැසිෆිකය SA සම්මත වෙලාව" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "පැසිෆිකය SA දිවා ආලෝකය වෙලාව" @@ -12202,6 +12367,7 @@ msgid "(UTC+10:00) Brisbane" msgstr "" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "බටහිර ඕස්ට්රේලියාවේ සම්මත වෙලාව" diff --git a/po/tr.po b/po/tr.po index bcaaa0aee7b..29c2b23b712 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10467,10 +10467,12 @@ msgid "Select Source" msgstr "Kaynak Seç" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Çin Standart Saati" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Çin Yaz Saati" @@ -10479,10 +10481,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "Kuzey Asya Standart Saati" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Kuzey Asya Yaz Saati" @@ -10491,10 +10495,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Gürcistan Standart Saati" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Gürcistan Yaz Saati" @@ -10513,10 +10519,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Nepal Standart Saati" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Nepal Yaz Saati" @@ -10529,6 +10537,7 @@ msgid "Cape Verde Standard Time" msgstr "Yeşil Burun Adaları Standart Saati" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Yeşil Burun Adaları Yaz Saati" @@ -10537,10 +10546,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Haiti Standart Saati" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Haiti Yaz Saati" @@ -10549,10 +10560,12 @@ msgid "(UTC-05:00) Haiti" msgstr "" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "Orta Avrupa Standart Saati" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "Orta Avrupa Yaz Saati" @@ -10561,10 +10574,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Fas Standart Saati" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Fas Yaz Saati" @@ -10599,10 +10614,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "Orta Avrupa Standart Saati" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "Orta Avrupa Yaz Saati" @@ -10611,10 +10628,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "İran Standart Saati" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "İran Yaz Saati" @@ -10623,10 +10642,12 @@ msgid "(UTC+03:30) Tehran" msgstr "" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Saint Pierre Standart Saati" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Saint Pierre Yaz Saati" @@ -10653,10 +10674,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Namibya Standart Saati" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Namibya Yaz Saati" @@ -10665,10 +10688,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "Tonga Standart Saati" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Tonga Yaz Saati" @@ -10677,10 +10702,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "Dağ Standart Saati (Meksika)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Dağ Yaz Saati (Meksika)" @@ -10689,10 +10716,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT Standart Saati" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT Yaz Saati" @@ -10717,10 +10746,12 @@ msgid "(UTC+02:00) Juba" msgstr "" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "Orta Asya Standart Saati" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Orta Asya Yaz Saati" @@ -10729,10 +10760,12 @@ msgid "(UTC+06:00) Astana" msgstr "" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "Lord Howe Standart Saati" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Lord Howe Yaz Saati" @@ -10741,10 +10774,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Arabistan Standart Saati" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Arabistan Yaz Saati" @@ -10763,10 +10798,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Magadan Standart Saati" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Magadan Yaz Saati" @@ -10775,10 +10812,12 @@ msgid "(UTC+11:00) Magadan" msgstr "" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Newfoundland Standart Saati" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Newfoundland Yaz Saati" @@ -10803,10 +10842,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "Batı Pasifik Standart Saati" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "Batı Pasifik Yaz Saati" @@ -10815,10 +10856,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Pasifik Standart Saati" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Pasifik Yaz Saati" @@ -10827,10 +10870,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "Azerbaycan Standart Saati" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Azerbaycan Yaz Saati" @@ -10839,10 +10884,12 @@ msgid "(UTC+04:00) Baku" msgstr "" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Macellan Standart Saati" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Macellan Yaz Saati" @@ -10851,10 +10898,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Samoa Standart Saati" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Samoa Yaz Saati" @@ -10863,10 +10912,12 @@ msgid "(UTC+13:00) Samoa" msgstr "" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "Kaliningrad Standart Saati" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Kaliningrad Yaz Saati" @@ -10879,6 +10930,7 @@ msgid "Pacific Standard Time (Mexico)" msgstr "Pasifik Standart Saati (Meksika)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "Pasifik Yaz Saati (Meksika)" @@ -10887,10 +10939,12 @@ msgid "(UTC-08:00) Baja California" msgstr "" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Ortadoğu Standart Saati" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Ortadoğu Yaz Saati" @@ -10899,10 +10953,12 @@ msgid "(UTC+02:00) Beirut" msgstr "" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Tokyo Standart Saati" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Tokyo Yaz Saati" @@ -10911,10 +10967,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Line Adaları Standart Saati" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Line Adaları Yaz Saati" @@ -10923,10 +10981,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Küba Standart Saati" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Küba Yaz Saati" @@ -10935,10 +10995,12 @@ msgid "(UTC-05:00) Havana" msgstr "" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Ürdün Standart Saati" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Ürdün Yaz Saati" @@ -10947,10 +11009,12 @@ msgid "(UTC+02:00) Amman" msgstr "" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Orta Amerika Standart Time" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Orta Amerika Yaz Saati" @@ -10983,10 +11047,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "Azor Adaları Standart Saati" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Azor Adaları Yaz Saati" @@ -10995,10 +11061,12 @@ msgid "(UTC-01:00) Azores" msgstr "" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "Kuzey Asya Doğu Standart Saati" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "Kuzey Asya Doğu Yaz Saati" @@ -11017,10 +11085,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Arjantin Standart Saati" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Arjantin Yaz Saati" @@ -11045,10 +11115,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "Markiz Adaları Standart Saati" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Markiz Adaları Yaz Saati" @@ -11057,10 +11129,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Myanmar Standart Saati" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Myanmar Yaz Saati" @@ -11069,6 +11143,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Eşgüdümlü Evrensel Saat" @@ -11079,10 +11154,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Hindistan Standart Saati" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Hindistan Yaz Saati" @@ -11091,10 +11168,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB Standart Saati" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB Yaz Saati" @@ -11103,10 +11182,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Türkiye Standart Saati" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Türkiye Yaz Saati" @@ -11131,10 +11212,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Fiji Standart Saati" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Fiji Yaz Saati" @@ -11143,10 +11226,12 @@ msgid "(UTC+12:00) Fiji" msgstr "" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "Orta Kanada Standart Saati" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Orta Kanada Yaz Saati" @@ -11171,10 +11256,12 @@ msgid "(UTC-07:00) Yukon" msgstr "" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Taipei Standart Saati" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Taipei Yaz Saati" @@ -11183,10 +11270,12 @@ msgid "(UTC+08:00) Taipei" msgstr "" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "Batı Avrupa Standart Saati" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Batı Avrupa Yaz Saati" @@ -11195,10 +11284,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Montevideo Standart Saati" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Montevideo Yaz Saati" @@ -11207,10 +11298,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Pakistan Standart Saati" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Pakistan Yaz Saati" @@ -11235,10 +11328,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Kafkasya Standart Saati" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Kanarya Yaz Saati" @@ -11247,10 +11342,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "Doğu Avustralya Standart Saati" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "Doğu Avustralya Yaz Saati" @@ -11259,10 +11356,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "Kuzey Orta Asya Standart Saati" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "Kuzey Orta Asya Yaz Saati" @@ -11271,10 +11370,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Doğu Amerika Standart Saati" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Doğu Amerika Yaz Saati" @@ -11343,10 +11444,12 @@ msgid "(UTC+04:00) Saratov" msgstr "" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Atlas Okyanusu Standart Saati" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Atlas Okyanusu Yaz Saati" @@ -11355,10 +11458,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Dağlık Amerika Standart Saati" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Dağlık Amerika Yaz Saati" @@ -11367,10 +11472,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "Doğu Amerika Standart Saati" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "Doğu Amerika Yaz Saati" @@ -11395,10 +11502,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "Kuzey Kore Standart Saati" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Kuzey Kore Yaz Saati" @@ -11407,10 +11516,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Tazmanya Standart Saati" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Tazmanya Yaz Saati" @@ -11419,10 +11530,12 @@ msgid "(UTC+10:00) Hobart" msgstr "" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "Orta Amerika Standart Saati" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "Orta Amerika Yaz Saati" @@ -11441,10 +11554,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "Dağlık Amerika Standart Saati" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "Dağlık Amerika Yaz Saati" @@ -11453,10 +11568,12 @@ msgid "(UTC-07:00) Arizona" msgstr "" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "Güney Afrika Standart Saati" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "Güney Afrika Yaz Saati" @@ -11465,10 +11582,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "Orta Avustralya Standart Saati" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Orta Avustralya Yaz Saati" @@ -11487,10 +11606,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "Eşgüdümlü Evrensel Saat" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Sri Lanka Standart Saati" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Sri Lanka Yaz Saati" @@ -11499,10 +11620,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Afganistan Standart Saati" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Afganistan Yaz Saati" @@ -11511,10 +11634,12 @@ msgid "(UTC+04:30) Kabul" msgstr "" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Yakutsk Standart Saati" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Yakutsk Yaz Saati" @@ -11527,6 +11652,7 @@ msgid "SA Eastern Standard Time" msgstr "Güney Amerika Doğu Standart Saati" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "Güney Amerika Doğu Yaz Saati" @@ -11535,10 +11661,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Arap Standart Saati" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Arap Yaz Saati" @@ -11547,10 +11675,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Arabistan Standart Saati" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Arabistan Yaz Saati" @@ -11559,10 +11689,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Tocantins Standart Saati" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Tocantins Yaz Saati" @@ -11571,10 +11703,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Rusya Standart Saati" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Rusya Yaz Saati" @@ -11587,6 +11721,7 @@ msgid "Aus Central W. Standard Time" msgstr "Orta Batı Avustralya Standart Saati" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "Orta Batı Avustralya Yaz Saati" @@ -11595,10 +11730,12 @@ msgid "(UTC+08:45) Eucla" msgstr "" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Romanya Standart Saati" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Romanya Yaz Saati" @@ -11607,10 +11744,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Ekaterinburg Standart Saati" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Ekaterinburg Yaz Saati" @@ -11643,10 +11782,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Suriye Standart Saati" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Suriye Yaz Saati" @@ -11655,10 +11796,12 @@ msgid "(UTC+02:00) Damascus" msgstr "" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "Orta Avustralya Standart Saati" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Orta Avustralya Yaz Saati" @@ -11667,10 +11810,12 @@ msgid "(UTC+09:30) Darwin" msgstr "" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Greenwich Standart Saati" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Greenwich Yaz Saati" @@ -11679,10 +11824,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Ulan Bator Standart Saati" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Ulan Bator Yaz Saati" @@ -11707,10 +11854,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "İsrail Standart Saati" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "İsrail Yaz Saati" @@ -11719,10 +11868,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Bangladeş Standart Saati" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Bangladeş Yaz Saati" @@ -11735,6 +11886,7 @@ msgid "SA Pacific Standard Time" msgstr "Güney Amerika Pasifik Standart Saati" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "Güney Amerika Pasifik Yaz Saati" @@ -11743,10 +11895,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "Batı Asya Standart Saati" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Batı Asya Yaz Saati" @@ -11755,10 +11909,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Alaska Standart Saati" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Alaska Yaz Saati" @@ -11767,10 +11923,12 @@ msgid "(UTC-09:00) Alaska" msgstr "" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Paraguay Standart Saati" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Paraguay Yaz Saati" @@ -11791,10 +11949,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Libya Standart Saati" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Libya Yaz Saati" @@ -11803,10 +11963,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Bahia Standart Saati" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Bahia Yaz Saati" @@ -11815,10 +11977,12 @@ msgid "(UTC-03:00) Salvador" msgstr "" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Venezuela Standart Saati" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Venezuela Yaz Saati" @@ -11827,10 +11991,12 @@ msgid "(UTC-04:00) Caracas" msgstr "" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Bougainville Standart Saati" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Bougainville Yaz Saati" @@ -11839,10 +12005,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Hawaii Standart Saati" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Hawaii Yaz Saati" @@ -11851,10 +12019,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "Güneydoğu Asya Standart Saati" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "Güneydoğu Asya Yaz Saati" @@ -11895,10 +12065,12 @@ msgid "(UTC+07:00) Hovd" msgstr "" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Yeni Zelanda Standart Saati" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Yeni Zelanda Yaz Saati" @@ -11907,10 +12079,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Aleut Adaları Standart Saati" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Aleut Adaları Yaz Saati" @@ -11935,10 +12109,12 @@ msgid "(UTC+06:00) Omsk" msgstr "" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "Orta Brezilya Standart Saati" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "Orta Brezilya Yaz Saati" @@ -11947,10 +12123,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Belarus Standart Saati" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Belarus Yaz Saati" @@ -11963,6 +12141,7 @@ msgid "SA Western Standard Time" msgstr "Güney Amerika Batı Standart Saati" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "Güney Amerika Batı Yaz Saati" @@ -11971,10 +12150,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Grönland Standart Saati" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Grönland Yaz Saati" @@ -11983,10 +12164,12 @@ msgid "(UTC-03:00) Greenland" msgstr "" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Paskalya Adası Standart Saati" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Paskalya Adası Yaz Saati" @@ -12003,10 +12186,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Mısır Standart Saati" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Mısır Yaz Saati" @@ -12027,10 +12212,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Mauritius Standart Saati" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Mauritius Yaz Saati" @@ -12039,10 +12226,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Vladivostok Standart Saati" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Vladivostok Yaz Saati" @@ -12051,10 +12240,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Singapur Standart Saati" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Singapur Yaz Saati" @@ -12063,10 +12254,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Kore Standart Saati" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Kore Yaz Saati" @@ -12075,10 +12268,12 @@ msgid "(UTC+09:00) Seoul" msgstr "" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Chatham Adaları Standart Saati" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Chatham Adaları Yaz Saati" @@ -12087,10 +12282,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "Doğu Afrika Standart Saati" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "Doğu Afrika Yaz Saati" @@ -12115,6 +12312,7 @@ msgid "E. South America Standard Time" msgstr "Güney Amerika Doğu Standart Saati" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "Güney Amerika Doğu Yaz Saati" @@ -12123,10 +12321,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "Orta Pasifik Standart Saati" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "Orta Pasifik Yaz Saati" @@ -12135,10 +12335,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "Orta Afrika Batı Standart Saati" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "Orta Afrika Batı Yaz Saati" @@ -12151,6 +12353,7 @@ msgid "Pacific SA Standard Time" msgstr "Güney Amerika Pasifik Standart Saati" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Güney Amerika Batı Yaz Saati" @@ -12159,10 +12362,12 @@ msgid "(UTC-04:00) Santiago" msgstr "" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "Doğu Avustralya Standart Saati" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "Doğu Avustralya Yaz Saati" @@ -12171,10 +12376,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "Batı Avustralya Standart Saati" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "Batı Avustralya Yaz Saati" diff --git a/po/uk.po b/po/uk.po index 67bfc5e12a5..2f161c7356d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -10528,10 +10528,12 @@ msgid "Select Source" msgstr "Виберіть джерело" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "Китайський стандартний час" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "Китайський літній час" @@ -10544,6 +10546,7 @@ msgid "North Asia Standard Time" msgstr "Північноазіатський стандартний час" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "Північноазіатський літній час" @@ -10552,10 +10555,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) Красноярськ" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "Грузинський стандартний час" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "Грузинський літній час" @@ -10564,6 +10569,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) Тбілісі" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10572,10 +10578,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) Всесвітній координований час+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "Непальський стандартний час" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "Непальський літній час" @@ -10584,10 +10592,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) Катманду" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "Стандартний час Кабо-Верде" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "Літній час Кабо-Верде" @@ -10596,10 +10606,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) Острів Кабо-Верде" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "Стандартний час Гаїті" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "Літній час Гаїті" @@ -10620,10 +10632,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) Сараєво, Скоп’є, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "Стандартний час Марокко" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "Літній час Марокко" @@ -10632,6 +10646,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) Касабланка" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10640,10 +10655,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) Всесвітній координований час-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "Алтайський стандартний час" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "Алтайський літній час" @@ -10664,10 +10681,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Любляна, Прага" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "Іранський стандартний час" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "Іранський літній час" @@ -10676,10 +10695,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "Стандартний час Сен-П'єра" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "Літній час Сен-П'єра" @@ -10688,10 +10709,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) Сен-П'єр і Мікелон" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "Сан-Томе, стандартний час" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "Сан-Томе, літній час" @@ -10700,10 +10723,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) Сан-Томе" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "Стандартний час Намібії" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "Літній час Намібії" @@ -10716,6 +10741,7 @@ msgid "Tonga Standard Time" msgstr "Стандартний час Королівства Тонга" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "Літній час Королівства Тонга" @@ -10728,6 +10754,7 @@ msgid "Mountain Standard Time (Mexico)" msgstr "Гірський стандартний час (Мексика)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "Гірський літній час (Мексика)" @@ -10736,10 +10763,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) Чихуахуа, Ла-Пас, Мазатлан" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT стандартний час" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT літній час" @@ -10752,6 +10781,7 @@ msgid "South Sudan Standard Time" msgstr "Стандартний час Південного Судану" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "Літній час Південного Судану" @@ -10764,6 +10794,7 @@ msgid "Central Asia Standard Time" msgstr "Середньоазіатський стандартний час" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "Середньоазіатський літній час" @@ -10776,6 +10807,7 @@ msgid "Lord Howe Standard Time" msgstr "Стандартний час острова Лорд-Хау" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "Літній час острова Лорд-Хау" @@ -10784,10 +10816,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Острів Лорд-Хау" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "Арабський літній час" @@ -10796,6 +10830,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) Багдад" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10804,10 +10839,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) Всесвітній координований час+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "Магаданський стандартний час" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "Магаданський літній час" @@ -10816,10 +10853,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) Магадан" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "Стандартний час Ньюфаундленда" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "Літній час Ньюфаундленда" @@ -10828,10 +10867,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) Ньюфаундленд" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "Судан, стандартний час" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "Судан, літній час" @@ -10852,10 +10893,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) Гуам, Порт-Морсбі" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "Тихоокеанський літній час" @@ -10868,6 +10911,7 @@ msgid "Azerbaijan Standard Time" msgstr "Азербайджанський стандартний час" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "Азербайджанський літній час" @@ -10876,10 +10920,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) Баку" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "Стандартний час Магальянеса" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "Літній час Магальянеса" @@ -10888,10 +10934,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) Пунта-Аренас" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "Стандартний час Самоа" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "Літній час Самоа" @@ -10904,6 +10952,7 @@ msgid "Kaliningrad Standard Time" msgstr "Калінінградський стандартний час" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "Калінінградський літній час" @@ -10924,10 +10973,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Баха-Каліфорнія" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "Близькосхідний стандартний час" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "Близькосхідний літній час" @@ -10936,10 +10987,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "Токійський стандартний час" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "Токійський літній час" @@ -10948,10 +11001,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Осака, Саппоро, Токіо" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "Стандартний час островів Лайн" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "Літній час островів Лайн" @@ -10960,10 +11015,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) Острів Кіритіматі" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "Кубинський стандартний час" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "Кубинський літній час" @@ -10972,10 +11029,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "Йорданський стандартний час" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "Йорданський літній час" @@ -10984,10 +11043,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "Центральний стандартний час" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "Центральний літній час" @@ -11004,10 +11065,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) Іжевськ, Самара" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "Волгоград, стандартний час" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "Волгоград, літній час" @@ -11020,6 +11083,7 @@ msgid "Azores Standard Time" msgstr "Стандартний час Азорських островів" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "Літній час Азорських островів" @@ -11040,6 +11104,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) Іркутськ" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -11048,10 +11113,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) Всесвітній координований час-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "Аргентинський стандартний час" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "Аргентинський літній час" @@ -11060,10 +11127,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Буенос-Айрес" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "Теркс і Кайкос, стандартний час" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "Теркс і Кайкос, літній час" @@ -11076,6 +11145,7 @@ msgid "Marquesas Standard Time" msgstr "Стандартний час Маркізьких островів" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "Літній час Маркізьких островів" @@ -11084,10 +11154,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) Маркізські острови" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "Стандартний час М'янми" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "Літній час М'янми" @@ -11096,6 +11168,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) Янгон (Рангун)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "Всесвітній координований час" @@ -11104,10 +11177,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) Всесвітній координований час" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "Індійський стандартний час" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "Індійський літній час" @@ -11116,10 +11191,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) Ченнаї, Колката, Мумбаї, Нью-Делі" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB стандартний час" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB літній час" @@ -11128,10 +11205,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) Афіни, Бухарест" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "Турецький стандартний час" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "Турецький літній час" @@ -11140,10 +11219,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "Астраханський стандартний час" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "Астраханський літній час" @@ -11152,10 +11233,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) Астрахань, Ульяновськ" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "Стандартний час Фіджі" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "Літній час Фіджі" @@ -11168,6 +11251,7 @@ msgid "Canada Central Standard Time" msgstr "Центральний стандартний час Канади" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "Центральний літній час Канади" @@ -11176,10 +11260,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) Саскачеван" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "Юкон, стандартний час" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "Юкон, літній час" @@ -11188,10 +11274,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "Тайбейський стандартний час" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "Тайбейський літній час" @@ -11204,6 +11292,7 @@ msgid "W. Europe Standard Time" msgstr "Західноєвропейський стандартний час" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "Західноєвропейський літній час" @@ -11212,10 +11301,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) Амстердам, Берлін, Берн, Рим, Стокгольм, Відень" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "Стандартний час Монтевідео" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "Літній час Монтевідео" @@ -11224,10 +11315,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) Монтевідео" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "Пакистанський стандартний час" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "Пакистанський літній час" @@ -11236,10 +11329,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) Ісламабад, Карачі" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "Томськ, стандартний час" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "Томськ, літній час" @@ -11248,10 +11343,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) Томськ" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "Кавказький стандартний час" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "Кавказький літній час" @@ -11260,10 +11357,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) Єреван" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "AUS східний стандартний час" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "AUS східний літній час" @@ -11284,10 +11383,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) Новосибірськ" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "Східний стандартний час" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "Східний літній час" @@ -11296,10 +11397,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) Східний час (США та Канада)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "Забайкальський стандартний час" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "Забайкальський літній час" @@ -11312,6 +11415,7 @@ msgid "E. Europe Standard Time" msgstr "Східноєвропейський стандартний час" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "Східноєвропейський літній час" @@ -11332,10 +11436,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) Гвадалахара, Мехіко, Монтеррей" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "Саратовський стандартний час" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "Саратовський літній час" @@ -11344,10 +11450,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "Атлантичний стандартний час" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "Атлантичний літній час" @@ -11356,10 +11464,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) Атлантичний час (Канада)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "Гірський стандартний час" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "Гірський літній час" @@ -11368,10 +11478,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) Гірський час (США та Канада)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "Східний стандартний час США" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "Східний літній час США" @@ -11380,10 +11492,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) Індіана (Схід)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "Сахалінський стандартний час" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "Сахалінський літній час" @@ -11396,6 +11510,7 @@ msgid "North Korea Standard Time" msgstr "Північнокорейський стандартний час" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "Північнокорейський літній час" @@ -11404,10 +11519,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) Пхеньян" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "Тасманійський стандартний час" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "Тасманійський літній час" @@ -11428,6 +11545,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) Центральна Америка" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11464,6 +11582,7 @@ msgid "Cen. Australia Standard Time" msgstr "Цен. Австралійський стандартний час" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "Цен. Австралійський літній час" @@ -11472,6 +11591,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) Аделаїда" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11480,10 +11600,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) Всесвітній координований час-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "Стандартний час Шрі-Ланки" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "Літній час Шрі-Ланки" @@ -11492,10 +11614,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) Шрі-Джаяварденепура" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "Стандартний час в Афганістані" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "Літній час в Афганістані" @@ -11504,10 +11628,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "Якутський стандартний час" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "Якутський літній час" @@ -11516,10 +11642,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Якутськ" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "SA східний стандартний час" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "SA східний літній час" @@ -11528,10 +11656,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) Кайєнна, Форталеза" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "Арабський літній час" @@ -11540,10 +11670,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) Кувейт, Ер-Ріяд" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "Арабський стандартний час" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "Арабський літній час" @@ -11552,10 +11684,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) Абу-Дабі, Маскат" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "Стандартний час Токантінс" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "Літній час Токантінс" @@ -11564,10 +11698,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) Арагуаіна" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "Російський стандартний час" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "Російський літній час" @@ -11576,10 +11712,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Москва, Санкт-Петербург" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "Aus Central W. стандартний час" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "Aus Central W. літній час" @@ -11588,10 +11726,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) Евкла" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "Романський стандартний час" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "Романський літній час" @@ -11600,10 +11740,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Париж" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "Стандартний час Єкатеринбурга" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "Літній час Єкатеринбурга" @@ -11632,10 +11774,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) Газа, Хеврон" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "Стандартний час Сирії" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "Літній час Сирії" @@ -11644,10 +11788,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Дамаск" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "Центральний стандартний час AUS" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "Центральний літній час AUS" @@ -11656,10 +11802,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) Дарвін" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "Стандартний час за Грінвічем" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "Літній час за Грінвічем" @@ -11668,10 +11816,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) Монровія, Рейк'явік" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "Стандартний час Улан-Батора" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "Літній час Улан-Батора" @@ -11680,10 +11830,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) Улан-Батор" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "Норфолк, стандартний час" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "Норфолк, літній час" @@ -11692,10 +11844,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) Острів Норфолк" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "Стандартний час Ізраїлю" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "Літній час Ізраїлю" @@ -11704,10 +11858,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) Єрусалим" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "Стандартний час Бангладеш" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "Літній час Бангладеш" @@ -11720,6 +11876,7 @@ msgid "SA Pacific Standard Time" msgstr "SA Тихоокеанський стандартний час" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "SA Тихоокеанський літній час" @@ -11732,6 +11889,7 @@ msgid "West Asia Standard Time" msgstr "Західноазіатський стандартний час" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "Західноазіатський літній час" @@ -11740,10 +11898,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) Ашхабад, Ташкент" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "Аляскинський стандартний час" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "Аляскинський літній час" @@ -11752,10 +11912,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) Аляска" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "Парагвайський стандартний час" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "Парагвайський літній час" @@ -11764,10 +11926,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Асунсьйон" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "Стандартний час у Дателіні" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "Літній час у Дателіні" @@ -11776,10 +11940,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) Міжнародна лінія дат на захід" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "Лівійський стандартний час" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "Лівійський літній час" @@ -11788,10 +11954,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) Тріполі" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "Стандартний час Баїя" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "Літній час Баїя" @@ -11800,10 +11968,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "Стандартний час Венесуели" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "Літній час Венесуели" @@ -11812,10 +11982,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) Каракас" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "Стандартний час Бугенвіля" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "Літній час Бугенвіля" @@ -11824,10 +11996,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) Острів Бугенвіль" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "Гавайський стандартний час" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "Гавайський літній час" @@ -11848,10 +12022,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) Бангкок, Ханой, Джакарта" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "Кизилорда, стандартний час" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "Кизилорда, літній час" @@ -11864,6 +12040,7 @@ msgid "W. Mongolia Standard Time" msgstr "Західна Монголія, стандартний час" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "Західна Монголія, літній час" @@ -11872,10 +12049,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) Ховд" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "Стандартний час Нової Зеландії" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "Літній час Нової Зеландії" @@ -11884,10 +12063,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) Окленд, Веллінгтон" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "Алеутський стандартний час" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "Алеутський літній час" @@ -11896,10 +12077,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) Алеутські острови" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "Омський стандартний час" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "Омський літній час" @@ -11920,10 +12103,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) Куяба" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "Білоруський стандартний час" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "Білоруський літній час" @@ -11932,10 +12117,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Мінськ" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "SA Західний стандартний час" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "SA Західний літній час" @@ -11944,10 +12131,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) Джорджтаун, Ла-Пас, Манаус, Сан-Хуан" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "Стандартний час Гренландії" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "Літній час Гренландії" @@ -11956,10 +12145,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Гренландія" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "Стандартний час острова Пасхи" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "Літній час острова Пасхи" @@ -11976,10 +12167,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) Чокурдах" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "Єгипетський стандартний час" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "Єгипетський літній час" @@ -11992,6 +12185,7 @@ msgid "Eastern Standard Time (Mexico)" msgstr "Східний стандартний час (Мексика)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "Східний літній час (Мексика)" @@ -12000,10 +12194,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) Четумал" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "Стандартний час Маврикія" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "Літній час Маврикія" @@ -12012,10 +12208,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) Порт-Луї" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "Стандартний час Владивостока" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "Літній час Владивостока" @@ -12024,10 +12222,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "Стандартний час Сінгапуру" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "Літній час Сінгапуру" @@ -12036,10 +12236,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) Куала-Лумпур, Сінгапур" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "Корейський стандартний час" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "Корейський літній час" @@ -12048,10 +12250,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Сеул" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "Стандартний час островів Чатем" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "Літній час островів Чатем" @@ -12060,10 +12264,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Острови Чатем" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "E. Стандартний час в Африці" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "E. Літній час в Африці" @@ -12072,10 +12278,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) Найробі" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "Стандартний час FLE" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "Літній час FLE" @@ -12088,6 +12296,7 @@ msgid "E. South America Standard Time" msgstr "E. Стандартний час Південної Америки" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "E. Літній час Південної Америки" @@ -12124,6 +12333,7 @@ msgid "Pacific SA Standard Time" msgstr "Тихоокеанський стандартний час SA" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "Тихоокеанський літній час SA" @@ -12132,10 +12342,12 @@ msgid "(UTC-04:00) Santiago" msgstr "" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "E. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "E. Літній час в Австралії" @@ -12144,10 +12356,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "В. Стандартний час в Австралії" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "В. Літній час в Австралії" diff --git a/po/zh_CN.po b/po/zh_CN.po index 41a216a2834..fa9a8e469f0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10274,10 +10274,12 @@ msgid "Select Source" msgstr "选择来源" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "中国标准时间" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "中国夏令时" @@ -10286,10 +10288,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) 北京，重庆，香港，乌鲁木齐" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "北亚标准时间" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "北亚夏令时" @@ -10298,10 +10302,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) 雅茨克" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "格鲁吉亚标准时间" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "格鲁吉亚夏令时" @@ -10310,6 +10316,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) 第比利斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10318,10 +10325,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) 协调世界时+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "尼泊尔标准时间" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "尼泊尔夏令时" @@ -10330,10 +10339,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) 加德满都" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "佛得角标准时间" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "佛得角夏令时" @@ -10342,10 +10353,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) 佛得角群岛" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "海地标准时间" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "海地夏令时" @@ -10354,10 +10367,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "中欧标准时间" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "中欧夏令时" @@ -10366,10 +10381,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) 萨拉热窝，斯科普里，华沙，萨格勒布" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "摩洛哥标准时间" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "摩洛哥夏令时" @@ -10378,6 +10395,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) 卡萨布兰卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10386,10 +10404,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) 协调世界时-8" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "阿尔泰标准时间" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "阿尔泰夏令时" @@ -10398,10 +10418,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) 巴尔瑙尔，戈尔诺-阿尔泰斯克" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "中欧标准时间" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "中欧夏令时" @@ -10410,10 +10432,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) 贝尔格莱德，布拉迪斯拉发，布达佩斯，卢布尔雅那，布拉格" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "伊朗标准时间" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "伊朗夏令时" @@ -10422,10 +10446,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) 德黑兰" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "圣皮埃尔标准时间" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "圣皮埃尔夏令时" @@ -10434,10 +10460,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) 圣皮埃尔和密克隆" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "圣多美标准时间" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "圣多美夏令时" @@ -10446,10 +10474,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) 圣多美" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "纳米比亚标准时间" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "纳米比亚夏令时" @@ -10458,10 +10488,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) 温得和克" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "汤加标准时间" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "汤加夏令时" @@ -10470,10 +10502,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) 努库阿洛法" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "山地标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "山地夏令时 (墨西哥)" @@ -10482,10 +10516,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) 奇瓦瓦，拉巴斯，马萨特兰" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "格林尼治标准时间" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "格林尼治夏令时" @@ -10494,10 +10530,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 柏林，爱丁堡，里斯本，伦敦" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "南苏丹标准时间" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "南苏丹夏令时" @@ -10506,10 +10544,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "中亚标准时间" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "中亚夏令时" @@ -10518,10 +10558,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) 阿斯塔纳" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "豪勋爵标准时间" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "豪勋爵夏令时" @@ -10530,10 +10572,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) 豪勋爵岛" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "阿拉伯标准时间" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "阿拉伯夏令时" @@ -10542,6 +10586,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) 巴格达" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10550,10 +10595,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) 协调世界时+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "马加丹标准时间" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "马加丹夏令时" @@ -10562,10 +10609,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) 马加丹" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "纽芬兰标准时间" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "纽芬兰夏令时" @@ -10574,10 +10623,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) 纽芬兰" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "苏丹标准时间" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "苏丹夏令时" @@ -10586,10 +10637,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "西太平洋标准时间" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "西太平洋夏令时" @@ -10598,10 +10651,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) 关岛，莫尔兹比港" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "太平洋标准时间" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "太平洋夏令时" @@ -10610,10 +10665,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) 太平洋时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "阿塞拜疆标准时间" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "阿塞拜疆夏令时" @@ -10622,10 +10679,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) 巴库" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "麦哲伦标准时间" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "麦哲伦夏令时" @@ -10634,10 +10693,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) 蓬塔阿雷纳斯" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "萨摩亚标准时间" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "萨摩亚夏令时" @@ -10646,10 +10707,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) 萨摩亚" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "加里宁格勒标准时间" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "加里宁格勒夏令时" @@ -10658,10 +10721,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) 加里宁格勒" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "太平洋标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "太平洋夏令时 (墨西哥)" @@ -10670,10 +10735,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) 下加利福尼亚" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "中东标准时间" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "中东夏令时" @@ -10682,10 +10749,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) 贝鲁特" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "东京标准时间" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "东京夏令时" @@ -10694,10 +10763,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) 大阪，札幌，东京" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "莱恩群岛标准时间" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "莱恩群岛夏令时" @@ -10706,10 +10777,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) 圣诞岛" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "古巴标准时间" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "古巴夏令时" @@ -10718,10 +10791,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) 哈瓦拉" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "约旦标准时间" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "约旦夏令时" @@ -10730,10 +10805,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "中部标准时间" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "中部夏令时" @@ -10742,6 +10819,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) 中部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "俄罗斯时区 3" @@ -10750,10 +10828,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) 伊热夫斯克，萨马拉" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "伏尔加格勒标准时间" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "伏尔加格勒夏令时" @@ -10762,10 +10842,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) 伏尔加格勒" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "亚速尔群岛标准时间" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "亚速尔群岛夏令时" @@ -10774,10 +10856,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) 亚速尔群岛" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "北亚东部标准时间" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "北亚东部夏令时" @@ -10786,6 +10870,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) 伊尔库茨克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10794,10 +10879,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) 协调世界时-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "阿根廷标准时间" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "阿根廷夏令时" @@ -10806,10 +10893,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) 布宜诺斯艾利斯市" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "特克斯和凯科斯群岛标准时间" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "特克斯和凯科斯群岛夏令时" @@ -10818,10 +10907,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) 特克斯和凯科斯群岛" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "马克萨斯标准时间" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "马克萨斯夏令时" @@ -10830,10 +10921,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) 马克萨斯群岛" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "缅甸标准时间" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "缅甸夏令时" @@ -10842,6 +10935,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "协调世界时" @@ -10850,10 +10944,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) 协调世界时" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "印度标准时间" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "印度夏令时" @@ -10862,10 +10958,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) 马德拉斯，加尔各答，孟买，新德里" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB 标准时间" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB 夏令时" @@ -10874,10 +10972,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "土耳其标准时间" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "土耳其夏令时" @@ -10886,10 +10986,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) 伊斯坦布尔" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "阿斯特拉罕标准时间" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "阿斯特拉罕夏令时" @@ -10898,10 +11000,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) 阿斯特拉罕，乌里扬诺夫斯克" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "斐济标准时间" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "斐济夏令时" @@ -10910,10 +11014,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) 斐济" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "加拿大中部标准时间" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "加拿大中部夏令时" @@ -10922,10 +11028,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) 萨斯喀彻温省" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "育空标准时间" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "育空夏令时" @@ -10934,10 +11042,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "台北标准时间" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "台北夏令时" @@ -10946,10 +11056,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "西欧标准时间" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "西欧夏令时" @@ -10958,10 +11070,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯尔尼，罗马，斯德哥尔摩，维也纳" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "蒙得维的亚标准时间" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "蒙得维的亚夏令时" @@ -10970,10 +11084,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) 蒙得维的亚" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "巴基斯坦标准时间" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "巴基斯坦夏令时" @@ -10982,10 +11098,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) 伊斯兰堡，卡拉奇" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "托木斯克标准时间" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "托木斯克夏令时" @@ -10994,10 +11112,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "高加索标准时间" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "高加索夏令时" @@ -11006,10 +11126,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) 埃里温" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "澳大利亚东部标准时间" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "澳大利亚东部夏令时" @@ -11018,10 +11140,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) 堪培拉，墨尔本，悉尼" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "中北亚标准时间" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "中北亚夏令时" @@ -11030,10 +11154,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) 新西伯利亚" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "东部标准时间" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "东部夏令时" @@ -11042,10 +11168,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) 东部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "外贝加尔标准时间" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "外贝加尔夏令时" @@ -11054,10 +11182,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "东欧标准时间" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "东欧夏令时" @@ -11066,10 +11196,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) 基希讷乌" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "中部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "中部夏令时 (墨西哥)" @@ -11078,10 +11210,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) 瓜达拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "萨拉托夫标准时间" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "萨拉托夫夏令时" @@ -11090,10 +11224,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) 萨拉托夫" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "大西洋标准时间" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "大西洋夏令时" @@ -11102,10 +11238,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) 大西洋时间 (加拿大)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "山地标准时间" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "山地夏令时" @@ -11114,10 +11252,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) 山地时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "美国东部标准时间" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "美国东部夏令时" @@ -11126,10 +11266,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) 印第安那 (东部)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "萨哈林加标准时间" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "萨哈林夏令时" @@ -11138,10 +11280,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) 萨哈林" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "朝鲜标准时间" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "朝鲜夏令时" @@ -11150,10 +11294,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "塔斯马尼亚标准时间" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "塔斯马尼亚夏令时" @@ -11162,10 +11308,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) 霍巴特" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "中美洲标准时间" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "中美洲夏令时" @@ -11174,6 +11322,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11182,10 +11331,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) 协调世界时-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "美国山地标准时间" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "美国山地夏令时" @@ -11194,10 +11345,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) 亚利桑那" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "南非标准时间" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "南非夏令时" @@ -11206,10 +11359,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) 哈拉雷，比勒陀利亚" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "澳大利亚中部标准时间" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "澳大利亚中部夏令时" @@ -11218,6 +11373,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) 阿德莱德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11226,10 +11382,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) 协调世界时-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "斯里兰卡标准时间" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "斯里兰卡夏令时" @@ -11238,10 +11396,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) 斯里加亚渥登普拉" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "阿富汗标准时间" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "阿富汗夏令时" @@ -11250,10 +11410,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) 喀布尔" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "雅库次克标准时间" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "雅库次克夏令时" @@ -11262,10 +11424,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) 雅库茨克" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "南美东部标准时间" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "南美东部夏令时" @@ -11274,10 +11438,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) 卡宴，福塔雷萨" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "阿拉伯标准时间" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "阿拉伯夏令时" @@ -11286,10 +11452,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) 科威特，利雅得" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "阿拉伯标准时间" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "阿拉伯夏令时" @@ -11298,10 +11466,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) 阿布扎比，马斯喀特" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "托坎廷斯标准时间" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "托坎廷斯夏令时" @@ -11310,10 +11480,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) 阿拉瓜伊纳" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "俄罗斯标准时间" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "俄罗斯夏令时" @@ -11322,10 +11494,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) 莫斯科，圣彼得堡" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "澳大利亚中西部标准时间" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "澳大利亚中西部夏令时" @@ -11334,10 +11508,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "罗曼标准时间" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "罗曼夏令时" @@ -11346,10 +11522,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) 布鲁塞尔，哥本哈根，马德里，巴黎" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "叶卡捷琳堡标准时间" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "叶卡捷琳堡夏令时" @@ -11358,6 +11536,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) 叶卡特琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "俄罗斯时区 11" @@ -11366,10 +11545,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) 阿纳德尔，彼得罗巴甫洛夫斯克-堪察加" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "西岸标准时间" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "西岸夏令时" @@ -11378,10 +11559,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) 加沙，希伯仑" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "叙利亚标准时间" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "叙利亚夏令时" @@ -11390,10 +11573,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) 大马士革" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "澳大利亚中部标准时间" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "澳大利亚中部夏令时" @@ -11402,10 +11587,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) 达尔文" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "格林威治标准时间" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "格林威治夏令时" @@ -11414,10 +11601,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) 蒙罗维亚，雷克雅未克" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "乌兰巴托标准时间" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "乌兰巴托夏令时" @@ -11426,10 +11615,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) 乌兰巴托" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "诺福克标准时间" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "诺福克夏令时" @@ -11438,10 +11629,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) 诺福克" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "以色列标准时间" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "以色列夏令时" @@ -11450,10 +11643,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "孟加拉标准时间" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "孟加拉夏令时" @@ -11462,10 +11657,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) 达卡" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "南美太平洋标准时间" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "南美太平洋夏令时" @@ -11474,10 +11671,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) 波哥大，利马，基多，里奥布朗库" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "西亚标准时间" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "西亚夏令时" @@ -11486,10 +11685,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) 阿什哈巴德，塔什干" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "阿拉斯加标准时间" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "阿拉斯加夏令时" @@ -11498,10 +11699,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "巴拉圭标准时间" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "巴拉圭夏令时" @@ -11510,10 +11713,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) 亚松森" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "日期变更线标准时间" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "日期变更线夏令时" @@ -11522,10 +11727,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) 国际日期变更线西" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "利比亚标准时间" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "利比亚夏令时" @@ -11534,10 +11741,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "巴伊亚标准时间" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "巴伊亚夏令时" @@ -11546,10 +11755,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) 萨尔瓦多" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "委内瑞拉标准时间" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "委内瑞拉夏令时" @@ -11558,10 +11769,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) 加拉加斯" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "布干维尔标准时间" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "布干维尔夏令时" @@ -11570,10 +11783,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) 布干维尔岛" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "夏威夷标准时间" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "夏威夷夏令时" @@ -11582,10 +11797,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "东南亚标准时间" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "东南亚夏令时" @@ -11594,10 +11811,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) 曼谷，河内，雅加达" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "克孜洛尔达标准时间" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "克孜洛尔达夏令时" @@ -11606,10 +11825,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) 克孜洛尔达" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "西蒙古标准时间" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "西蒙古夏令时" @@ -11618,10 +11839,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) 科布多" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "新西兰标准时间" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "新西兰夏令时" @@ -11630,10 +11853,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) 奥克兰，惠灵顿" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "阿留申标准时间" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "阿留申夏令时" @@ -11642,10 +11867,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) 阿留申群岛" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "鄂木斯克标准时间" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "鄂木斯克克夏令时" @@ -11654,10 +11881,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "巴西中部标准时间" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "巴西中部夏令时" @@ -11666,10 +11895,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) 库亚巴" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "白罗斯标准时间" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "白罗斯夏令时" @@ -11678,10 +11909,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "南美西部标准时间" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "南美西部夏令时" @@ -11690,10 +11923,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) 乔治敦，拉巴斯，马瑙斯，圣胡安" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "格陵兰标准时间" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "格陵兰夏令时" @@ -11702,10 +11937,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) 格陵兰" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "复活节岛标准时间" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "复活节岛夏令时" @@ -11714,6 +11951,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) 复活节岛" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "俄罗斯时区 10" @@ -11722,10 +11960,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) 乔库尔达赫" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "埃及标准时间" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "埃及夏令时" @@ -11734,10 +11974,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) 开罗" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "东部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "东部夏令时 (墨西哥)" @@ -11746,10 +11988,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) 切图马尔" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "毛里求斯标准时间" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "毛里求斯夏令时" @@ -11758,10 +12002,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) 路易港" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "海参崴标准时间" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "海参崴夏令时" @@ -11770,10 +12016,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) 海参崴" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "新加坡标准时间" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "新加坡夏令时" @@ -11782,10 +12030,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "韩国标准时间" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "韩国夏令时" @@ -11794,10 +12044,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) 首尔" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "查塔姆标准时间" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "查塔姆夏令时" @@ -11806,10 +12058,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) 查塔姆群岛" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "东非标准时间" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "东非夏令时" @@ -11818,10 +12072,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE 标准时间" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE 夏令时" @@ -11830,10 +12086,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) 赫尔辛基，基辅，里加，索菲亚，塔林，维尔纽斯" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "东南美洲标准时间" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "东南美洲夏令时" @@ -11842,10 +12100,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) 巴西利亚" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "中太平洋标准时间" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "中太平洋夏令时" @@ -11854,10 +12114,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) 所罗门群岛，新喀里多尼亚" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "西中非标准时间" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "西中非夏令时" @@ -11866,10 +12128,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) 中非西部" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "太平洋南美标准时间" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "太平洋南美夏令时" @@ -11878,10 +12142,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) 圣地亚哥" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "澳大利亚东部标准时间" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "澳大利亚东部夏令时" @@ -11890,10 +12156,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) 布里斯班" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "澳大利亚西部标准时间" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "澳大利亚西部夏令时" diff --git a/po/zh_TW.po b/po/zh_TW.po index 83a14fcfeb2..8941a0e40f2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10286,10 +10286,12 @@ msgid "Select Source" msgstr "選擇來源" #: dlls/tzres/tzres.rc:126 +msgctxt "maximum 31 characters" msgid "China Standard Time" msgstr "中國標準時間" #: dlls/tzres/tzres.rc:127 +msgctxt "maximum 31 characters" msgid "China Daylight Time" msgstr "中國夏令時間" @@ -10298,10 +10300,12 @@ msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) 北京，重慶，香港，烏魯木齊" #: dlls/tzres/tzres.rc:267 +msgctxt "maximum 31 characters" msgid "North Asia Standard Time" msgstr "北亞標準時間" #: dlls/tzres/tzres.rc:268 +msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" msgstr "北亞夏令時間" @@ -10310,10 +10314,12 @@ msgid "(UTC+07:00) Krasnoyarsk" msgstr "(UTC+07:00) 克拉斯諾雅斯克" #: dlls/tzres/tzres.rc:168 +msgctxt "maximum 31 characters" msgid "Georgian Standard Time" msgstr "喬治亞標準時間" #: dlls/tzres/tzres.rc:169 +msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" msgstr "喬治亞夏令時間" @@ -10322,6 +10328,7 @@ msgid "(UTC+04:00) Tbilisi" msgstr "(UTC+04:00) 提比里斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 +msgctxt "maximum 31 characters" msgid "UTC+12" msgstr "UTC+12" @@ -10330,10 +10337,12 @@ msgid "(UTC+12:00) Coordinated Universal Time+12" msgstr "(UTC+12:00) 世界協調時間+12" #: dlls/tzres/tzres.rc:252 +msgctxt "maximum 31 characters" msgid "Nepal Standard Time" msgstr "尼泊爾標準時間" #: dlls/tzres/tzres.rc:253 +msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" msgstr "尼泊爾夏令時間" @@ -10342,10 +10351,12 @@ msgid "(UTC+05:45) Kathmandu" msgstr "(UTC+05:45) 加德滿都" #: dlls/tzres/tzres.rc:90 +msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" msgstr "維德角標準時間" #: dlls/tzres/tzres.rc:91 +msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" msgstr "維德角夏令時間" @@ -10354,10 +10365,12 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "(UTC-01:00) 維德角群島" #: dlls/tzres/tzres.rc:183 +msgctxt "maximum 31 characters" msgid "Haiti Standard Time" msgstr "海地標準時間" #: dlls/tzres/tzres.rc:184 +msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" msgstr "海地夏令時間" @@ -10366,10 +10379,12 @@ msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 +msgctxt "maximum 31 characters" msgid "Central European Standard Time" msgstr "歐洲中部標準時間" #: dlls/tzres/tzres.rc:112 +msgctxt "maximum 31 characters" msgid "Central European Daylight Time" msgstr "歐洲中部夏令時間" @@ -10378,10 +10393,12 @@ msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" msgstr "(UTC+01:00) 賽拉耶佛，斯高彼亞，華沙，札格雷布" #: dlls/tzres/tzres.rc:234 +msgctxt "maximum 31 characters" msgid "Morocco Standard Time" msgstr "摩洛哥標準時間" #: dlls/tzres/tzres.rc:235 +msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" msgstr "摩洛哥夏令時間" @@ -10390,6 +10407,7 @@ msgid "(UTC+01:00) Casablanca" msgstr "(UTC+01:00) 卡薩布蘭卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 +msgctxt "maximum 31 characters" msgid "UTC-08" msgstr "UTC-08" @@ -10398,10 +10416,12 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "(UTC-08:00) 世界協調時間-08" #: dlls/tzres/tzres.rc:39 +msgctxt "maximum 31 characters" msgid "Altai Standard Time" msgstr "阿爾泰標準時間" #: dlls/tzres/tzres.rc:40 +msgctxt "maximum 31 characters" msgid "Altai Daylight Time" msgstr "阿爾泰夏令時間" @@ -10410,10 +10430,12 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) 巴爾瑙爾，戈爾諾-阿爾泰斯克" #: dlls/tzres/tzres.rc:108 +msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" msgstr "中歐標準時間" #: dlls/tzres/tzres.rc:109 +msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" msgstr "中歐夏令時間" @@ -10422,10 +10444,12 @@ msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" msgstr "(UTC+01:00) 貝爾格勒，布拉迪斯拉瓦，布達佩斯，盧布亞那，布拉格" #: dlls/tzres/tzres.rc:192 +msgctxt "maximum 31 characters" msgid "Iran Standard Time" msgstr "伊朗標準時間" #: dlls/tzres/tzres.rc:193 +msgctxt "maximum 31 characters" msgid "Iran Daylight Time" msgstr "伊朗夏令時間" @@ -10434,10 +10458,12 @@ msgid "(UTC+03:30) Tehran" msgstr "(UTC+03:30) 德黑蘭" #: dlls/tzres/tzres.rc:318 +msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" msgstr "聖皮埃標準時間" #: dlls/tzres/tzres.rc:319 +msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" msgstr "聖皮埃夏令時間" @@ -10446,10 +10472,12 @@ msgid "(UTC-03:00) Saint Pierre and Miquelon" msgstr "(UTC-03:00) 聖皮埃與密克隆群島" #: dlls/tzres/tzres.rc:327 +msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" msgstr "聖多美標準時間" #: dlls/tzres/tzres.rc:328 +msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" msgstr "聖多美夏令時間" @@ -10458,10 +10486,12 @@ msgid "(UTC+00:00) Sao Tome" msgstr "(UTC+00:00) 聖多美" #: dlls/tzres/tzres.rc:249 +msgctxt "maximum 31 characters" msgid "Namibia Standard Time" msgstr "納米比亞標準時間" #: dlls/tzres/tzres.rc:250 +msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" msgstr "納米比亞夏令時間" @@ -10470,10 +10500,12 @@ msgid "(UTC+02:00) Windhoek" msgstr "(UTC+02:00) 溫荷克" #: dlls/tzres/tzres.rc:369 +msgctxt "maximum 31 characters" msgid "Tonga Standard Time" msgstr "東加標準時間" #: dlls/tzres/tzres.rc:370 +msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" msgstr "東加夏令時間" @@ -10482,10 +10514,12 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) 努瓜婁發" #: dlls/tzres/tzres.rc:240 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" msgstr "山區標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:241 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" msgstr "山區夏令時間 (墨西哥)" @@ -10494,10 +10528,12 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "(UTC-07:00) 契瓦瓦，拉帕茲，馬薩特蘭" #: dlls/tzres/tzres.rc:171 +msgctxt "maximum 31 characters" msgid "GMT Standard Time" msgstr "GMT 標準時間" #: dlls/tzres/tzres.rc:172 +msgctxt "maximum 31 characters" msgid "GMT Daylight Time" msgstr "GMT 夏令時間" @@ -10506,10 +10542,12 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 都柏林，愛丁堡，里斯本，倫敦" #: dlls/tzres/tzres.rc:342 +msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" msgstr "南蘇丹標準時間" #: dlls/tzres/tzres.rc:343 +msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" msgstr "南蘇丹夏令時間" @@ -10518,10 +10556,12 @@ msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 +msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" msgstr "中亞標準時間" #: dlls/tzres/tzres.rc:103 +msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" msgstr "中亞夏令時間" @@ -10530,10 +10570,12 @@ msgid "(UTC+06:00) Astana" msgstr "(UTC+06:00) 努爾蘇丹" #: dlls/tzres/tzres.rc:213 +msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" msgstr "豪勳爵島標準時間" #: dlls/tzres/tzres.rc:214 +msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" msgstr "豪勳爵島夏令時間" @@ -10542,10 +10584,12 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) 豪勳爵島" #: dlls/tzres/tzres.rc:48 +msgctxt "maximum 31 characters" msgid "Arabic Standard Time" msgstr "伊拉克標準時間" #: dlls/tzres/tzres.rc:49 +msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" msgstr "伊拉克夏令時間" @@ -10554,6 +10598,7 @@ msgid "(UTC+03:00) Baghdad" msgstr "(UTC+03:00) 巴格達" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 +msgctxt "maximum 31 characters" msgid "UTC+13" msgstr "UTC+13" @@ -10562,10 +10607,12 @@ msgid "(UTC+13:00) Coordinated Universal Time+13" msgstr "(UTC+13:00) 世界協調時間+13" #: dlls/tzres/tzres.rc:216 +msgctxt "maximum 31 characters" msgid "Magadan Standard Time" msgstr "馬加丹標準時間" #: dlls/tzres/tzres.rc:217 +msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" msgstr "馬加丹夏令時間" @@ -10574,10 +10621,12 @@ msgid "(UTC+11:00) Magadan" msgstr "(UTC+11:00) 馬加丹" #: dlls/tzres/tzres.rc:258 +msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" msgstr "紐芬蘭標準時間" #: dlls/tzres/tzres.rc:259 +msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" msgstr "紐芬蘭夏令時間" @@ -10586,10 +10635,12 @@ msgid "(UTC-03:30) Newfoundland" msgstr "(UTC-03:30) 紐芬蘭" #: dlls/tzres/tzres.rc:348 +msgctxt "maximum 31 characters" msgid "Sudan Standard Time" msgstr "蘇丹標準時間" #: dlls/tzres/tzres.rc:349 +msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" msgstr "蘇丹夏令時間" @@ -10598,10 +10649,12 @@ msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 +msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" msgstr "西太平洋標準時間" #: dlls/tzres/tzres.rc:439 +msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" msgstr "西太平洋夏令時間" @@ -10610,10 +10663,12 @@ msgid "(UTC+10:00) Guam, Port Moresby" msgstr "(UTC+10:00) 關島，莫爾斯貝港" #: dlls/tzres/tzres.rc:279 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time" msgstr "太平洋標準時間" #: dlls/tzres/tzres.rc:280 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" msgstr "太平洋夏令時間" @@ -10622,10 +10677,12 @@ msgid "(UTC-08:00) Pacific Time (US & Canada)" msgstr "(UTC-08:00) 太平洋時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:69 +msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" msgstr "亞塞拜然標準時間" #: dlls/tzres/tzres.rc:70 +msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" msgstr "亞塞拜然夏令時間" @@ -10634,10 +10691,12 @@ msgid "(UTC+04:00) Baku" msgstr "(UTC+04:00) 巴庫" #: dlls/tzres/tzres.rc:219 +msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" msgstr "麥哲倫標準時間" #: dlls/tzres/tzres.rc:220 +msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" msgstr "麥哲倫夏令時間" @@ -10646,10 +10705,12 @@ msgid "(UTC-03:00) Punta Arenas" msgstr "(UTC-03:00) 旁塔阿雷納斯" #: dlls/tzres/tzres.rc:324 +msgctxt "maximum 31 characters" msgid "Samoa Standard Time" msgstr "薩摩亞標準時間" #: dlls/tzres/tzres.rc:325 +msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" msgstr "薩摩亞夏令時間" @@ -10658,10 +10719,12 @@ msgid "(UTC+13:00) Samoa" msgstr "(UTC+13:00) 薩摩亞" #: dlls/tzres/tzres.rc:201 +msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" msgstr "加里寧格勒標準時間" #: dlls/tzres/tzres.rc:202 +msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" msgstr "加里寧格勒夏令時間" @@ -10670,10 +10733,12 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) 加里寧格勒" #: dlls/tzres/tzres.rc:282 +msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" msgstr "太平洋標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:283 +msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" msgstr "太平洋夏令時間 (墨西哥)" @@ -10682,10 +10747,12 @@ msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) 下加利福尼亞" #: dlls/tzres/tzres.rc:228 +msgctxt "maximum 31 characters" msgid "Middle East Standard Time" msgstr "中東標準時間" #: dlls/tzres/tzres.rc:229 +msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" msgstr "中東夏令時間" @@ -10694,10 +10761,12 @@ msgid "(UTC+02:00) Beirut" msgstr "(UTC+02:00) 貝魯特" #: dlls/tzres/tzres.rc:363 +msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" msgstr "東京標準時間" #: dlls/tzres/tzres.rc:364 +msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" msgstr "東京夏令時間" @@ -10706,10 +10775,12 @@ msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) 大阪，札幌，東京" #: dlls/tzres/tzres.rc:210 +msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" msgstr "萊恩群島標準時間" #: dlls/tzres/tzres.rc:211 +msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" msgstr "萊恩群島夏令時間" @@ -10718,10 +10789,12 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "(UTC+14:00) 聖誕島" #: dlls/tzres/tzres.rc:129 +msgctxt "maximum 31 characters" msgid "Cuba Standard Time" msgstr "古巴標準時間" #: dlls/tzres/tzres.rc:130 +msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" msgstr "古巴夏令時間" @@ -10730,10 +10803,12 @@ msgid "(UTC-05:00) Havana" msgstr "(UTC-05:00) 哈瓦那" #: dlls/tzres/tzres.rc:198 +msgctxt "maximum 31 characters" msgid "Jordan Standard Time" msgstr "約旦標準時間" #: dlls/tzres/tzres.rc:199 +msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" msgstr "約旦夏令時間" @@ -10742,10 +10817,12 @@ msgid "(UTC+02:00) Amman" msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 +msgctxt "maximum 31 characters" msgid "Central Standard Time" msgstr "中部標準時間" #: dlls/tzres/tzres.rc:118 +msgctxt "maximum 31 characters" msgid "Central Daylight Time" msgstr "中部夏令時間" @@ -10754,6 +10831,7 @@ msgid "(UTC-06:00) Central Time (US & Canada)" msgstr "(UTC-06:00) 中部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" msgstr "俄羅斯時區 3" @@ -10762,10 +10840,12 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "(UTC+04:00) 伊熱夫斯克，薩馬拉" #: dlls/tzres/tzres.rc:417 +msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" msgstr "伏爾加格勒標準時間" #: dlls/tzres/tzres.rc:418 +msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" msgstr "伏爾加格勒夏令時間" @@ -10774,10 +10854,12 @@ msgid "(UTC+04:00) Volgograd" msgstr "(UTC+04:00) 伏爾加格勒" #: dlls/tzres/tzres.rc:72 +msgctxt "maximum 31 characters" msgid "Azores Standard Time" msgstr "亞述標準時間" #: dlls/tzres/tzres.rc:73 +msgctxt "maximum 31 characters" msgid "Azores Daylight Time" msgstr "亞述夏令時間" @@ -10786,10 +10868,12 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) 亞述群島" #: dlls/tzres/tzres.rc:264 +msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" msgstr "北亞東部標準時間" #: dlls/tzres/tzres.rc:265 +msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" msgstr "北亞東部夏令時間" @@ -10798,6 +10882,7 @@ msgid "(UTC+08:00) Irkutsk" msgstr "(UTC+08:00) 伊爾庫次克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 +msgctxt "maximum 31 characters" msgid "UTC-11" msgstr "UTC-11" @@ -10806,10 +10891,12 @@ msgid "(UTC-11:00) Coordinated Universal Time-11" msgstr "(UTC-11:00) 世界協調時間-11" #: dlls/tzres/tzres.rc:51 +msgctxt "maximum 31 characters" msgid "Argentina Standard Time" msgstr "阿根廷標準時間" #: dlls/tzres/tzres.rc:52 +msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" msgstr "阿根廷夏令時間" @@ -10818,10 +10905,12 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) 布宜諾斯艾利斯" #: dlls/tzres/tzres.rc:378 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" msgstr "土克凱可標準時間" #: dlls/tzres/tzres.rc:379 +msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" msgstr "土克凱可夏令時間" @@ -10830,10 +10919,12 @@ msgid "(UTC-05:00) Turks and Caicos" msgstr "(UTC-05:00) 土克凱可" #: dlls/tzres/tzres.rc:222 +msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" msgstr "馬克薩斯標準時間" #: dlls/tzres/tzres.rc:223 +msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" msgstr "馬克薩斯夏令時間" @@ -10842,10 +10933,12 @@ msgid "(UTC-09:30) Marquesas Islands" msgstr "(UTC-09:30) 馬克薩斯群島" #: dlls/tzres/tzres.rc:243 +msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" msgstr "緬甸標準時間" #: dlls/tzres/tzres.rc:244 +msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" msgstr "緬甸夏令時間" @@ -10854,6 +10947,7 @@ msgid "(UTC+06:30) Yangon (Rangoon)" msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 +msgctxt "maximum 31 characters" msgid "Coordinated Universal Time" msgstr "世界協調時間" @@ -10862,10 +10956,12 @@ msgid "(UTC) Coordinated Universal Time" msgstr "(UTC) 世界協調時間" #: dlls/tzres/tzres.rc:189 +msgctxt "maximum 31 characters" msgid "India Standard Time" msgstr "印度標準時間" #: dlls/tzres/tzres.rc:190 +msgctxt "maximum 31 characters" msgid "India Daylight Time" msgstr "印度夏令時間" @@ -10874,10 +10970,12 @@ msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" msgstr "(UTC+05:30) 清奈，加爾各答，孟買，新德里" #: dlls/tzres/tzres.rc:180 +msgctxt "maximum 31 characters" msgid "GTB Standard Time" msgstr "GTB 標準時間" #: dlls/tzres/tzres.rc:181 +msgctxt "maximum 31 characters" msgid "GTB Daylight Time" msgstr "GTB 夏令時間" @@ -10886,10 +10984,12 @@ msgid "(UTC+02:00) Athens, Bucharest" msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 +msgctxt "maximum 31 characters" msgid "Turkey Standard Time" msgstr "土耳其標準時間" #: dlls/tzres/tzres.rc:376 +msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" msgstr "土耳其夏令時間" @@ -10898,10 +10998,12 @@ msgid "(UTC+03:00) Istanbul" msgstr "(UTC+03:00) 伊斯坦堡" #: dlls/tzres/tzres.rc:54 +msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" msgstr "阿斯特拉罕標準時間" #: dlls/tzres/tzres.rc:55 +msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" msgstr "阿斯特拉罕夏令時間" @@ -10910,10 +11012,12 @@ msgid "(UTC+04:00) Astrakhan, Ulyanovsk" msgstr "(UTC+04:00) 阿斯特拉罕，烏里揚諾夫斯克" #: dlls/tzres/tzres.rc:162 +msgctxt "maximum 31 characters" msgid "Fiji Standard Time" msgstr "斐濟標準時間" #: dlls/tzres/tzres.rc:163 +msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" msgstr "斐濟夏令時間" @@ -10922,10 +11026,12 @@ msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) 斐濟" #: dlls/tzres/tzres.rc:87 +msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" msgstr "加拿大中部標準時間" #: dlls/tzres/tzres.rc:88 +msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" msgstr "加拿大中部夏令時間" @@ -10934,10 +11040,12 @@ msgid "(UTC-06:00) Saskatchewan" msgstr "(UTC-06:00) 薩克其萬" #: dlls/tzres/tzres.rc:444 +msgctxt "maximum 31 characters" msgid "Yukon Standard Time" msgstr "育空標準時間" #: dlls/tzres/tzres.rc:445 +msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" msgstr "育空夏令時間" @@ -10946,10 +11054,12 @@ msgid "(UTC-07:00) Yukon" msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 +msgctxt "maximum 31 characters" msgid "Taipei Standard Time" msgstr "臺北標準時間" #: dlls/tzres/tzres.rc:355 +msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" msgstr "臺北夏令時間" @@ -10958,10 +11068,12 @@ msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) 臺北" #: dlls/tzres/tzres.rc:426 +msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" msgstr "西歐標準時間" #: dlls/tzres/tzres.rc:427 +msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" msgstr "西歐夏令時間" @@ -10970,10 +11082,12 @@ msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯恩，羅馬，斯德哥爾摩，維也納" #: dlls/tzres/tzres.rc:231 +msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" msgstr "蒙特維多標準時間" #: dlls/tzres/tzres.rc:232 +msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" msgstr "蒙特維多夏令時間" @@ -10982,10 +11096,12 @@ msgid "(UTC-03:00) Montevideo" msgstr "(UTC-03:00) 蒙特維多" #: dlls/tzres/tzres.rc:285 +msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" msgstr "巴基斯坦標準時間" #: dlls/tzres/tzres.rc:286 +msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" msgstr "巴基斯坦夏令時間" @@ -10994,10 +11110,12 @@ msgid "(UTC+05:00) Islamabad, Karachi" msgstr "(UTC+05:00) 伊斯蘭瑪巴德，卡拉奇" #: dlls/tzres/tzres.rc:366 +msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" msgstr "托木斯克標準時間" #: dlls/tzres/tzres.rc:367 +msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" msgstr "托木斯克夏令時間" @@ -11006,10 +11124,12 @@ msgid "(UTC+07:00) Tomsk" msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 +msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" msgstr "高加索標準時間" #: dlls/tzres/tzres.rc:94 +msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" msgstr "高加索夏令時間" @@ -11018,10 +11138,12 @@ msgid "(UTC+04:00) Yerevan" msgstr "(UTC+04:00) 葉里溫" #: dlls/tzres/tzres.rc:66 +msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:67 +msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" msgstr "澳洲東部夏令時間" @@ -11030,10 +11152,12 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) 坎培拉，墨爾本，雪梨" #: dlls/tzres/tzres.rc:246 +msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" msgstr "中亞北部標準時間" #: dlls/tzres/tzres.rc:247 +msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" msgstr "中亞北部夏令時間" @@ -11042,10 +11166,12 @@ msgid "(UTC+07:00) Novosibirsk" msgstr "(UTC+07:00) 新西伯利亞" #: dlls/tzres/tzres.rc:150 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time" msgstr "東部標準時間" #: dlls/tzres/tzres.rc:151 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" msgstr "東部夏令時間" @@ -11054,10 +11180,12 @@ msgid "(UTC-05:00) Eastern Time (US & Canada)" msgstr "(UTC-05:00) 東部時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:372 +msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" msgstr "外貝加爾標準時間" #: dlls/tzres/tzres.rc:373 +msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" msgstr "外貝加爾夏令時間" @@ -11066,10 +11194,12 @@ msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 +msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" msgstr "東歐標準時間" #: dlls/tzres/tzres.rc:142 +msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" msgstr "東歐夏令時間" @@ -11078,10 +11208,12 @@ msgid "(UTC+02:00) Chisinau" msgstr "(UTC+02:00) 基希涅夫" #: dlls/tzres/tzres.rc:120 +msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" msgstr "中部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:121 +msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" msgstr "中部夏令時間 (墨西哥)" @@ -11090,10 +11222,12 @@ msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" msgstr "(UTC-06:00) 瓜達拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 +msgctxt "maximum 31 characters" msgid "Saratov Standard Time" msgstr "薩拉托夫標準時間" #: dlls/tzres/tzres.rc:331 +msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" msgstr "薩拉托夫夏令時間" @@ -11102,10 +11236,12 @@ msgid "(UTC+04:00) Saratov" msgstr "(UTC+04:00) 薩拉托夫" #: dlls/tzres/tzres.rc:57 +msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" msgstr "大西洋標準時間" #: dlls/tzres/tzres.rc:58 +msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" msgstr "大西洋夏令時間" @@ -11114,10 +11250,12 @@ msgid "(UTC-04:00) Atlantic Time (Canada)" msgstr "(UTC-04:00) 大西洋時間 (加拿大)" #: dlls/tzres/tzres.rc:237 +msgctxt "maximum 31 characters" msgid "Mountain Standard Time" msgstr "山區標準時間" #: dlls/tzres/tzres.rc:238 +msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" msgstr "山區夏令時間" @@ -11126,10 +11264,12 @@ msgid "(UTC-07:00) Mountain Time (US & Canada)" msgstr "(UTC-07:00) 山區時間 (美國和加拿大)" #: dlls/tzres/tzres.rc:384 +msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" msgstr "美國東部標準時間" #: dlls/tzres/tzres.rc:385 +msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" msgstr "美國東部夏令時間" @@ -11138,10 +11278,12 @@ msgid "(UTC-05:00) Indiana (East)" msgstr "(UTC-05:00) 印第安納 (東部)" #: dlls/tzres/tzres.rc:321 +msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" msgstr "庫頁島標準時間" #: dlls/tzres/tzres.rc:322 +msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" msgstr "庫頁島夏令時間" @@ -11150,10 +11292,12 @@ msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) 庫頁島" #: dlls/tzres/tzres.rc:270 +msgctxt "maximum 31 characters" msgid "North Korea Standard Time" msgstr "北韓標準時間" #: dlls/tzres/tzres.rc:271 +msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" msgstr "北韓夏令時間" @@ -11162,10 +11306,12 @@ msgid "(UTC+09:00) Pyongyang" msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 +msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" msgstr "塔斯馬尼亞標準時間" #: dlls/tzres/tzres.rc:358 +msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" msgstr "塔斯馬尼亞夏令時間" @@ -11174,10 +11320,12 @@ msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) 荷巴特" #: dlls/tzres/tzres.rc:99 +msgctxt "maximum 31 characters" msgid "Central America Standard Time" msgstr "中美洲標準時間" #: dlls/tzres/tzres.rc:100 +msgctxt "maximum 31 characters" msgid "Central America Daylight Time" msgstr "中美洲夏令時間" @@ -11186,6 +11334,7 @@ msgid "(UTC-06:00) Central America" msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 +msgctxt "maximum 31 characters" msgid "UTC-02" msgstr "UTC-02" @@ -11194,10 +11343,12 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) 世界協調時間-02" #: dlls/tzres/tzres.rc:387 +msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" msgstr "美國山區標準時間" #: dlls/tzres/tzres.rc:388 +msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" msgstr "美國山區夏令時間" @@ -11206,10 +11357,12 @@ msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) 亞利桑那" #: dlls/tzres/tzres.rc:339 +msgctxt "maximum 31 characters" msgid "South Africa Standard Time" msgstr "南非標準時間" #: dlls/tzres/tzres.rc:340 +msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" msgstr "南非夏令時間" @@ -11218,10 +11371,12 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) 哈拉雷，普利托利亞" #: dlls/tzres/tzres.rc:96 +msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:97 +msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" msgstr "澳洲中部夏令時間" @@ -11230,6 +11385,7 @@ msgid "(UTC+09:30) Adelaide" msgstr "(UTC+09:30) 阿得雷德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 +msgctxt "maximum 31 characters" msgid "UTC-09" msgstr "UTC-09" @@ -11238,10 +11394,12 @@ msgid "(UTC-09:00) Coordinated Universal Time-09" msgstr "(UTC-09:00) 世界協調時間-09" #: dlls/tzres/tzres.rc:345 +msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" msgstr "斯里蘭卡標準時間" #: dlls/tzres/tzres.rc:346 +msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" msgstr "斯里蘭卡夏令時間" @@ -11250,10 +11408,12 @@ msgid "(UTC+05:30) Sri Jayawardenepura" msgstr "(UTC+05:30) 斯里賈亞瓦德納普拉科特" #: dlls/tzres/tzres.rc:30 +msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" msgstr "阿富汗標準時間" #: dlls/tzres/tzres.rc:31 +msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" msgstr "阿富汗夏令時間" @@ -11262,10 +11422,12 @@ msgid "(UTC+04:30) Kabul" msgstr "(UTC+04:30) 喀布爾" #: dlls/tzres/tzres.rc:441 +msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" msgstr "雅庫次克標準時間" #: dlls/tzres/tzres.rc:442 +msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" msgstr "雅庫次克夏令時間" @@ -11274,10 +11436,12 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) 雅庫次克" #: dlls/tzres/tzres.rc:309 +msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" msgstr "南美洲東部標準時間" #: dlls/tzres/tzres.rc:310 +msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" msgstr "南美洲東部夏令時間" @@ -11286,10 +11450,12 @@ msgid "(UTC-03:00) Cayenne, Fortaleza" msgstr "(UTC-03:00) 開雲，福塔萊薩" #: dlls/tzres/tzres.rc:42 +msgctxt "maximum 31 characters" msgid "Arab Standard Time" msgstr "沙烏地阿拉伯標準時間" #: dlls/tzres/tzres.rc:43 +msgctxt "maximum 31 characters" msgid "Arab Daylight Time" msgstr "沙烏地阿拉伯夏令時間" @@ -11298,10 +11464,12 @@ msgid "(UTC+03:00) Kuwait, Riyadh" msgstr "(UTC+03:00) 科威特，利雅德" #: dlls/tzres/tzres.rc:45 +msgctxt "maximum 31 characters" msgid "Arabian Standard Time" msgstr "阿拉伯標準時間" #: dlls/tzres/tzres.rc:46 +msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" msgstr "阿拉伯夏令時間" @@ -11310,10 +11478,12 @@ msgid "(UTC+04:00) Abu Dhabi, Muscat" msgstr "(UTC+04:00) 阿布達比，馬斯開特" #: dlls/tzres/tzres.rc:360 +msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" msgstr "托坎廷斯標準時間" #: dlls/tzres/tzres.rc:361 +msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" msgstr "托坎廷斯夏令時間" @@ -11322,10 +11492,12 @@ msgid "(UTC-03:00) Araguaina" msgstr "(UTC-03:00) 阿拉瓜伊納" #: dlls/tzres/tzres.rc:306 +msgctxt "maximum 31 characters" msgid "Russian Standard Time" msgstr "俄羅斯標準時間" #: dlls/tzres/tzres.rc:307 +msgctxt "maximum 31 characters" msgid "Russian Daylight Time" msgstr "俄羅斯夏令時間" @@ -11334,10 +11506,12 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) 莫斯科，聖彼得堡" #: dlls/tzres/tzres.rc:63 +msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" msgstr "澳洲中西部標準時間" #: dlls/tzres/tzres.rc:64 +msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" msgstr "澳洲中西部夏令時間" @@ -11346,10 +11520,12 @@ msgid "(UTC+08:45) Eucla" msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 +msgctxt "maximum 31 characters" msgid "Romance Standard Time" msgstr "羅曼語區標準時間" #: dlls/tzres/tzres.rc:295 +msgctxt "maximum 31 characters" msgid "Romance Daylight Time" msgstr "羅曼語區夏令時間" @@ -11358,10 +11534,12 @@ msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" msgstr "(UTC+01:00) 布魯塞爾，哥本哈根，馬德里，巴黎" #: dlls/tzres/tzres.rc:159 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" msgstr "葉卡捷琳堡標準時間" #: dlls/tzres/tzres.rc:160 +msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" msgstr "葉卡捷琳堡夏令時間" @@ -11370,6 +11548,7 @@ msgid "(UTC+05:00) Ekaterinburg" msgstr "(UTC+05:00) 葉卡捷琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" msgstr "俄羅斯時區 11" @@ -11378,10 +11557,12 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) 阿納德爾，堪察加彼得巴甫洛夫斯克" #: dlls/tzres/tzres.rc:435 +msgctxt "maximum 31 characters" msgid "West Bank Standard Time" msgstr "西岸標準時間" #: dlls/tzres/tzres.rc:436 +msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" msgstr "西岸夏令時間" @@ -11390,10 +11571,12 @@ msgid "(UTC+02:00) Gaza, Hebron" msgstr "(UTC+02:00) 加薩，希伯侖" #: dlls/tzres/tzres.rc:351 +msgctxt "maximum 31 characters" msgid "Syria Standard Time" msgstr "敘利亞標準時間" #: dlls/tzres/tzres.rc:352 +msgctxt "maximum 31 characters" msgid "Syria Daylight Time" msgstr "敘利亞夏令時間" @@ -11402,10 +11585,12 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) 大馬士革" #: dlls/tzres/tzres.rc:60 +msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" msgstr "澳洲中部標準時間" #: dlls/tzres/tzres.rc:61 +msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" msgstr "澳洲中部夏令時間" @@ -11414,10 +11599,12 @@ msgid "(UTC+09:30) Darwin" msgstr "(UTC+09:30) 達爾文" #: dlls/tzres/tzres.rc:177 +msgctxt "maximum 31 characters" msgid "Greenwich Standard Time" msgstr "格林威治標準時間" #: dlls/tzres/tzres.rc:178 +msgctxt "maximum 31 characters" msgid "Greenwich Daylight Time" msgstr "格林威治夏令時間" @@ -11426,10 +11613,12 @@ msgid "(UTC+00:00) Monrovia, Reykjavik" msgstr "(UTC+00:00) 蒙羅維亞，雷克雅維克" #: dlls/tzres/tzres.rc:381 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" msgstr "烏蘭巴托標準時間" #: dlls/tzres/tzres.rc:382 +msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" msgstr "烏蘭巴托夏令時間" @@ -11438,10 +11627,12 @@ msgid "(UTC+08:00) Ulaanbaatar" msgstr "(UTC+08:00) 烏蘭巴托" #: dlls/tzres/tzres.rc:261 +msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" msgstr "諾福克標準時間" #: dlls/tzres/tzres.rc:262 +msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" msgstr "諾福克夏令時間" @@ -11450,10 +11641,12 @@ msgid "(UTC+11:00) Norfolk Island" msgstr "(UTC+11:00) 諾福克島" #: dlls/tzres/tzres.rc:195 +msgctxt "maximum 31 characters" msgid "Israel Standard Time" msgstr "以色列標準時間" #: dlls/tzres/tzres.rc:196 +msgctxt "maximum 31 characters" msgid "Israel Daylight Time" msgstr "以色列夏令時間" @@ -11462,10 +11655,12 @@ msgid "(UTC+02:00) Jerusalem" msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 +msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" msgstr "孟加拉標準時間" #: dlls/tzres/tzres.rc:79 +msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" msgstr "孟加拉夏令時間" @@ -11474,10 +11669,12 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) 達卡" #: dlls/tzres/tzres.rc:312 +msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" msgstr "南美洲太平洋標準時間" #: dlls/tzres/tzres.rc:313 +msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" msgstr "南美洲太平洋夏令時間" @@ -11486,10 +11683,12 @@ msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" msgstr "(UTC-05:00) 波哥大，利馬，基多，里約布蘭科" #: dlls/tzres/tzres.rc:432 +msgctxt "maximum 31 characters" msgid "West Asia Standard Time" msgstr "西亞標準時間" #: dlls/tzres/tzres.rc:433 +msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" msgstr "西亞夏令時間" @@ -11498,10 +11697,12 @@ msgid "(UTC+05:00) Ashgabat, Tashkent" msgstr "(UTC+05:00) 阿什哈巴特，塔什干" #: dlls/tzres/tzres.rc:33 +msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" msgstr "阿拉斯加標準時間" #: dlls/tzres/tzres.rc:34 +msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" msgstr "阿拉斯加夏令時間" @@ -11510,10 +11711,12 @@ msgid "(UTC-09:00) Alaska" msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 +msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" msgstr "巴拉圭標準時間" #: dlls/tzres/tzres.rc:289 +msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" msgstr "巴拉圭夏令時間" @@ -11522,10 +11725,12 @@ msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) 亞松森" #: dlls/tzres/tzres.rc:132 +msgctxt "maximum 31 characters" msgid "Dateline Standard Time" msgstr "換日線標準時間" #: dlls/tzres/tzres.rc:133 +msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" msgstr "換日線夏令時間" @@ -11534,10 +11739,12 @@ msgid "(UTC-12:00) International Date Line West" msgstr "(UTC-12:00) 國際換日線以西" #: dlls/tzres/tzres.rc:207 +msgctxt "maximum 31 characters" msgid "Libya Standard Time" msgstr "利比亞標準時間" #: dlls/tzres/tzres.rc:208 +msgctxt "maximum 31 characters" msgid "Libya Daylight Time" msgstr "利比亞夏令時間" @@ -11546,10 +11753,12 @@ msgid "(UTC+02:00) Tripoli" msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 +msgctxt "maximum 31 characters" msgid "Bahia Standard Time" msgstr "巴伊亞標準時間" #: dlls/tzres/tzres.rc:76 +msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" msgstr "巴伊亞夏令時間" @@ -11558,10 +11767,12 @@ msgid "(UTC-03:00) Salvador" msgstr "(UTC-03:00) 薩爾瓦多" #: dlls/tzres/tzres.rc:411 +msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" msgstr "委內瑞拉標準時間" #: dlls/tzres/tzres.rc:412 +msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" msgstr "委內瑞拉夏令時間" @@ -11570,10 +11781,12 @@ msgid "(UTC-04:00) Caracas" msgstr "(UTC-04:00) 卡拉卡斯" #: dlls/tzres/tzres.rc:84 +msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" msgstr "布干維爾標準時間" #: dlls/tzres/tzres.rc:85 +msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" msgstr "布干維爾夏令時間" @@ -11582,10 +11795,12 @@ msgid "(UTC+11:00) Bougainville Island" msgstr "(UTC+11:00) 布干維爾島" #: dlls/tzres/tzres.rc:186 +msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" msgstr "夏威夷標準時間" #: dlls/tzres/tzres.rc:187 +msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" msgstr "夏威夷夏令時間" @@ -11594,10 +11809,12 @@ msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 +msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" msgstr "東南亞標準時間" #: dlls/tzres/tzres.rc:334 +msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" msgstr "東南亞夏令時間" @@ -11606,10 +11823,12 @@ msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" msgstr "(UTC+07:00) 曼谷，河內，雅加達" #: dlls/tzres/tzres.rc:291 +msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" msgstr "克孜勒奧爾達標準時間" #: dlls/tzres/tzres.rc:292 +msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" msgstr "克孜勒奧爾達夏令時間" @@ -11618,10 +11837,12 @@ msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) 克孜勒奧爾達" #: dlls/tzres/tzres.rc:429 +msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" msgstr "蒙古西部標準時間" #: dlls/tzres/tzres.rc:430 +msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" msgstr "蒙古西部夏令時間" @@ -11630,10 +11851,12 @@ msgid "(UTC+07:00) Hovd" msgstr "(UTC+07:00) 科布多城" #: dlls/tzres/tzres.rc:255 +msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" msgstr "紐西蘭標準時間" #: dlls/tzres/tzres.rc:256 +msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" msgstr "紐西蘭夏令時間" @@ -11642,10 +11865,12 @@ msgid "(UTC+12:00) Auckland, Wellington" msgstr "(UTC+12:00) 奧克蘭，威靈頓" #: dlls/tzres/tzres.rc:36 +msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" msgstr "阿留申標準時間" #: dlls/tzres/tzres.rc:37 +msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" msgstr "阿留申夏令時間" @@ -11654,10 +11879,12 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "(UTC-10:00) 阿留申群島" #: dlls/tzres/tzres.rc:273 +msgctxt "maximum 31 characters" msgid "Omsk Standard Time" msgstr "鄂木斯克標準時間" #: dlls/tzres/tzres.rc:274 +msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" msgstr "鄂木斯克夏令時間" @@ -11666,10 +11893,12 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 +msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" msgstr "巴西中部標準時間" #: dlls/tzres/tzres.rc:106 +msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" msgstr "巴西中部夏令時間" @@ -11678,10 +11907,12 @@ msgid "(UTC-04:00) Cuiaba" msgstr "(UTC-04:00) 庫亞巴" #: dlls/tzres/tzres.rc:81 +msgctxt "maximum 31 characters" msgid "Belarus Standard Time" msgstr "白俄羅斯標準時間" #: dlls/tzres/tzres.rc:82 +msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" msgstr "白俄羅斯夏令時間" @@ -11690,10 +11921,12 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 +msgctxt "maximum 31 characters" msgid "SA Western Standard Time" msgstr "南美洲西部標準時間" #: dlls/tzres/tzres.rc:316 +msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" msgstr "南美洲西部夏令時間" @@ -11702,10 +11935,12 @@ msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" msgstr "(UTC-04:00) 喬治敦，拉巴斯，瑪瑙斯，聖胡安" #: dlls/tzres/tzres.rc:174 +msgctxt "maximum 31 characters" msgid "Greenland Standard Time" msgstr "格陵蘭標準時間" #: dlls/tzres/tzres.rc:175 +msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" msgstr "格陵蘭夏令時間" @@ -11714,10 +11949,12 @@ msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) 格陵蘭" #: dlls/tzres/tzres.rc:147 +msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" msgstr "復活節島標準時間" #: dlls/tzres/tzres.rc:148 +msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" msgstr "復活節島夏令時間" @@ -11726,6 +11963,7 @@ msgid "(UTC-06:00) Easter Island" msgstr "(UTC-06:00) 復活節島" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 +msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" msgstr "俄羅斯時區 10" @@ -11734,10 +11972,12 @@ msgid "(UTC+11:00) Chokurdakh" msgstr "(UTC+11:00) 喬庫爾達赫" #: dlls/tzres/tzres.rc:156 +msgctxt "maximum 31 characters" msgid "Egypt Standard Time" msgstr "埃及標準時間" #: dlls/tzres/tzres.rc:157 +msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" msgstr "埃及夏令時間" @@ -11746,10 +11986,12 @@ msgid "(UTC+02:00) Cairo" msgstr "(UTC+02:00) 開羅" #: dlls/tzres/tzres.rc:153 +msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" msgstr "東部標準時間 (墨西哥)" #: dlls/tzres/tzres.rc:154 +msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" msgstr "東部夏令時間 (墨西哥)" @@ -11758,10 +12000,12 @@ msgid "(UTC-05:00) Chetumal" msgstr "(UTC-05:00) 切圖馬爾" #: dlls/tzres/tzres.rc:225 +msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" msgstr "模里西斯標準時間" #: dlls/tzres/tzres.rc:226 +msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" msgstr "模里西斯夏令時間" @@ -11770,10 +12014,12 @@ msgid "(UTC+04:00) Port Louis" msgstr "(UTC+04:00) 路易士港" #: dlls/tzres/tzres.rc:414 +msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" msgstr "海參崴標準時間" #: dlls/tzres/tzres.rc:415 +msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" msgstr "海參崴夏令時間" @@ -11782,10 +12028,12 @@ msgid "(UTC+10:00) Vladivostok" msgstr "(UTC+10:00) 海參崴" #: dlls/tzres/tzres.rc:336 +msgctxt "maximum 31 characters" msgid "Singapore Standard Time" msgstr "新加坡標準時間" #: dlls/tzres/tzres.rc:337 +msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" msgstr "新加坡夏令時間" @@ -11794,10 +12042,12 @@ msgid "(UTC+08:00) Kuala Lumpur, Singapore" msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 +msgctxt "maximum 31 characters" msgid "Korea Standard Time" msgstr "韓國標準時間" #: dlls/tzres/tzres.rc:205 +msgctxt "maximum 31 characters" msgid "Korea Daylight Time" msgstr "韓國夏令時間" @@ -11806,10 +12056,12 @@ msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) 首爾" #: dlls/tzres/tzres.rc:123 +msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" msgstr "查塔姆群島標準時間" #: dlls/tzres/tzres.rc:124 +msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" msgstr "查塔姆群島夏令時間" @@ -11818,10 +12070,12 @@ msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) 查塔姆群島" #: dlls/tzres/tzres.rc:135 +msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" msgstr "東非標準時間" #: dlls/tzres/tzres.rc:136 +msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" msgstr "東非夏令時間" @@ -11830,10 +12084,12 @@ msgid "(UTC+03:00) Nairobi" msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 +msgctxt "maximum 31 characters" msgid "FLE Standard Time" msgstr "FLE 標準時間" #: dlls/tzres/tzres.rc:166 +msgctxt "maximum 31 characters" msgid "FLE Daylight Time" msgstr "FLE 夏令時間" @@ -11842,10 +12098,12 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) 赫爾辛基，基輔，里加，索菲亞，塔林，維爾紐斯" #: dlls/tzres/tzres.rc:144 +msgctxt "maximum 31 characters" msgid "E. South America Standard Time" msgstr "東南美洲標準時間" #: dlls/tzres/tzres.rc:145 +msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" msgstr "東南美洲夏令時間" @@ -11854,10 +12112,12 @@ msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) 巴西利亞" #: dlls/tzres/tzres.rc:114 +msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" msgstr "太平洋中部標準時間" #: dlls/tzres/tzres.rc:115 +msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" msgstr "太平洋中部夏令時間" @@ -11866,10 +12126,12 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) 索羅門群島，新喀里多尼亞群島" #: dlls/tzres/tzres.rc:423 +msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" msgstr "中西非標準時間" #: dlls/tzres/tzres.rc:424 +msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" msgstr "中西非夏令時間" @@ -11878,10 +12140,12 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) 中西非" #: dlls/tzres/tzres.rc:276 +msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" msgstr "太平洋 (南美) 標準時間" #: dlls/tzres/tzres.rc:277 +msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" msgstr "太平洋 (南美) 夏令時間" @@ -11890,10 +12154,12 @@ msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) 聖地牙哥" #: dlls/tzres/tzres.rc:138 +msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" msgstr "澳洲東部標準時間" #: dlls/tzres/tzres.rc:139 +msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" msgstr "澳洲東部夏令時間" @@ -11902,10 +12168,12 @@ msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) 布里斯本" #: dlls/tzres/tzres.rc:420 +msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" msgstr "澳洲西部標準時間" #: dlls/tzres/tzres.rc:421 +msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" msgstr "澳洲西部夏令時間" -- 2.35.1

2 1

[PATCH] windows.gaming.input: Add a linefeed to a TRACE() message.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windows.gaming.input/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 918262af8e1..441c13dab4c 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -459,6 +459,6 @@ HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ) impl->ref = 1; *out = &impl->IVector_IInspectable_iface; - TRACE( "created %p", *out ); + TRACE( "created %p\n", *out ); return S_OK; } -- 2.30.2

2 1

[vkd3d] vkd3d-shader/spirv: Fix the spelling of some comments.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1bb4c404..bb5e8c6f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1,6 +1,6 @@ /* * Copyright 2017 J??zef Kucia for CodeWeavers - * Copyright 2021 Conor McCarthy for Codeweavers + * Copyright 2021 Conor McCarthy for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -7425,7 +7425,7 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 2); scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 1); - /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single UnpackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7459,7 +7459,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); - /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single PackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7802,7 +7802,7 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c /* The OpSwitch instruction is inserted when the endswitch * instruction is processed because we do not know the number - * of case statments in advance.*/ + * of case statements in advance.*/ vkd3d_spirv_begin_function_stream_insertion(builder, cf_info->u.switch_.stream_location); vkd3d_spirv_build_op_switch(builder, cf_info->u.switch_.selector_id, cf_info->u.switch_.default_block_id, cf_info->u.switch_.case_blocks, -- 2.30.2

1 0

[PATCH] d2d1: Add D2D1Shadow effect.
by Jactry Zeng 07 Mar '22

07 Mar '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2f1949c073c..e7215c4b38a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -26,6 +26,7 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a425395e64a..3ade9634069 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9908,6 +9908,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 9bd0b7012ad..d448aec162a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -20,6 +20,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cf cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Shadow, 0xc67ea361,0x1863,0x4e69,0x89,0xdb,0x69,0x5d,0x3e,0x9a,0x5b,0x6b);") typedef enum D2D1_BORDER_MODE { -- 2.34.1

2 1

[PATCH 1/4] wined3d: Add poll_in_cs field to wined3d_query().
by Jan Sikorski 07 Mar '22

07 Mar '22

Its eventual purpose is to allow for skipping the poll list mechanism by calling query_poll() in the application thread. In this patch it is only used for when we don't have a separate CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++++- dlls/wined3d/query.c | 21 ++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b150f1ae097..ce297d724f2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2312,8 +2312,12 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) poll = query->query_ops->query_issue(query, op->flags); - if (!cs->thread) + if (!query->poll_in_cs) + { + if (op->flags & WINED3DISSUE_END) + InterlockedIncrement(&query->counter_retrieved); return; + } if (poll && list_empty(&query->poll_list_entry)) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7b6c2325523..093b412bf18 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -143,6 +143,7 @@ static void wined3d_query_init(struct wined3d_query *query, struct wined3d_devic query->data = data; query->data_size = data_size; query->query_ops = query_ops; + query->poll_in_cs = !!device->cs->thread; list_init(&query->poll_list_entry); } @@ -469,23 +470,21 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (query->device->cs->thread) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) { - if (query->counter_main != query->counter_retrieved - || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) - { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - query->device->cs->c.ops->flush(&query->device->cs->c); - return S_FALSE; - } - if (query->buffer_object) - query->data = query->map_ptr; + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); + return S_FALSE; } - else if (!query->query_ops->query_poll(query, flags)) + else if (!query->poll_in_cs && !query->query_ops->query_poll(query, flags)) { return S_FALSE; } + if (query->buffer_object) + query->data = query->map_ptr; + if (data) memcpy(data, query->data, min(data_size, query->data_size)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e21c4e6507b..b6f2cf060d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1955,6 +1955,7 @@ struct wined3d_query GLuint buffer_object; UINT64 *map_ptr; + bool poll_in_cs; }; HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, -- 2.32.0

2 7

[PATCH] configure: Tweak PE tools suggestion for ARM64
by Martin Storsjö 07 Mar '22

07 Mar '22

llvm-mingw isn't strictly required - plain clang, llvm-dlltool and lld also suffice. Those tools are commonly available in distribution packages. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab3490b21cd..8fcdb15bbad 100644 --- a/configure.ac +++ b/configure.ac @@ -990,7 +990,7 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) case $host_cpu in - aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;; + aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) ;; esac dnl **** External libraries **** -- 2.25.1

2 1

[PATCH] winebus.sys: Don't reset report descriptor when starting a collection.
by Rémi Bernon 07 Mar '22

07 Mar '22

Fixes regression introduced in 1200e9d472deaa99e80d8fd80821008e3c9021bc, incorrectly split from hid_device_begin_report_descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index d5637c0353b..3e83a05cdf6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -83,7 +83,6 @@ static BOOL hid_device_begin_collection(struct hid_report_descriptor *desc, cons COLLECTION(1, type), }; - memset(desc, 0, sizeof(*desc)); return hid_report_descriptor_append(desc, template, sizeof(template)); } -- 2.35.1

1 0

[tools] testbot/cgi: Add a tooltip on the 'required field' asterisks.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 067d11b5bf..9ea7f0f5b2 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -305,7 +305,7 @@ sub GenerateRequired($$) if ($PropertyDescriptor->GetIsRequired()) { $self->{HasRequired} = 1; - print " <span class='Required'>*</span>"; + print " <a class='Required' title='Required field'>*</a>"; } } -- 2.30.2

1 0

[tools] testbot/cgi: Fix getting the property descriptors in FormPage::SaveProperties().
by Francois Gouget 07 Mar '22

07 Mar '22

The base form page has no Collection field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This worked because the only classes that call SaveProperties() are those that derive from ItemPage which does set the Collection field. Also FormPage::PropertyDescriptors is initialized from the collection property descriptors by ItemPage::_initialize(). --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 43b9b59ce5..1910bf743b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -368,7 +368,7 @@ sub SaveProperties($) } } - foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors}) + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { if ($PropertyDescriptor->GetClass() eq "Basic" && $PropertyDescriptor->GetType() eq "B" && -- 2.30.2

1 0

[tools] testbot/web: Don't assume that "/index.pl" is the TestBot landing page.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- testbot/web/JobDetails.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/Submit.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 5f61466908..d38e8d96b6 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -244,7 +244,7 @@ ${ProjectName} Test Bot <div id="menu"> <ul> <li class='top'><p>Test Bot</p></li> - <li><p><a href='/index.pl'>Home</a></p></li> + <li><p><a href='/'>Home</a></p></li> EOF if (defined($PatchesMailingList)) { @@ -309,7 +309,7 @@ EOF </div> <div id='banner'> <div id='Logo'> - <a href='/index.pl'><img src='/${ProjectName}Logo.png' alt=''></a> + <a href='/'><img src='/${ProjectName}Logo.png' alt=''></a> </div> <div id='Project'> <img src='/${ProjectName}Project.png' alt=''> diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index eef7a17838..919c7a5e3b 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/index.pl"); # does not return + $self->Redirect("/"); # does not return } $self->{JobId} = $JobId; diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ef3f4cb064..d9757edb92 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -133,7 +133,7 @@ sub OnLogIn($) my $Target = $self->GetParam("Target"); if (! defined($Target) || $Target eq "" || substr($Target, 0, 1) ne "/") { - $Target = "/index.pl"; + $Target = "/"; } $self->Redirect(MakeSecureURL($Target)); # does not return exit; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9a7ac0b3e7..98d13381e0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1329,7 +1329,7 @@ sub OnOK($) } else { - $self->Redirect("/index.pl"); # does not return + $self->Redirect("/"); # does not return } } -- 2.30.2

1 0

[tools] testbot/web: Better separate GetParam() and SetParam().
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 39 +++++++++++++++++++++++++---- testbot/web/Feedback.pl | 6 ++--- testbot/web/Register.pl | 4 +-- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index b91022832c..8abaaaa9d2 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,18 +77,47 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list but forces -the result to scalar context to avoid security issues. +Returns the specified parameter. +Note that unlike CGI::param() this forces the result to scalar context to +avoid security issues. + To get the list of parameter names use GetParamNames(). =back =cut -sub GetParam($@) +sub GetParam($$) { - my $self = shift; + my ($self, $Name) = @_; + + return scalar($self->{CGIObj}->param($Name)); +} + +=pod +=over 12 + +=head1 C<SetParam()> - return scalar($self->{CGIObj}->param(@_)); +Sets the specified parameter or removes it from the parameters list if the +value is undefined. + +To get the list of parameter names use GetParamNames(). + +=back +=cut + +sub SetParam($$$) +{ + my ($self, $Name, $Value) = @_; + + if (defined $Value) + { + $self->{CGIObj}->param($Name, $Value); + } + else + { + $self->{CGIObj}->delete($Name); + } } sub CGI($) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 9eba086ace..ca1ee5ed77 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -41,7 +41,7 @@ sub _initialize($$$) ); if (!$Session and $RegistrationQ) { - $self->GetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); + $self->SetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); push @PropertyDescriptors, CreateBasicPropertyDescriptor("FeedA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } @@ -51,8 +51,8 @@ sub _initialize($$$) { # Provide default values my $User = $Session->User; - $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); - $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); + $self->SetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->SetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 23f57a9b64..4cfef79fc3 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -40,11 +40,11 @@ sub _initialize($$$) $self->{ExtraProperties} = []; if ($RegistrationQ) { - $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + $self->SetParam("RegA", "") if (!defined $self->GetParam("RegA")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } - $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->SetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); } -- 2.30.2

1 0

[tools] testbot/cgi: !1 is really an empty string in FormPage::SaveProperties().
by Francois Gouget 07 Mar '22

07 Mar '22

So the point of that SaveProperty() call is that if an editable property value was not received as a form parameter it is considered to be an empty string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 1910bf743b..067d11b5bf 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -375,7 +375,7 @@ sub SaveProperties($) $self->DisplayProperty($PropertyDescriptor) eq "rw" && ! defined($self->GetParam($PropertyDescriptor->GetName()))) { - if (! $self->SaveProperty($PropertyDescriptor, !1)) + if (! $self->SaveProperty($PropertyDescriptor, "")) { return !1; } -- 2.30.2

1 0

[tools] testbot/web: Remove end-of-line spaces in the css file.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 6d170b1457..301ba71df0 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -123,7 +123,7 @@ A:hover position: relative; bottom: 0.5em; font-size: 0.8em; -} +} h1, h2 { @@ -145,7 +145,7 @@ h2 font-size: 14pt; } -.DetailsBody p +.DetailsBody p { text-align: center; } @@ -175,7 +175,7 @@ h2 margin-top: 2em } -.ItemBody p +.ItemBody p { text-align: center; } -- 2.30.2

1 0

Wine 7.0 Android build crashes on Android 12, Samsung S10e
by Hoshi Yamazaki 07 Mar '22

07 Mar '22

Hey, I wanted you to inform that Android build of Wine crashes, when you open it on Android 12 (Samsung S10e, Exynos version). Just curious if I can provide some debug logs if it can help to provide more stable builds (despite that hangover is still in very-alpha stage). Cheers, Hoshi

2 2

[PATCH 1/7] windows.gaming.input: Make QueryInterface implementations consistent.
by Rémi Bernon 07 Mar '22

07 Mar '22

When COM aggregation is involved it is important to add a reference to the returned iface and not to the inner object. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The series also supsersedes 229017 in PATCH 5, with some fixups for the missing attributes and incorrect method case. dlls/windows.gaming.input/controller.c | 6 ++---- dlls/windows.gaming.input/gamepad.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 654d0795eac..75ead342004 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -46,15 +46,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID IsEqualGUID( iid, &IID_IAgileObject ) || IsEqualGUID( iid, &IID_IActivationFactory )) { - IUnknown_AddRef( iface ); - *out = iface; + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); return S_OK; } if (IsEqualGUID( iid, &IID_IRawGameControllerStatics )) { - IUnknown_AddRef( iface ); - *out = &impl->IRawGameControllerStatics_iface; + IInspectable_AddRef( (*out = &impl->IRawGameControllerStatics_iface) ); return S_OK; } diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 231e923b5e8..ab95b4c8d89 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -46,15 +46,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID IsEqualGUID( iid, &IID_IAgileObject ) || IsEqualGUID( iid, &IID_IActivationFactory )) { - IUnknown_AddRef( iface ); - *out = iface; + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); return S_OK; } if (IsEqualGUID( iid, &IID_IGamepadStatics )) { - IUnknown_AddRef( iface ); - *out = &impl->IGamepadStatics_iface; + IInspectable_AddRef( (*out = &impl->IGamepadStatics_iface) ); return S_OK; } -- 2.34.1

1 6

[PATCH] include: Add IReference<T> interface
by Alistair Leslie-Hughes 07 Mar '22

07 Mar '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/windows.foundation.collections.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 7576f331172..dc75ac1a4db 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -73,6 +73,15 @@ cpp_quote("#endif") ] delegate HRESULT TypedEventHandler<TSender, TArgs>([in] TSender sender, [in] TArgs args); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(61c17706-2d65-11e0-9ae8-d48564015472) + ] + interface IReference<T> : IInspectable + { + [propget] HRESULT value(T *value); + } + namespace Collections { [ -- 2.34.1

2 2

[PATCH v2 1/4] apisetschema: Add api-ms-win-core-com-l2-1-1 entry.
by Mohamad Al-Jaf 07 Mar '22

07 Mar '22

This is needed for MFC42U.dll according to Dependency Walker. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..8aacb2577f0 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -9,6 +9,7 @@ apiset api-ms-win-core-atoms-l1-1-0 = kernel32.dll apiset api-ms-win-core-backgroundtask-l1-1-0 = kernelbase.dll apiset api-ms-win-core-calendar-l1-1-0 = kernel32.dll apiset api-ms-win-core-com-l1-1-1 = combase.dll +apiset api-ms-win-core-com-l2-1-1 = ole32.dll apiset api-ms-win-core-com-midlproxystub-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-2-0 = combase.dll -- 2.35.1

1 3

[PATCH v2 1/6] bcrypt: Validate key size when importing RSA key.
by Santino Mazza 07 Mar '22

07 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 1 + dlls/bcrypt/tests/bcrypt.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 0fb78ce39a5..7353cae26eb 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1413,6 +1413,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if(size != input_len) return NTE_BAD_DATA; return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5fb29a0e0ff..95addc1ab16 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2122,11 +2122,8 @@ static void test_RSA(void) ret = BCryptDestroyKey(key); ok(!ret, "got %#lx\n", ret); - todo_wine - { ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); - } ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); -- 2.32.0

2 7

[PATCH v2] bcrypt: Validate key size when importing RSA public key.
by Hans Leidekker 07 Mar '22

07 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Formatting. Clarify subject. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 1 + dlls/bcrypt/tests/bcrypt.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 0fb78ce39a5..072b7915b1e 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1413,6 +1413,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP return STATUS_NOT_SUPPORTED; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if (size != input_len) return NTE_BAD_DATA; return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); } else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5fb29a0e0ff..4d7516a55ac 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2122,11 +2122,9 @@ static void test_RSA(void) ret = BCryptDestroyKey(key); ok(!ret, "got %#lx\n", ret); - todo_wine - { - ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, + sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); - } ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); -- 2.30.2

1 0

[PATCH 1/4] apisetschema: Add api-ms-win-core-com-l2-1-1 entry.
by Mohamad Al-Jaf 07 Mar '22

07 Mar '22

This is needed for MFC42U.dll according to Dependency Walker. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..8aacb2577f0 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -9,6 +9,7 @@ apiset api-ms-win-core-atoms-l1-1-0 = kernel32.dll apiset api-ms-win-core-backgroundtask-l1-1-0 = kernelbase.dll apiset api-ms-win-core-calendar-l1-1-0 = kernel32.dll apiset api-ms-win-core-com-l1-1-1 = combase.dll +apiset api-ms-win-core-com-l2-1-1 = ole32.dll apiset api-ms-win-core-com-midlproxystub-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-1-0 = combase.dll apiset api-ms-win-core-com-private-l1-2-0 = combase.dll -- 2.35.1

1 3

[PATCH v8 1/5] api-ms-win-core-privateprofile-l1-1-0: Add dll.
by Mohamad Al-Jaf 07 Mar '22

07 Mar '22

Needed for native mfc42u.dll. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v7: Rebase. v8: Add entry to tools/make_specfiles. --- configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-privateprofile-l1-1-0.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 4 files changed, 17 insertions(+) create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec diff --git a/configure.ac b/configure.ac index a51d5d44ee7..aa08b282688 100644 --- a/configure.ac +++ b/configure.ac @@ -2416,6 +2416,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-path-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-privateprofile-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in new file mode 100644 index 00000000000..c8b8ef84aef --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-privateprofile-l1-1-0.dll diff --git a/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec new file mode 100644 index 00000000000..c8153c3a296 --- /dev/null +++ b/dlls/api-ms-win-core-privateprofile-l1-1-0/api-ms-win-core-privateprofile-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA +@ stdcall GetPrivateProfileIntW(wstr wstr long wstr) kernel32.GetPrivateProfileIntW +@ stdcall GetPrivateProfileSectionW(wstr ptr long wstr) kernel32.GetPrivateProfileSectionW +@ stdcall GetPrivateProfileStringA(str str str ptr long str) kernel32.GetPrivateProfileStringA +@ stdcall GetPrivateProfileStringW(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW +@ stdcall GetProfileIntA(str str long) kernel32.GetProfileIntA +@ stdcall GetProfileIntW(wstr wstr long) kernel32.GetProfileIntW +@ stdcall GetProfileSectionA(str ptr long) kernel32.GetProfileSectionA +@ stdcall GetProfileSectionW(wstr ptr long) kernel32.GetProfileSectionW +@ stdcall GetProfileStringA(str str str ptr long) kernel32.GetProfileStringA +@ stdcall GetProfileStringW(wstr wstr wstr ptr long) kernel32.GetProfileStringW +@ stdcall WritePrivateProfileSectionA(str str str) kernel32.WritePrivateProfileSectionA +@ stdcall WritePrivateProfileStringA(str str str str) kernel32.WritePrivateProfileStringA +@ stdcall WritePrivateProfileStringW(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8f83034f160..946705fa1de 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -272,6 +272,7 @@ my @dll_groups = "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-path-l1-1-0", + "api-ms-win-core-privateprofile-l1-1-0", "api-ms-win-core-privateprofile-l1-1-1", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", -- 2.35.1

3 12

[PATCH] api-ms-win-core-versionansi-l1-1-1
by David Warner 07 Mar '22

07 Mar '22

Required for Adobe DNG Converter 14+ Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- dlls/apisetschema/apisetschema.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..a47a6fc4016 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -140,7 +140,7 @@ apiset api-ms-win-core-url-l1-1-0 = kernelbase.dll apiset api-ms-win-core-util-l1-1-0 = kernel32.dll apiset api-ms-win-core-version-l1-1-1 = kernelbase.dll apiset api-ms-win-core-version-private-l1-1-0 = kernelbase.dll -apiset api-ms-win-core-versionansi-l1-1-0 = kernelbase.dll +apiset api-ms-win-core-versionansi-l1-1-1 = kernelbase.dll apiset api-ms-win-core-windowsceip-l1-1-0 = kernelbase.dll apiset api-ms-win-core-windowserrorreporting-l1-1-1 = kernelbase.dll apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll -- 2.35.1

2 2

[PATCH v2 1/5] windows.media.speech: Create private header.
by Bernhard Kölbl 06 Mar '22

06 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/main.c | 26 +-------------- dlls/windows.media.speech/private.h | 52 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 dlls/windows.media.speech/private.h diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..f81c1bbfedd 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,35 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" - -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "private.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); -static const char *debugstr_hstring(HSTRING hstr) -{ - const WCHAR *str; - UINT32 len; - if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; - str = WindowsGetStringRawBuffer(hstr, &len); - return wine_dbgstr_wn(str, len); -} - struct voice_information_vector { IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..8162ca45094 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,52 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#include "wine/debug.h" + +static inline const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +#endif -- 2.35.1

2 7

[PATCH] libs: Enable WAV49 support in gsm.
by Christopher Egert 06 Mar '22

06 Mar '22

Fixes a regression introduced by 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 causing missing audio elements in the 64k intros elysian by logicoma and clean state by conspiracy. Signed-off-by: Christopher Egert <cme3000(a)gmail.com> --- libs/gsm/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 482004cab8d..36c749aa60f 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libgsm.a EXTRAINCL = -I$(srcdir)/inc +EXTRADEFS = -DWAV49 C_SRCS = \ src/add.c \ -- 2.35.1

1 0

[PATCH 1/5] windows.media.speech: Create private header.
by Bernhard Kölbl 06 Mar '22

06 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/main.c | 26 +-------------- dlls/windows.media.speech/private.h | 52 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 dlls/windows.media.speech/private.h diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..f81c1bbfedd 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,35 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" - -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "private.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); -static const char *debugstr_hstring(HSTRING hstr) -{ - const WCHAR *str; - UINT32 len; - if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; - str = WindowsGetStringRawBuffer(hstr, &len); - return wine_dbgstr_wn(str, len); -} - struct voice_information_vector { IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..8162ca45094 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,52 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#include "wine/debug.h" + +static inline const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +#endif -- 2.35.1

2 8

[PATCH resend] wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang 05 Mar '22

05 Mar '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Some Linux distros resolves the current hostname back to "localhost", so it needs to be explicitly filtered out. programs/wineboot/wineboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4a18265c1de..e7a508beb12 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -826,7 +826,9 @@ static void create_computer_name_keys(void) if (gethostname( buffer, sizeof(buffer) )) return; hints.ai_flags = AI_CANONNAME; - if (!getaddrinfo( buffer, NULL, &hints, &res )) name = res->ai_canonname; + if (!getaddrinfo( buffer, NULL, &hints, &res ) && + res->ai_canonname && strcasecmp(res->ai_canonname, "localhost") != 0) + name = res->ai_canonname; dot = strchr( name, '.' ); if (dot) *dot++ = 0; else dot = name + strlen(name); -- 2.31.1

1 0

[PATCH v5 00/10] Avoid performance degradation due to vDSO unmapping (#52313)
by Jinoh Kang 05 Mar '22

05 Mar '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. Changelog: - v3 -> v4: - address review comments - add more comments and documentation - v4 -> v5: - rebase onto latest master The following test script has been used to test each changes (use with git rebase --exec=...): set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done Jinoh Kang (10): loader: Refactor argv/envp/auxv management. loader: Refactor number parsing to own function. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Don't clobber existing memory mappings when reserving addresses. loader: Fix return type of get_auxiliary(). loader: Relocate vDSO on conflict with reserved ranges. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Switch stack if the old stack address is in reserved range. loader: Enable all remap logic by default. loader/preloader.c | 1523 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1407 insertions(+), 116 deletions(-) -- 2.34.1

1 10

[PATCH vkd3d v3 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New in v3. Split of vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 547a2ff4..c98e73f7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1522,23 +1522,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 5/8] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - Simplified, only calling vkd3d_free(v->arrays.sizes) after the data type is created. - I also spotted some leaks in gen_struct_fields() and add_typedef() so memory is also freed there. - For that reason I had to move free_parse_variable_def() before these functions. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6a59134e..e702c234 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); + free_parse_variable_def(v); return list; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,7 +729,10 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + { + free_parse_variable_def(v); return false; + } } else { @@ -729,8 +742,12 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + { + free_parse_variable_def(v); return false; + } } + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +764,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1369,15 +1387,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1409,6 +1418,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1468,6 +1478,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1480,6 +1491,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - It seemed right to bring this patch forward before applying the braces flag. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03b..7678cf3c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2310,6 +2310,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3114,15 +3115,28 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + $$ = $1; + if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + YYABORT; + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

2 1

[PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - This patch is new. - While we don't use the default writemask for matrices (yet), I think it is good for consistency, since we are getting rid of the type_is_single_reg() function. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 00a374b4..5152aec4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *nam return var; } -static bool type_is_single_reg(const struct hlsl_type *type) +static unsigned int type_default_writemask(const struct hlsl_type *type) { - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type)) + return (1 << type->dimy) - 1; + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + return (1 << type->dimx) - 1; + return 0; } struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, @@ -537,8 +541,8 @@ struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *v { struct hlsl_ir_store *store; - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; + if (!writemask) + writemask = type_default_writemask(rhs->data_type); if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; -- 2.25.1

2 1

[PATCH] configure: Fix the check for CAPI support.
by Zebediah Figura 05 Mar '22

05 Mar '22

AC_CHECK_LIB sets the variable to "no", not an empty string. Hence compilation would fail if headers were present but libraries were missing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c668127187b..29e8058a24c 100644 --- a/configure.ac +++ b/configure.ac @@ -1646,7 +1646,7 @@ then AC_CHECK_LIB(capi20,capi20_register,[:],[CAPI20_LIBS=""],[$CAPI20_LIBS]) fi]) fi -WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" = "x"], +WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_capi20_capi20_register" != xyes], [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.], [enable_capi2032]) -- 2.35.1

1 0

[PATCH v2] ws2_32: Base inet_addr() implementation on musl.
by Paul Gofman 04 Mar '22

04 Mar '22

The imported algorithm is modified to match the tests. Fixes a regression introduced by commit 671cf16f773e5dafc7edbf7766aed9e52e4e7b56. Windows inet_addr() behaves basically the same as Unix inet_addr() which is different from inet_pton(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - allow any space as terminator and add tests for that; - remove now duplicate inet_addr() tests from test_inet_pton (the main part of those didn't work due to missing brackets for '?' operator). dlls/ws2_32/protocol.c | 52 ++++++++++++++++-- dlls/ws2_32/tests/protocol.c | 103 +++++++++++++++++++++++++++++++---- 2 files changed, 141 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 0f56b1604d8..6e7e8eee18a 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1834,17 +1834,61 @@ int WINAPI WSAAddressToStringW( struct sockaddr *addr, DWORD addr_len, return 0; } - /*********************************************************************** * inet_addr (ws2_32.11) */ u_long WINAPI inet_addr( const char *str ) { + unsigned long a[4] = { 0 }; + const char *s = str; + unsigned char *d; + unsigned int i; u_long addr; + char *z; + + TRACE( "str %s.\n", debugstr_a(str) ); + + if (!s) + { + SetLastError( WSAEFAULT ); + return INADDR_NONE; + } + + d = (unsigned char *)&addr; + + if (s[0] == ' ' && !s[1]) return 0; - if (inet_pton( AF_INET, str, &addr ) == 1) - return addr; - return INADDR_NONE; + for (i = 0; i < 4; ++i) + { + a[i] = strtoul( s, &z, 0 ); + if (z == s || !isdigit( *s )) return INADDR_NONE; + if (!*z || isspace(*z)) break; + if (*z != '.') return INADDR_NONE; + s = z + 1; + } + + if (i == 4) return INADDR_NONE; + + switch (i) + { + case 0: + a[1] = a[0] & 0xffffff; + a[0] >>= 24; + /* fallthrough */ + case 1: + a[2] = a[1] & 0xffff; + a[1] >>= 16; + /* fallthrough */ + case 2: + a[3] = a[2] & 0xff; + a[2] >>= 8; + } + for (i = 0; i < 4; ++i) + { + if (a[i] > 255) return INADDR_NONE; + d[i] = a[i]; + } + return addr; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..9b3dec39dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -674,6 +674,98 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_inet_addr(void) +{ + static const struct + { + const char *input; + u_long addr; + } + tests[] = + { + {"1.2.3.4", 0x04030201}, + {"1 2 3 4", 0x01000000}, + {"1.2.3. 4", 0xffffffff}, + {"1.2.3 .4", 0x03000201}, + {"1.2.3 \xfe\xff", 0x03000201}, + {"3.4.5.6.7", 0xffffffff}, + {"3.4.5.6. 7", 0xffffffff}, + {"3.4.5.6 7", 0x06050403}, + {" 3.4.5.6", 0xffffffff}, + {"\t3.4.5.6", 0xffffffff}, + {"3.4.5.6 ", 0x06050403}, + {"3.4.5.6 ", 0x06050403}, + {"3. 4.5.6", 0xffffffff}, + {"3 .4.5.6", 0x03000000}, + {"1.2.3", 0x03000201}, + {".1.2.3", 0xffffffff}, + {"0.0.0.0", 0x00000000}, + {"", 0xffffffff}, + {" 0", 0xffffffff}, + {"0xa1a2b3b4 ", 0xb4b3a2a1}, + {".", 0xffffffff}, + {" ", 0x00000000}, + {"\t", 0xffffffff}, + {" ", 0xffffffff}, + {"127.127.127.255", 0xff7f7f7f}, + {"127.127.127.255:123", 0xffffffff}, + {"127.127.127.256", 0xffffffff}, + {"a", 0xffffffff}, + {"1.2.3.0xaA", 0xaa030201}, + {"1.1.1.0x", 0xffffffff}, + {"1.2.3.010", 0x08030201}, + {"1.2.3.00", 0x00030201}, + {"1.2.3.0a", 0xffffffff}, + {"1.1.1.0o10", 0xffffffff}, + {"1.1.1.0b10", 0xffffffff}, + {"1.1.1.-2", 0xffffffff}, + {"1", 0x01000000}, + {"1.2", 0x02000001}, + {"1.2.3", 0x03000201}, + {"203569230", 0x4e38220c}, + {"[0.1.2.3]", 0xffffffff}, + {"0x00010203", 0x03020100}, + {"0x2134", 0x34210000}, + {"1234BEEF", 0xffffffff}, + {"017700000001", 0x0100007f}, + {"0777", 0xff010000}, + {"2607:f0d0:1002:51::4", 0xffffffff}, + {"::177.32.45.20", 0xffffffff}, + {"::1/128", 0xffffffff}, + {"::1", 0xffffffff}, + {":1", 0xffffffff}, + }; + u_long addr, expected; + unsigned int i; + char str[32]; + + WSASetLastError(0xdeadbeef); + addr = inet_addr(NULL); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(addr == 0xffffffff, "got addr %#08x\n", addr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context( "Address %s, i %u", debugstr_a(tests[i].input), i ); + WSASetLastError(0xdeadbeef); + addr = inet_addr(tests[i].input); + ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); + ok(addr == tests[i].addr, "got addr %#08x\n", addr); + winetest_pop_context(); + } + + strcpy(str, "1.2.3"); + str[6] = 0; + for (i = 1; i < 256; ++i) + { + if (isdigit(i)) + continue; + str[5] = i; + expected = isspace(i) ? 0x03000201 : 0xffffffff; + addr = inet_addr(str); + ok(addr == expected, "got addr %#08x, expected %#08x, i %u\n", addr, expected, i); + } +} + static void test_inet_pton(void) { static const struct @@ -942,11 +1034,6 @@ static void test_inet_pton(void) ok(ret == -1, "got %d\n", ret); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "got error %u\n", WSAGetLastError()); - WSASetLastError(0xdeadbeef); - ret = inet_addr(NULL); - ok(ret == INADDR_NONE, "got %#x\n", ret); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - for (i = 0; i < ARRAY_SIZE(ipv4_tests); ++i) { WCHAR inputW[32]; @@ -969,11 +1056,6 @@ static void test_inet_pton(void) ok(WSAGetLastError() == (ret ? 0xdeadbeef : WSAEINVAL), "got error %u\n", WSAGetLastError()); ok(addr == ipv4_tests[i].addr, "got addr %#08x\n", addr); - WSASetLastError(0xdeadbeef); - addr = inet_addr(ipv4_tests[i].input); - ok(addr == ipv4_tests[i].ret ? ipv4_tests[i].addr : INADDR_NONE, "got addr %#08x\n", addr); - ok(WSAGetLastError() == 0xdeadbeef, "got error %u\n", WSAGetLastError()); - winetest_pop_context(); } @@ -2871,6 +2953,7 @@ START_TEST( protocol ) test_WSALookupService(); test_inet_ntoa(); + test_inet_addr(); test_inet_pton(); test_addr_to_print(); test_WSAAddressToString(); -- 2.35.1

3 5

[tools] testbot: Fix the indentation of FormPage::SaveProperties().
by Francois Gouget 04 Mar '22

04 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 03ddea64f2..43b9b59ce5 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -361,8 +361,7 @@ sub SaveProperties($) my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); if (defined($PropertyDescriptor)) { - if (! $self->SaveProperty($PropertyDescriptor, - $self->GetParam($ParameterName))) + if (! $self->SaveProperty($PropertyDescriptor, $self->GetParam($ParameterName))) { return !1; } -- 2.30.2

1 0

[PATCH v2 1/6] ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Paul Gofman 04 Mar '22

04 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - also check for nonzero optval where appropriate throughout the patchset. The aim of the patchset is to fix setting and getting 32bit sized socket options when the beaviour is different between Windows and Linux setsockopt() and getsockopt(). That behaviour partially regressed on the move from ws2_32 to ntdll: setsockopt() had the code which would adjust the size for option with the provided length less than 4 bytes (which helped, e. g., SO_REUSEADDR and SO_KEEPALIVE and Killing Floor 2 depended on that). ALthough, as my tests show, that was not universally correct across all the options and the details of getsockopt() were also different. I have another 16 patches on top of this series addressing the other options. There are also a few options (e. g., SO_KEEPALIVE) which should use the first byte only (like that is currently done for TCP_NODELAY minus accessing optval before NULL check). Also a few options behave like boolean values (return value of 1 after setting 0x100. But since fixing up those are orthogonal to what these patches are doing (i. e., the present patches do not change the behaviour for currently supported 4 byte optlen) I am fixing up those in the yet further patches. dlls/ws2_32/tests/sock.c | 86 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..0eece82bfb1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,8 +1155,27 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; @@ -1375,6 +1394,71 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option short length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + for (j = 0; j < 3; ++j) + { + DWORD expected_last_error, expected_value, expected_size, save_value; + int expected_err; + + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, 1 << j); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + if (test_optsize[i].accepts_short_len || j == 2) + { + expected_err = 0; + expected_last_error = ERROR_SUCCESS; + expected_size = test_optsize[i].sizes[j] ? test_optsize[i].sizes[j] : 4; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else if (expected_size == 4) + expected_value = 1; + else + expected_value = (0xdeadbeef & ~((1 << expected_size * 8) - 1)) | 1; + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + } + + value = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 1 << j); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + size = 1 << j; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %u, expected %u.\n", size, expected_size); + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + winetest_pop_context(); + } + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i); -- 2.35.1

3 9

[tools] testbot: Simplify the basic property validation.
by Francois Gouget 04 Mar '22

04 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 766a342309..b283859b9e 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -92,7 +92,7 @@ sub ValidateValue($$$) return $self->GetDisplayName() . ": Too long"; } - if ($self->GetType() eq "N" && ! ($Value =~ /^\s*\d+\s*$/)) + if ($self->GetType() eq "N" && $Value !~ /^\s*\d+\s*$/) { return $self->GetDisplayName() . ": Invalid number"; } -- 2.30.2

1 0

[tools] testbot/web: Simplify the stats page initialization.
by Francois Gouget 04 Mar '22

04 Mar '22

Pass the property descriptors directly to FormPage::_initialize(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ab086976f7..c96e6fdafb 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -41,7 +41,10 @@ sub _initialize($$$) $self->Validate(); $self->{start} = Time(); - $self->SUPER::_initialize($Request, $RequiredRole); + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, 1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub Validate($) @@ -374,17 +377,6 @@ sub GenerateBody($) print "</tbody></table></div>\n"; } -sub GetPropertyDescriptors($) -{ - my ($self) = @_; - - $self->{PropertyDescriptors} ||= [ - CreateBasicPropertyDescriptor("Days", "Days to analyze", !1, !1, "N", 2), - ]; - - return $self->SUPER::GetPropertyDescriptors(); -} - sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

Re: [PATCH v2 1/3] vcomp: Implement _vcomp_for_dynamic_init_i8()
by David Koller 04 Mar '22

04 Mar '22

Thanks a lot, Zebediah, for your comments on my vcomp patches; I really appreciate you taking time to review them! > Does it even make sense to make these unions? Can we just make the > relevant members 64-bit? > > Alternatively, should these be stored separately from the 32-bit > versions? Tests showing what happens if you mix and match 32-bit and > 64-bit calls might be helpful. Right, I considered three alternatives: 1. Create new separate vcomp_thread and vcomp_task structures for the 64-bit data, 2. Increase the 32-bit data members to 64-bit, or 3. Use unions Creating new separate 64-bit data structures for the 64-bit calls would necessitate adding a bunch of new and redundant code (to initialize the new structs, etc.), but would be the most performant. Increasing the 32-bit members to 64-bit would waste the most memory and be the least performant for 32-bit calls, but would eliminate redundant code. My choice of unions is a compromise; new data structures are unnecessary and the separate 32-bit and 64-bit calls each access their native data types, which is good for performance. Using unions in this way is a traditional approach in OpenMP runtime implementations. For example, if you look at the code for libgomp, the most widely used OpenMP implementation, you will see that it uses unions to handle 32/64-bit variants in a similar manner: https://github.com/gcc-mirror/gcc/blob/1931cbad498e625b1e24452dcfffe02539b1… > > Could we share any (or all) of this code with the 32-bit version? > Yes, if the top priority was to minimize redundant code, then refactoring these functions to handle both the 32-bit and 64-bit cases is possible. However, performance would suffer. If you look at the other previously-implemented vcomp functions, you'll see that earlier Wine contributors implemented separate 32-bit and 64-bit versions of functions for other scheduling modes: _vcomp_for_static_init() and _vcomp_for_static_init_i8(), _vcomp_for_static_simple_init() and _vcomp_for_static_simple_init_i8(), etc. My patches follow this same pre-established pattern. I believe that my patches strike a good balance between performance, memory usage, and code concision. clarity, and consistency. If you insist on me changing something, I'm happy to do so. Otherwise, I hope we can get these patches committed swiftly, so that I can move my attention to making further improvements to Wine's vcomp/OpenMP support.

3 3

[PATCH] ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64
by Martin Storsjö 04 Mar '22

04 Mar '22

This fixes an inconsistency since fed7e7a78b4bea183d0cbb107953e275f17baa4f (ntdll: Simulate a syscall return when starting a thread); in that commit, on i386 and x86_64, the syscall_frame used for starting the thread was zeroed with a memset, while it wasn't on arm and arm64. This had a noticable effect on float maths, where the uninitialized frame->restore_flags field could have the CONTEXT_FLOATING_POINT bit set. (call_init_thunk only ORs in CONTEXT_INTEGER into the restore_flags field, on all architectures). If that bit was set, it would restore uninitialized data into the fpscr register, possibly setting the FPU in a nondefault rounding mode. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_arm64.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..1fea76f6563 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1105,6 +1105,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (DWORD)ctx; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..1df97f16f13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1202,6 +1202,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (ULONG64)ctx; -- 2.25.1

1 0

[PATCH 6/6] user32: Ignore low instance word in find_class.
by Jacek Caban 04 Mar '22

04 Mar '22

Like we do in wineserver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 4 ++-- dlls/user32/tests/class.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)

2 1

[PATCH 5/6] user32: Store class instance as UINT_PTR.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 15 ++++++++------- dlls/win32u/ntuser_private.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-)

2 1

[PATCH 4/6] user32: Factor out find_class.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 79 +++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 45 deletions(-)

2 1

[PATCH 3/6] win32u: Move NtUserGetClassName implementation from user32.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 64 +----------------------------- dlls/win32u/class.c | 77 ++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 +++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 34 ++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 4 +- include/ntuser.h | 1 + 8 files changed, 142 insertions(+), 65 deletions(-)

3 2

[PATCH 2/6] win32u: Implement NtUserGetAtomName.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/class.c | 25 +++++++++++++++ dlls/win32u/clipboard.c | 3 +- dlls/win32u/ntuser_private.h | 2 ++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 62 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- include/ntuser.h | 1 + 7 files changed, 94 insertions(+), 2 deletions(-)

2 1

[PATCH 1/6] win32u: Move winproc array from user32.
by Jacek Caban 04 Mar '22

04 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 26 +----- dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 159 ++++++++------------------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/class.c | 167 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 36 ++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 4 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++ include/ntuser.h | 24 +++++ 13 files changed, 285 insertions(+), 146 deletions(-) create mode 100644 dlls/win32u/class.c

2 1

[PATCH v2 1/5] mf/tests: Check the number of input samples to get a H264 stream change.
by Rémi Bernon 04 Mar '22

04 Mar '22

We check that we can at least push two input samples at a time, which matches what Call of Duty Black Ops 3 is doing, as it is not checking ProcessInput result most of the time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Call MFT_MESSAGE_COMMAND_DRAIN. It seems to be synchronizing the transform and makes the number of input sample consistent. The MF_LOW_LATENCY attribute may not be necessary anymore but some games are actually setting the attribute so I'm keeping the test. * Allocate a fixed size sample in PATCH 2, output_info.cbSize is not initialized on Wine yet. dlls/mf/tests/mf.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6462594dae2..d08f0c82807 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6615,6 +6615,7 @@ static void test_h264_decoder(void) MFT_OUTPUT_DATA_BUFFER output; const BYTE *h264_encoded_data; ULONG h264_encoded_data_len; + IMFAttributes *attributes; IMFMediaType *media_type; IMFTransform *transform; ULONG i, ret, flags; @@ -6632,6 +6633,14 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + hr = IMFTransform_GetAttributes(transform, &attributes); + todo_wine + ok(hr == S_OK, "GetAttributes returned %#x\n", hr); + if (hr != S_OK) MFCreateAttributes(&attributes, 0); + hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); + ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); + IMFAttributes_Release(attributes); + /* no output type is available before an input type is set */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -6826,6 +6835,7 @@ static void test_h264_decoder(void) ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#x\n", status); + i = 0; sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); while (1) { @@ -6844,19 +6854,30 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); - while (h264_encoded_data_len > 4) - { - hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - if (FAILED(hr)) break; - ok(hr == S_OK, "ProcessInput returned %#x\n", hr); - ret = IMFSample_Release(sample); - ok(ret <= 1, "Release returned %u\n", ret); - sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); - } - ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); - EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + i++; + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + todo_wine + ok(hr == S_OK, "ProcessMessage returned %#x\n", hr); } todo_wine + ok(i == 2, "got %u iterations\n", i); + todo_wine + ok(h264_encoded_data_len == 44959, "got h264_encoded_data_len %u\n", h264_encoded_data_len); + todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!!output.pSample, "got pSample %p\n", output.pSample); -- 2.34.1

2 6

[PATCH 2/2] crypt32: Add support for encoding OCSP requests.
by Hans Leidekker 04 Mar '22

04 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/encode.c | 192 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 85 ++++++++++++++++ 2 files changed, 277 insertions(+) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7668d0ddb2c..a506f197be1 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -4472,6 +4472,195 @@ BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData, ARRAY_SIZE(items), 0, NULL, pvData, pcbData); } +static BOOL WINAPI CRYPT_AsnEncodeCertId(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_CERT_ID *id = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &id->HashAlgorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, + { &id->IssuerNameHash, CRYPT_AsnEncodeOctets, 0 }, + { &id->IssuerKeyHash, CRYPT_AsnEncodeOctets, 0 }, + { &id->SerialNumber, CRYPT_AsnEncodeInteger, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequestEntry(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_REQUEST_ENTRY *info = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &info->CertId, CRYPT_AsnEncodeCertId, 0 }, + }; + + if (info->cExtension) + { + FIXME("extensions not supported\n"); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +struct ocsp_request_list +{ + DWORD count; + OCSP_REQUEST_ENTRY *entry; +}; + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequestEntries(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + DWORD bytesNeeded, dataLen, lenBytes, i; + const struct ocsp_request_list *list = pvStructInfo; + + ret = TRUE; + for (i = 0, dataLen = 0; ret && i < list->count; i++) + { + DWORD size; + ret = CRYPT_AsnEncodeOCSPRequestEntry(dwCertEncodingType, lpszStructType, &list->entry[i], + dwFlags, pEncodePara, NULL, &size); + if (ret) + dataLen += size; + } + if (ret) + { + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + BYTE *out; + + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + out = pbEncoded; + *out++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(dataLen, out, &lenBytes); + out += lenBytes; + for (i = 0; i < list->count; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeOCSPRequestEntry(dwCertEncodingType, lpszStructType, + &list->entry[i], dwFlags, pEncodePara, out, &size); + out += size; + dataLen -= size; + } + + if (!ret && (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pEncodePara, pbEncoded); + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeOCSPRequest(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret; + + __TRY + { + const OCSP_REQUEST_INFO *info = pvStructInfo; + + if (info->dwVersion != OCSP_REQUEST_V1) + { + FIXME("version %lu not supported\n", info->dwVersion); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + if (info->cExtension) + { + FIXME("extensions not supported\n"); + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + { + struct AsnConstructedItem name; + struct AsnEncodeSequenceItem items[2]; + DWORD count = 1; + + name.tag = 1; + name.pvStructInfo = info->pRequestorName; + name.encodeFunc = CRYPT_AsnEncodeAltNameEntry; + items[0].pvStructInfo = &name; + items[0].encodeFunc = CRYPT_AsnEncodeConstructed; + + if (info->cRequestEntry) + { + items[1].pvStructInfo = &info->cRequestEntry; + items[1].encodeFunc = CRYPT_AsnEncodeOCSPRequestEntries; + count++; + } + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + count, dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -4612,6 +4801,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(CNG_RSA_PUBLIC_KEY_BLOB): encodeFunc = CRYPT_AsnEncodeRsaPubKey_Bcrypt; break; + case LOWORD(OCSP_REQUEST): + encodeFunc = CRYPT_AsnEncodeOCSPRequest; + break; default: FIXME("Unimplemented encoder for lpszStructType OID %d\n", LOWORD(lpszStructType)); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3ba6b2680a7..9d12223c54c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8633,6 +8633,90 @@ static void testPortPublicKeyInfo(void) ok(ret,"CryptAcquireContextA failed\n"); } +static void test_encodeOCSPRequestInfo(DWORD dwEncoding) +{ + static const BYTE expected[] = + {0x30, 0x68, 0xa1, 0x17, 0x82, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, 0x61, 0x6d, + 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x4d, 0x30, 0x4b, 0x30, + 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, + 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98 ,0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, + 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, + 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, + 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE expected2[] = + {0x30, 0x81, 0xb6, 0xa1, 0x17, 0x82, 0x15, 0x2a, 0x2e, 0x63, 0x6d, 0x2e, 0x73, 0x74, 0x65, 0x61, + 0x6d, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x30, 0x81, 0x9a, 0x30, + 0x4b, 0x30, 0x49, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, + 0xe4, 0xe3, 0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, + 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, + 0x54, 0xac, 0x1e, 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08, 0x30, 0x4b, 0x30, 0x49, + 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14, 0xe4, 0xe3, 0x95, + 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, 0x09, 0x8a, 0xab, + 0xd8, 0x04, 0x14, 0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, + 0x98, 0xb2, 0xc5, 0x95, 0x76, 0xb9, 0xf4, 0x02, 0x10, 0xb1, 0xc1, 0x87, 0x54, 0x54, 0xac, 0x1e, + 0x55, 0x40, 0xfb, 0xef, 0xd9, 0x6d, 0x8f, 0x49, 0x08}; + static const BYTE issuer_name[] = + {0xe4, 0xe3 ,0x95, 0xa2, 0x29, 0xd3, 0xd4, 0xc1, 0xc3, 0x1f, 0xf0, 0x98, 0x0c, 0x0b, 0x4e, 0xc0, + 0x09, 0x8a, 0xab, 0xd8}; + static const BYTE issuer_key[] = + {0xb7, 0x6b, 0xa2, 0xea, 0xa8, 0xaa, 0x84, 0x8c, 0x79, 0xea, 0xb4, 0xda, 0x0f, 0x98, 0xb2, 0xc5, + 0x95, 0x76, 0xb9, 0xf4}; + static const BYTE serial[] = + {0x08, 0x49, 0x8f, 0x6d, 0xd9, 0xef, 0xfb, 0x40, 0x55, 0x1e, 0xac, 0x54, 0x54, 0x87, 0xc1, 0xb1}; + OCSP_REQUEST_ENTRY entry[2]; + CERT_ALT_NAME_ENTRY name; + OCSP_REQUEST_INFO info; + DWORD size; + BYTE *buf; + BOOL ret; + + memset(&entry, 0, sizeof(entry)); + entry[0].CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + entry[0].CertId.IssuerNameHash.cbData = sizeof(issuer_name); + entry[0].CertId.IssuerNameHash.pbData = (BYTE *)issuer_name; + entry[0].CertId.IssuerKeyHash.cbData = sizeof(issuer_key); + entry[0].CertId.IssuerKeyHash.pbData = (BYTE *)issuer_key; + entry[0].CertId.SerialNumber.cbData = sizeof(serial); + entry[0].CertId.SerialNumber.pbData = (BYTE *)serial; + + name.dwAltNameChoice = CERT_ALT_NAME_DNS_NAME; + name.pwszDNSName = (WCHAR *)L"*.cm.steampowered.com"; + + info.dwVersion = OCSP_REQUEST_V1; + info.pRequestorName = &name; + info.cRequestEntry = 1; + info.rgRequestEntry = entry; + info.cExtension = 0; + info.rgExtension = NULL; + + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected), "got %lu\n", size); + ok(!memcmp(buf, expected, sizeof(expected)), "unexpected value\n"); + LocalFree(buf); + + /* two entries */ + entry[1].CertId.HashAlgorithm.pszObjId = (char *)szOID_OIWSEC_sha1; + entry[1].CertId.IssuerNameHash.cbData = sizeof(issuer_name); + entry[1].CertId.IssuerNameHash.pbData = (BYTE *)issuer_name; + entry[1].CertId.IssuerKeyHash.cbData = sizeof(issuer_key); + entry[1].CertId.IssuerKeyHash.pbData = (BYTE *)issuer_key; + entry[1].CertId.SerialNumber.cbData = sizeof(serial); + entry[1].CertId.SerialNumber.pbData = (BYTE *)serial; + info.cRequestEntry = 2; + + size = 0; + SetLastError(0xdeadbeef); + ret = pCryptEncodeObjectEx(dwEncoding, OCSP_REQUEST, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "got %08lx\n", GetLastError()); + ok(size == sizeof(expected2), "got %lu\n", size); + ok(!memcmp(buf, expected2, sizeof(expected2)), "unexpected value\n"); + LocalFree(buf); +} + START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, @@ -8726,6 +8810,7 @@ START_TEST(encode) test_encodeCertPolicyConstraints(encodings[i]); test_decodeCertPolicyConstraints(encodings[i]); test_decodeRsaPrivateKey(encodings[i]); + test_encodeOCSPRequestInfo(encodings[i]); } testPortPublicKeyInfo(); } -- 2.30.2

1 0

[PATCH 1/2] include: Add OCSP definitions.
by Hans Leidekker 04 Mar '22

04 Mar '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/wincrypt.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 456f2f14446..f5f05c1f8d0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -608,6 +608,97 @@ typedef struct _CERT_SIGNED_CONTENT_INFO { CRYPT_BIT_BLOB Signature; } CERT_SIGNED_CONTENT_INFO, *PCERT_SIGNED_CONTENT_INFO; +typedef struct _OCSP_SIGNATURE_INFO { + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CRYPT_BIT_BLOB Signature; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; +} OCSP_SIGNATURE_INFO, *POCSP_SIGNATURE_INFO; + +typedef struct _OCSP_SIGNED_REQUEST_INFO { + CRYPT_DER_BLOB ToBeSigned; + POCSP_SIGNATURE_INFO pOptionalSignatureInfo; +} OCSP_SIGNED_REQUEST_INFO, *POCSP_SIGNED_REQUEST_INFO; + +typedef struct _OCSP_CERT_ID { + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + CRYPT_HASH_BLOB IssuerNameHash; + CRYPT_HASH_BLOB IssuerKeyHash; + CRYPT_INTEGER_BLOB SerialNumber; +} OCSP_CERT_ID, *POCSP_CERT_ID; + +typedef struct _OCSP_REQUEST_ENTRY { + OCSP_CERT_ID CertId; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_ENTRY, *POCSP_REQUEST_ENTRY; + +#define OCSP_REQUEST_V1 0 + +typedef struct _OCSP_REQUEST_INFO { + DWORD dwVersion; + PCERT_ALT_NAME_ENTRY pRequestorName; + DWORD cRequestEntry; + POCSP_REQUEST_ENTRY rgRequestEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_INFO, *POCSP_REQUEST_INFO; + +#define OCSP_SUCCESSFUL_RESPONSE 0 +#define OCSP_MALFORMED_REQUEST_RESPONSE 1 +#define OCSP_INTERNAL_ERROR_RESPONSE 2 +#define OCSP_TRY_LATER_RESPONSE 3 +#define OCSP_SIG_REQUIRED_RESPONSE 5 +#define OCSP_UNAUTHORIZED_RESPONSE 6 + +#define szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE "1.3.6.1.5.5.7.48.1.1" + +typedef struct _OCSP_RESPONSE_INFO { + DWORD dwStatus; + LPSTR pszObjId; + CRYPT_OBJID_BLOB Value; +} OCSP_RESPONSE_INFO, *POCSP_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_SIGNED_RESPONSE_INFO { + CRYPT_DER_BLOB ToBeSigned; + OCSP_SIGNATURE_INFO SignatureInfo; +} OCSP_BASIC_SIGNED_RESPONSE_INFO, *POCSP_BASIC_SIGNED_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_REVOKED_INFO { + FILETIME RevocationDate; + DWORD dwCrlReasonCode; +} OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; + +typedef struct _OCSP_BASIC_RESPONSE_ENTRY { + OCSP_CERT_ID CertId; + DWORD dwCertStatus; + union { + POCSP_BASIC_REVOKED_INFO pRevokedInfo; + } DUMMYUNIONNAME; + FILETIME ThisUpdate; + FILETIME NextUpdate; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_ENTRY, *POCSP_BASIC_RESPONSE_ENTRY; + +#define OCSP_BASIC_RESPONSE_V1 0 +#define OCSP_BASIC_BY_NAME_RESPONDER_ID 1 +#define OCSP_BASIC_BY_KEY_RESPONDER_ID 2 + +typedef struct _OCSP_BASIC_RESPONSE_INFO { + DWORD dwVersion; + DWORD dwResponderIdChoice; + union { + CERT_NAME_BLOB ByNameResponderId; + CRYPT_HASH_BLOB ByKeyResponderId; + } DUMMYUNIONNAME; + FILETIME ProducedAt; + DWORD cResponseEntry; + POCSP_BASIC_RESPONSE_ENTRY rgResponseEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_INFO, *POCSP_BASIC_RESPONSE_INFO; + typedef struct _CRL_CONTEXT { DWORD dwCertEncodingType; BYTE *pbCrlEncoded; @@ -3179,6 +3270,11 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define OCSP_SIGNED_REQUEST ((LPCSTR)65) +#define OCSP_REQUEST ((LPCSTR)66) +#define OCSP_RESPONSE ((LPCSTR)67) +#define OCSP_BASIC_SIGNED_RESPONSE ((LPCSTR)68) +#define OCSP_BASIC_RESPONSE ((LPCSTR)69) #define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) -- 2.30.2

1 0

[PATCH 1/5] mf/tests: Check the number of input samples to get a H264 stream change.
by Rémi Bernon 04 Mar '22

04 Mar '22

This is not completely exact, and depending on how often ProcessInput and ProcessOutput are called the numbers may vary a bit, but this version seems to be consistent enough. We could very well ignore the checks too as GStreamer output doesn't seem to match. We check that we can at least push two input samples at a time, which matches what Call of Duty Black Ops 3 is doing, as it is not checking ProcessInput result most of the time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 6462594dae2..69ad4c2e5fc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6615,6 +6615,7 @@ static void test_h264_decoder(void) MFT_OUTPUT_DATA_BUFFER output; const BYTE *h264_encoded_data; ULONG h264_encoded_data_len; + IMFAttributes *attributes; IMFMediaType *media_type; IMFTransform *transform; ULONG i, ret, flags; @@ -6632,6 +6633,14 @@ static void test_h264_decoder(void) &transform, &class_id)) goto failed; + hr = IMFTransform_GetAttributes(transform, &attributes); + todo_wine + ok(hr == S_OK, "GetAttributes returned %#x\n", hr); + if (hr != S_OK) MFCreateAttributes(&attributes, 0); + hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); + ok(hr == S_OK, "SetUINT32 returned %#x\n", hr); + IMFAttributes_Release(attributes); + /* no output type is available before an input type is set */ hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -6826,6 +6835,7 @@ static void test_h264_decoder(void) ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#x\n", status); + i = 0; sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); while (1) { @@ -6844,19 +6854,26 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); - while (h264_encoded_data_len > 4) - { - hr = IMFTransform_ProcessInput(transform, 0, sample, 0); - if (FAILED(hr)) break; - ok(hr == S_OK, "ProcessInput returned %#x\n", hr); - ret = IMFSample_Release(sample); - ok(ret <= 1, "Release returned %u\n", ret); - sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); - } - ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); - EXPECT_REF(sample, 1); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + ret = IMFSample_Release(sample); + ok(ret <= 1, "Release returned %u\n", ret); + sample = next_h264_sample(&h264_encoded_data, &h264_encoded_data_len); + i++; } todo_wine + ok(i == 3, "got %u iterations\n", i); + todo_wine + ok(h264_encoded_data_len == 43479, "got h264_encoded_data_len %u\n", h264_encoded_data_len); + todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!!output.pSample, "got pSample %p\n", output.pSample); -- 2.34.1

2 7

[PATCH v2] kernelbase: Add support for progress callback in CopyFileEx.
by Alistair Leslie-Hughes 04 Mar '22

04 Mar '22

From: Michael Müller <michael(a)fds-team.de> v2: Rebase to git after long type changes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/tests/file.c | 6 --- dlls/kernelbase/file.c | 77 +++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77174d43d5b..4bd9f790cc0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1170,23 +1170,17 @@ static void test_CopyFileEx(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); ok(GetFileAttributesA(dest) != INVALID_FILE_ATTRIBUTES, "file was deleted\n"); hfile = CreateFileA(dest, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); - todo_wine ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %ld\n", GetLastError()); SetLastError(0xdeadbeef); retok = CopyFileExA(source, dest, copy_progress_cb, hfile, NULL, 0); - todo_wine ok(!retok, "CopyFileExA unexpectedly succeeded\n"); - todo_wine ok(GetLastError() == ERROR_REQUEST_ABORTED, "expected ERROR_REQUEST_ABORTED, got %ld\n", GetLastError()); - todo_wine ok(GetFileAttributesA(dest) == INVALID_FILE_ATTRIBUTES, "file was not deleted\n"); retok = CopyFileExA(source, NULL, copy_progress_cb, hfile, NULL, 0); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..b9ba1bd7c26 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -499,11 +499,16 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT { static const int buffer_size = 65536; HANDLE h1, h2; - FILE_BASIC_INFORMATION info; + FILE_NETWORK_OPEN_INFORMATION info; + FILE_BASIC_INFORMATION basic_info; IO_STATUS_BLOCK io; DWORD count; BOOL ret = FALSE; char *buffer; + LARGE_INTEGER size; + LARGE_INTEGER transferred; + DWORD cbret; + DWORD source_access = GENERIC_READ; if (!source || !dest) { @@ -518,7 +523,15 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT TRACE("%s -> %s, %lx\n", debugstr_w(source), debugstr_w(dest), flags); - if ((h1 = CreateFileW( source, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + if (flags & COPY_FILE_RESTARTABLE) + FIXME("COPY_FILE_RESTARTABLE is not supported\n"); + if (flags & COPY_FILE_COPY_SYMLINK) + FIXME("COPY_FILE_COPY_SYMLINK is not supported\n"); + + if (flags & COPY_FILE_OPEN_SOURCE_FOR_WRITE) + source_access |= GENERIC_WRITE; + + if ((h1 = CreateFileW( source, source_access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { WARN("Unable to open source %s\n", debugstr_w(source)); @@ -526,7 +539,7 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } - if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileBasicInformation ))) + if (!set_ntstatus( NtQueryInformationFile( h1, &io, &info, sizeof(info), FileNetworkOpenInformation ))) { WARN("GetFileInformationByHandle returned error for %s\n", debugstr_w(source)); HeapFree( GetProcessHeap(), 0, buffer ); @@ -552,7 +565,11 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT } } - if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + if ((h2 = CreateFileW( dest, GENERIC_WRITE | DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, + info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE && + /* retry without DELETE if we got a sharing violation */ + (h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, (flags & COPY_FILE_FAIL_IF_EXISTS) ? CREATE_NEW : CREATE_ALWAYS, info.FileAttributes, h1 )) == INVALID_HANDLE_VALUE) { @@ -562,6 +579,29 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT return FALSE; } + size = info.EndOfFile; + transferred.QuadPart = 0; + + if (progress) + { + cbret = progress( size, transferred, size, transferred, 1, + CALLBACK_STREAM_SWITCH, h1, h2, param ); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret == PROGRESS_STOP) + { + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + else if (cbret == PROGRESS_CANCEL) + { + BOOLEAN disp = TRUE; + SetFileInformationByHandle( h2, FileDispositionInfo, &disp, sizeof(disp) ); + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + } + while (ReadFile( h1, buffer, buffer_size, &count, NULL ) && count) { char *p = buffer; @@ -571,13 +611,38 @@ BOOL WINAPI CopyFileExW( const WCHAR *source, const WCHAR *dest, LPPROGRESS_ROUT if (!WriteFile( h2, p, count, &res, NULL ) || !res) goto done; p += res; count -= res; + + if (progress) + { + transferred.QuadPart += res; + cbret = progress( size, transferred, size, transferred, 1, + CALLBACK_CHUNK_FINISHED, h1, h2, param ); + if (cbret == PROGRESS_QUIET) + progress = NULL; + else if (cbret == PROGRESS_STOP) + { + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + else if (cbret == PROGRESS_CANCEL) + { + BOOLEAN disp = TRUE; + SetFileInformationByHandle( h2, FileDispositionInfo, &disp, sizeof(disp) ); + SetLastError( ERROR_REQUEST_ABORTED ); + goto done; + } + } } } ret = TRUE; done: /* Maintain the timestamp of source file to destination file */ - info.FileAttributes = 0; - NtSetInformationFile( h2, &io, &info, sizeof(info), FileBasicInformation ); + basic_info.CreationTime = info.CreationTime; + basic_info.LastAccessTime = info.LastAccessTime; + basic_info.LastWriteTime = info.LastWriteTime; + basic_info.ChangeTime = info.ChangeTime; + basic_info.FileAttributes = 0; + NtSetInformationFile( h2, &io, &basic_info, sizeof(basic_info), FileBasicInformation ); HeapFree( GetProcessHeap(), 0, buffer ); CloseHandle( h1 ); CloseHandle( h2 ); -- 2.34.1

2 1

[PATCH 1/4] windows.gaming.input: Add an internal WineGameControllerProvider runtimeclass.
by Rémi Bernon 04 Mar '22

04 Mar '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This introduces a new background thread, although I still don't have a good way to shut it down. For now the thread holds a module reference and stays alive until process shutdown. dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/provider.idl | 55 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 dlls/windows.gaming.input/provider.idl diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index d7f93283bec..46470ac045b 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,4 +8,5 @@ C_SRCS = \ manager.c \ vector.c -IDL_SRCS = classes.idl +IDL_SRCS = classes.idl \ + provider.idl diff --git a/dlls/windows.gaming.input/provider.idl b/dlls/windows.gaming.input/provider.idl new file mode 100644 index 00000000000..dc67a94acaa --- /dev/null +++ b/dlls/windows.gaming.input/provider.idl @@ -0,0 +1,55 @@ +/* + * Copyright 2022 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 + */ + +#pragma makedep header + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.gaming.input.idl"; +import "windows.gaming.input.custom.idl"; + +namespace Windows.Gaming.Input.Custom { + interface IWineGameControllerProvider; + runtimeclass WineGameControllerProvider; + + [ + exclusiveto(Windows.Gaming.Input.Custom.WineGameControllerProvider), + uuid(8967b6ef-a4de-4b9a-984a-9f920b4d1b26) + ] + interface IWineGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + } + + [ + marshaling_behavior(agile), + threading(both) + ] + runtimeclass WineGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IWineGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } +} -- 2.34.1

1 3

[PATCH 2/2] widl: Support basic BYTE type
by Alistair Leslie-Hughes 04 Mar '22

04 Mar '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- tools/widl/typetree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index dc4db35e835..800ddf77219 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -226,12 +226,14 @@ static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t case TYPE_BASIC_DOUBLE: n += strappend(buf, len, pos + n, "f8"); return n; + case TYPE_BASIC_BYTE: + n += strappend(buf, len, pos + n, "u1"); + return n; case TYPE_BASIC_INT16: case TYPE_BASIC_INT3264: case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: - case TYPE_BASIC_BYTE: case TYPE_BASIC_WCHAR: case TYPE_BASIC_ERROR_STATUS_T: case TYPE_BASIC_HANDLE: -- 2.34.1

2 1

[PATCH 1/2] include: Correct BYTE typedef
by Alistair Leslie-Hughes 04 Mar '22

04 Mar '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/wtypes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wtypes.idl b/include/wtypes.idl index 754258839d7..5a09ed717cb 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -33,7 +33,7 @@ interface IWinTypes /******************** BASIC WIN32 TYPES ********************/ cpp_quote("#if 0 /* winnt.h */") /* don't redefine these */ -typedef unsigned char BYTE; +typedef byte BYTE; typedef unsigned short WORD; typedef unsigned long DWORD; typedef long BOOL; -- 2.34.1

2 1

[v2 PATCH 1/2] mfplat/tests: Use correct integral type.
by Nikolay Sivov 04 Mar '22

04 Mar '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 91c9d971a3b..14d05d7c1be 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1154,8 +1154,9 @@ static void test_media_type(void) IMFMediaType *mediatype, *mediatype2; IMFVideoMediaType *video_type; IUnknown *unk, *unk2; - DWORD count, flags; BOOL compressed; + DWORD flags; + UINT count; HRESULT hr; GUID guid; @@ -1956,10 +1957,11 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream *bytestream2; IStream *stream; IMFAttributes *attributes = NULL; - DWORD caps, written, count; + DWORD caps, written; IUnknown *unknown; ULONG ref, size; HRESULT hr; + UINT count; if(!pMFCreateMFByteStreamOnStream) { @@ -2061,10 +2063,11 @@ static void test_file_stream(void) IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; WCHAR pathW[MAX_PATH]; - DWORD caps, count; WCHAR *filename; HRESULT hr; WCHAR *str; + DWORD caps; + UINT count; BOOL eos; filename = load_resource(L"test.mp4"); @@ -4234,6 +4237,7 @@ image_size_tests[] = static void test_MFCalculateImageSize(void) { + DWORD plane_size; unsigned int i; UINT32 size; HRESULT hr; @@ -4258,11 +4262,11 @@ static void test_MFCalculateImageSize(void) if (pMFGetPlaneSize) { - unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + unsigned int expected = ptr->plane_size ? ptr->plane_size : ptr->size; - hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &plane_size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); - ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + ok(plane_size == expected, "%u: unexpected plane size %u, expected %u.\n", i, plane_size, expected); } } } @@ -4270,7 +4274,7 @@ static void test_MFCalculateImageSize(void) static void test_MFGetPlaneSize(void) { unsigned int i; - UINT32 size; + DWORD size; HRESULT hr; if (!pMFGetPlaneSize) @@ -5685,12 +5689,13 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; - unsigned int max_length, length, length2; + DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; - int i, j, k, pitch, pitch2, stride; + LONG pitch, pitch2, stride; IMF2DBuffer2 *_2dbuffer2; IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; + int i, j, k; HRESULT hr; BOOL ret; @@ -5986,7 +5991,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) { 2, 0, 0, 4, 16, 52 }, }; IMFMediaBuffer *buffer; - UINT32 length; + DWORD length; HRESULT hr; IMFMediaType *media_type; unsigned int i; @@ -7094,11 +7099,11 @@ static void test_sample_allocator_sysmem(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFVideoSampleAllocatorEx *allocatorex; IMFVideoSampleAllocator *allocator; - unsigned int buffer_count; IMFSample *sample, *sample2; IMFAttributes *attributes; IMFMediaBuffer *buffer; LONG refcount, count; + DWORD buffer_count; IUnknown *unk; HRESULT hr; -- 2.34.1

2 3

[PATCH v2] bcrypt: Add support for PUBLICKEY blob types.
by Hans Leidekker 04 Mar '22

04 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> v2: Avoid copying key type. Add DSA public key support. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 28 ++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..0fb78ce39a5 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1775,6 +1775,34 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return STATUS_NOT_IMPLEMENTED; } + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) + { + BCRYPT_KEY_BLOB *key_blob = (BCRYPT_KEY_BLOB *)input; + + if (input_len < sizeof(*key_blob)) return STATUS_INVALID_PARAMETER; + + switch (key_blob->Magic) + { + case BCRYPT_ECDH_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P384_MAGIC: + type = BCRYPT_ECCPUBLIC_BLOB; + break; + + case BCRYPT_RSAPUBLIC_MAGIC: + type = BCRYPT_RSAPUBLIC_BLOB; + break; + + case BCRYPT_DSA_PUBLIC_MAGIC: + type = BCRYPT_DSA_PUBLIC_BLOB; + break; + + default: + FIXME( "unsupported key magic %#lx\n", key_blob->Magic ); + return STATUS_NOT_SUPPORTED; + } + } + return key_import_pair( alg, type, ret_key, input, input_len ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1588b72c3fd..5fb29a0e0ff 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1845,6 +1845,10 @@ static void test_ECDSA(void) ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + BCryptDestroyKey(key); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); @@ -2015,6 +2019,10 @@ static void test_RSA(void) ok(schemes, "schemes not set\n"); ok(size == sizeof(schemes), "got %lu\n", size); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); @@ -2341,6 +2349,10 @@ static void test_ECDH(void) ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &pubkey, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + BCryptDestroyKey(pubkey); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); @@ -2842,6 +2854,10 @@ static void test_DSA(void) ret = BCryptGetProperty(alg, L"PaddingSchemes", (UCHAR *)&schemes, sizeof(schemes), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); + ok(!ret, "got %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_DSA_PUBLIC_BLOB, &key, dsaPublicBlob, sizeof(dsaPublicBlob), 0); ok(!ret, "got %#lx\n", ret); -- 2.30.2

1 0

[PATCH v2 1/3] winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Rémi Bernon 04 Mar '22

04 Mar '22

Checking that WMA decoder ignores any incorrectly sized input sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Try to make the output buffer length test more resilient to FFmpeg variations. dlls/mf/tests/mf.c | 23 +++++++++++++--------- dlls/winegstreamer/wma_decoder.c | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e61442bb512..0ab46445d9a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6031,6 +6031,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; + MFT_OUTPUT_DATA_BUFFER outputs[2]; MFT_INPUT_STREAM_INFO input_info; MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; @@ -6208,7 +6209,7 @@ static void test_wma_decoder(void) ok(hr == S_OK, "ProcessInput returned %#x\n", hr); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); - sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + sample = create_sample(wma_encoded_data, wma_block_size + 1); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); todo_wine ok(hr == S_OK, "ProcessInput returned %#x\n", hr); @@ -6231,16 +6232,13 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %u\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == 0, "got status %#x\n", status); sample = create_sample(wma_encoded_data, wma_block_size); @@ -6253,16 +6251,25 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + outputs[0].pSample = sample; + sample = create_sample(NULL, output_info.cbSize); + outputs[1].pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 2, outputs, &status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#x\n", hr); + IMFSample_Release(outputs[0].pSample); + IMFSample_Release(outputs[1].pSample); + i = 1; status = 0xdeadbeef; output_info.cbSize = sizeof(wma_decoded_data); @@ -6333,7 +6340,6 @@ static void test_wma_decoder(void) ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %u\n", ret); @@ -6349,7 +6355,6 @@ static void test_wma_decoder(void) ok(output.dwStatus == 0 || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#x\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#x\n", status); check_sample(sample, NULL, 0, NULL); ret = IMFSample_Release(sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6c198706944..a35da1cdc70 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -520,14 +520,47 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); + + if (count > 1) + return E_INVALIDARG; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) + { + samples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + return E_NOTIMPL; } -- 2.34.1

2 4

[PATCH v2] bcrypt: Add support for PUBLICKEY blob types.
by Santino Mazza 04 Mar '22

04 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 398 ++++++++++++++++++++++--------------- dlls/bcrypt/tests/bcrypt.c | 12 ++ 2 files changed, 255 insertions(+), 155 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..2ef67bc3024 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1318,207 +1318,295 @@ static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG inpu return status; } -static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, - ULONG input_len ) +static NTSTATUS key_import_ecc_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) { - struct key_import_params params; - struct key *key; - NTSTATUS status; + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; ULONG size; - if (!wcscmp( type, BCRYPT_ECCPUBLIC_BLOB )) + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) { - BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; + break; - if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; + break; - switch (alg->id) - { - case ALG_ID_ECDH_P256: - key_size = 32; - magic = BCRYPT_ECDH_PUBLIC_P256_MAGIC; - break; + case ALG_ID_ECDSA_P384: + key_size = 48; + magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; + break; - case ALG_ID_ECDSA_P256: - key_size = 32; - magic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; - break; + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(BCRYPT_ECCPUBLIC_BLOB) ); + return STATUS_NOT_SUPPORTED; + } - case ALG_ID_ECDSA_P384: - key_size = 48; - magic = BCRYPT_ECDSA_PUBLIC_P384_MAGIC; - break; + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) + return STATUS_INVALID_PARAMETER; - default: - FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; + return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); +} - if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; - if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 2) - return STATUS_INVALID_PARAMETER; +static NTSTATUS key_import_ecc_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + struct key_import_params params; + struct key *key; + BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; + DWORD key_size, magic; + NTSTATUS status; + DWORD size; + + if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + + switch (alg->id) + { + case ALG_ID_ECDH_P256: + key_size = 32; + magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; + break; + case ALG_ID_ECDSA_P256: + key_size = 32; + magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; + break; - size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; - return key_asymmetric_create( (struct key **)ret_key, alg, key_size * 8, (BYTE *)ecc_blob, size ); + default: + FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(BCRYPT_ECCPUBLIC_BLOB) ); + return STATUS_NOT_SUPPORTED; } - else if (!wcscmp( type, BCRYPT_ECCPRIVATE_BLOB )) + + if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; + if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) + return STATUS_INVALID_PARAMETER; + + size = sizeof(*ecc_blob) + key_size * 2; + if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; + + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_ecc, &params ))) { - BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; + BCryptDestroyKey( key ); + return status; + } - if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - switch (alg->id) - { - case ALG_ID_ECDH_P256: - key_size = 32; - magic = BCRYPT_ECDH_PRIVATE_P256_MAGIC; - break; - case ALG_ID_ECDSA_P256: - key_size = 32; - magic = BCRYPT_ECDSA_PRIVATE_P256_MAGIC; - break; +static NTSTATUS key_import_rsa_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + DWORD size; - default: - FIXME( "algorithm %u does not yet support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if ((alg->id != ALG_ID_RSA && alg->id != ALG_ID_RSA_SIGN) || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; - if (ecc_blob->dwMagic != magic) return STATUS_INVALID_PARAMETER; - if (ecc_blob->cbKey != key_size || input_len < sizeof(*ecc_blob) + ecc_blob->cbKey * 3) - return STATUS_INVALID_PARAMETER; + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); +} - size = sizeof(*ecc_blob) + key_size * 2; - if ((status = key_asymmetric_create( &key, alg, key_size * 8, NULL, size ))) return status; +static NTSTATUS key_import_rsa_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + struct key_import_params params; + struct key *key; + NTSTATUS status; + DWORD size; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_ecc, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; + if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC && + rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; - *ret_key = key; - return STATUS_SUCCESS; - } - else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB )) + size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; + if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) + return status; + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_rsa, &params ))) { - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; + BCryptDestroyKey( key ); + return status; + } - if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; - if ((alg->id != ALG_ID_RSA && alg->id != ALG_ID_RSA_SIGN) || rsa_blob->Magic != BCRYPT_RSAPUBLIC_MAGIC) - return STATUS_NOT_SUPPORTED; + *ret_key = key; + return STATUS_SUCCESS; +} - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - return key_asymmetric_create( (struct key **)ret_key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ); - } - else if (!wcscmp( type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) - { - BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; +static NTSTATUS key_import_dsa_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)input; + DWORD size; - if (input_len < sizeof(*rsa_blob)) return STATUS_INVALID_PARAMETER; - if (alg->id != ALG_ID_RSA || (rsa_blob->Magic != BCRYPT_RSAPRIVATE_MAGIC && - rsa_blob->Magic != BCRYPT_RSAFULLPRIVATE_MAGIC)) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*dsa_blob)) return STATUS_INVALID_PARAMETER; + if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC) + return STATUS_NOT_SUPPORTED; - size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_create( &key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) - return status; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_rsa, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; + return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); +} - *ret_key = key; - return STATUS_SUCCESS; - } - else if (!wcscmp( type, BCRYPT_DSA_PUBLIC_BLOB )) - { - BCRYPT_DSA_KEY_BLOB *dsa_blob = (BCRYPT_DSA_KEY_BLOB *)input; +static NTSTATUS key_import_legacy_dsa_v2_public( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + struct key_import_params params; + struct key *key; + DWORD size; + NTSTATUS status; - if (input_len < sizeof(*dsa_blob)) return STATUS_INVALID_PARAMETER; - if ((alg->id != ALG_ID_DSA) || dsa_blob->dwMagic != BCRYPT_DSA_PUBLIC_MAGIC) - return STATUS_NOT_SUPPORTED; + if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; - size = sizeof(*dsa_blob) + dsa_blob->cbKey * 3; - return key_asymmetric_create( (struct key **)ret_key, alg, dsa_blob->cbKey * 8, (BYTE *)dsa_blob, size ); - } - else if (!wcscmp( type, LEGACY_DSA_V2_PRIVATE_BLOB )) + if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) { - BLOBHEADER *hdr = (BLOBHEADER *)input; - DSSPUBKEY *pubkey; + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; + } - if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; - if (hdr->bType != PRIVATEKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) - { - FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); - return STATUS_NOT_SUPPORTED; - } - if (alg->id != ALG_ID_DSA) - { - FIXME( "algorithm %u does not support importing blob of type %s\n", alg->id, debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; - } + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if (input_len < size) return STATUS_INVALID_PARAMETER; - if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; - pubkey = (DSSPUBKEY *)(hdr + 1); - if (pubkey->magic != MAGIC_DSS2) return STATUS_NOT_SUPPORTED; + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; + key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; - if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED)) - return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; +static NTSTATUS key_import_legacy_dsa_v2_private( struct algorithm *alg, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + BLOBHEADER *hdr = (BLOBHEADER *)input; + DSSPUBKEY *pubkey; + struct key_import_params params; + struct key *key; + NTSTATUS status; + DWORD size; - params.key = key; - params.buf = input; - params.len = input_len; - if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) - { - BCryptDestroyKey( key ); - return status; - } + if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; - *ret_key = key; - return STATUS_SUCCESS; + if (hdr->bType != PRIVATEKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) + { + FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); + return STATUS_NOT_SUPPORTED; } - else if (!wcscmp( type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + if (alg->id != ALG_ID_DSA) { - BLOBHEADER *hdr = (BLOBHEADER *)input; - DSSPUBKEY *pubkey; + FIXME( "algorithm %u does not support importing blob of type %s\n", alg->id, debugstr_w(LEGACY_DSA_V2_PRIVATE_BLOB) ); + return STATUS_NOT_SUPPORTED; + } - if (alg->id != ALG_ID_DSA) return STATUS_NOT_SUPPORTED; - if (input_len < sizeof(*hdr)) return STATUS_INVALID_PARAMETER; + if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; + pubkey = (DSSPUBKEY *)(hdr + 1); + if (pubkey->magic != MAGIC_DSS2) return STATUS_NOT_SUPPORTED; - if (hdr->bType != PUBLICKEYBLOB && hdr->bVersion != 2 && hdr->aiKeyAlg != CALG_DSS_SIGN) - { - FIXME( "blob type %u version %u alg id %u not supported\n", hdr->bType, hdr->bVersion, hdr->aiKeyAlg ); - return STATUS_NOT_SUPPORTED; - } + if (input_len < sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 2 + 40 + sizeof(DSSSEED)) + return STATUS_INVALID_PARAMETER; + + size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); + if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, NULL, size ))) return status; - if (input_len < sizeof(*hdr) + sizeof(*pubkey)) return STATUS_INVALID_PARAMETER; - pubkey = (DSSPUBKEY *)(hdr + 1); - if (pubkey->magic != MAGIC_DSS1) return STATUS_NOT_SUPPORTED; + params.key = key; + params.buf = input; + params.len = input_len; + if ((status = UNIX_CALL( key_import_dsa_capi, &params ))) + { + BCryptDestroyKey( key ); + return status; + } - size = sizeof(*hdr) + sizeof(*pubkey) + (pubkey->bitlen / 8) * 3 + 20 + sizeof(DSSSEED); - if (input_len < size) return STATUS_INVALID_PARAMETER; + *ret_key = key; + return STATUS_SUCCESS; +} - if ((status = key_asymmetric_create( &key, alg, pubkey->bitlen, (BYTE *)hdr, size ))) return status; - key->u.a.flags |= KEY_FLAG_LEGACY_DSA_V2; +static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, + ULONG input_len ) +{ + WCHAR *final_type = type; + NTSTATUS status; - *ret_key = key; - return STATUS_SUCCESS; + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) + { + DWORD magic = *(DWORD *)input; + switch(magic) + { + case BCRYPT_ECDH_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P256_MAGIC: + case BCRYPT_ECDSA_PUBLIC_P384_MAGIC: + final_type = malloc( sizeof(BCRYPT_ECCPUBLIC_BLOB) ); + wcscpy( final_type, BCRYPT_ECCPUBLIC_BLOB ); + break; + case BCRYPT_RSAPUBLIC_MAGIC: + final_type = malloc( sizeof(BCRYPT_RSAPUBLIC_BLOB) ); + wcscpy( final_type, BCRYPT_RSAPUBLIC_BLOB ); + break; + default: + { + FIXME( "Unsupported key magic %#lx\n", magic ); + return STATUS_NOT_SUPPORTED; + } + } } - FIXME( "unsupported key type %s\n", debugstr_w(type) ); - return STATUS_NOT_SUPPORTED; + if (!wcscmp( final_type, BCRYPT_ECCPUBLIC_BLOB )) + { + status = key_import_ecc_public( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_ECCPRIVATE_BLOB )) + { + status = key_import_ecc_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_RSAPUBLIC_BLOB )) + { + status = key_import_rsa_public(alg, ret_key, input, input_len); + } + else if (!wcscmp( final_type, BCRYPT_RSAPRIVATE_BLOB ) || !wcscmp( type, BCRYPT_RSAFULLPRIVATE_BLOB )) + { + status = key_import_rsa_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, BCRYPT_DSA_PUBLIC_BLOB )) + { + status = key_import_dsa_public( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, LEGACY_DSA_V2_PRIVATE_BLOB )) + { + status = key_import_legacy_dsa_v2_private( alg, ret_key, input, input_len ); + } + else if (!wcscmp( final_type, LEGACY_DSA_V2_PUBLIC_BLOB )) /* not supported on native */ + { + status = key_import_legacy_dsa_v2_public( alg, ret_key, input, input_len ); + } + else + { + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_SUPPORTED; + } + + if (!wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) free(final_type); + + return status; } static ULONG get_block_size( struct algorithm *alg ) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e7619897cfd..6fc4097492b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1845,6 +1845,10 @@ static void test_ECDSA(void) ecckey->dwMagic = BCRYPT_ECDSA_PUBLIC_P256_MAGIC; ecckey->cbKey = 32; + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, buffer, size, 0); + ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + BCryptDestroyKey(key); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); @@ -1997,6 +2001,10 @@ static void test_RSA(void) ok(schemes, "schemes not set\n"); ok(size == sizeof(schemes), "got %lu\n", size); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); + BCryptDestroyKey(key); + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); ok(!ret, "BCryptImportKeyPair failed: %#lx\n", ret); @@ -2317,6 +2325,10 @@ static void test_ECDH(void) ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); ok(size == sizeof(*ecckey) + ecckey->cbKey * 2, "got %lu\n", size); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_PUBLIC_KEY_BLOB, &pubkey, buf, size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + BCryptDestroyKey(pubkey); + status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, buf, size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status); HeapFree(GetProcessHeap(), 0, buf); -- 2.32.0

1 0

[PATCH 1/4] makedep: Do not forbid importing system headers in msvcrt modules.
by Zebediah Figura 04 Mar '22

04 Mar '22

The apparent intention of catching mistakes early is laudable. However, the number of exceptions both in the code and not in the code (in particular, valgrind.h) shows that this is clearly getting in the way more often than not. In practice an attempt to compile with a system API we don't support will be met with a clear error at link time, e.g.: /usr/bin/x86_64-w64-mingw32-ld: dlls/xmllite/reader.cross.o: in function `debugstr_nodetype': /home/whatsit/git/wine64/../wine/dlls/xmllite/reader.c:116: undefined reference to `pthread_once' And when there is no external function involved (as with stdarg.h, x86intrin.h, valgrind.h), there's no reason to prevent use of the headers. The motivation for this patch is the ability to import system vkd3d.h in e.g. d3d12 and dxgi, which do not link to libvkd3d directly (but rather indirectly through wined3d) and so do not fall under the has_external_import() exception. I could see no simple way to adapt has_external_import() to account for this case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Am I missing some other point of doing this? I'm fully willing to retract this patch if so, but I still don't see a good way to deal with the aforementioned problem. tools/makedep.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 25277efd7bb..cc988e2aee7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1359,22 +1359,6 @@ static struct makefile *find_importlib_module( const char *name ) } -/******************************************************************* - * has_external_import - */ -static int has_external_import( const struct makefile *make ) -{ - unsigned int i; - - for (i = 0; i < make->imports.count; i++) - { - if (!strncmp( make->imports.str[i], "-l", 2 )) - return 1; - } - return 0; -} - - /******************************************************************* * open_include_file */ @@ -1452,17 +1436,6 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } - if (pFile->type == INCL_SYSTEM && pFile->use_msvcrt && - !make->extlib && !pFile->included_by->is_external) - { - if (!strcmp( pFile->name, "stdarg.h" )) return NULL; - if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; - if (has_external_import( make )) return NULL; - fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", - pFile->included_by->file->name, pFile->included_line, pFile->name ); - exit(1); - } - if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ -- 2.35.1

1 3

[PATCH 1/6] bcrypt: Add support for PUBLICKEY blob types.
by Santino Mazza 04 Mar '22

04 Mar '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9fb9b6adf87..73071d70992 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1404,7 +1404,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP *ret_key = key; return STATUS_SUCCESS; } - else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB )) + else if (!wcscmp( type, BCRYPT_RSAPUBLIC_BLOB ) || !wcscmp( type, BCRYPT_PUBLIC_KEY_BLOB )) { BCRYPT_RSAKEY_BLOB *rsa_blob = (BCRYPT_RSAKEY_BLOB *)input; -- 2.32.0

2 17

[PATCH 1/2] kernel32/tests: Add additional Get/SetThreadDescription() tests.
by Brendan Shanks 03 Mar '22

03 Mar '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 95 ++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6ccf7af85f8..bcdda77c553 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -100,6 +100,8 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *); static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static HANDLE create_target_process(const char *arg) { @@ -2351,6 +2353,23 @@ static void test_thread_info(void) CloseHandle(thread); } +typedef struct tagTHREADNAME_INFO +{ + DWORD dwType; /* Must be 0x1000. */ + LPCSTR szName; /* Pointer to name (in user addr space). */ + DWORD dwThreadID; /* Thread ID (-1 = caller thread). */ + DWORD dwFlags; /* Reserved for future use, must be zero. */ +} THREADNAME_INFO; + +static LONG CALLBACK msvc_threadname_vec_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + if (ExceptionInfo->ExceptionRecord != NULL && + ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_WINE_NAME_THREAD) + return EXCEPTION_CONTINUE_EXECUTION; + + return EXCEPTION_CONTINUE_SEARCH; +} + static void test_thread_description(void) { THREAD_NAME_INFORMATION *thread_desc; @@ -2360,6 +2379,9 @@ static void test_thread_description(void) char buff[128]; WCHAR *ptr; HRESULT hr; + HANDLE thread; + PVOID vectored_handler; + THREADNAME_INFO info; if (!pGetThreadDescription) { @@ -2463,6 +2485,24 @@ static void test_thread_description(void) ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + /* Set with a string from RtlInitUnicodeString. */ + hr = pSetThreadDescription(GetCurrentThread(), L"123"); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); + RtlInitUnicodeString(&thread_desc->ThreadName, (WCHAR *)(thread_desc + 1)); + + status = pNtSetInformationThread(GetCurrentThread(), ThreadNameInformation, thread_desc, sizeof(*thread_desc)); + todo_wine + ok(status == STATUS_SUCCESS, "Failed to set thread description, status %#x.\n", status); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, L"desc"), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + /* Set with 0 length/NULL pointer. */ hr = pSetThreadDescription(GetCurrentThread(), L"123"); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); @@ -2476,6 +2516,59 @@ static void test_thread_description(void) ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); LocalFree(ptr); + + /* Get with only THREAD_QUERY_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + ptr = NULL; + hr = pGetThreadDescription(thread, &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, L""), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + len = 0; + status = pNtQueryInformationThread(thread, ThreadNameInformation, NULL, 0, &len); + ok(status == STATUS_BUFFER_TOO_SMALL, "Unexpected status %#x.\n", status); + ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); + + CloseHandle(thread); + + /* Set with only THREAD_SET_LIMITED_INFORMATION access. */ + thread = OpenThread(THREAD_SET_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + + hr = pSetThreadDescription(thread, desc); + todo_wine + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); + + CloseHandle(thread); + + /* The old exception-based thread name method should not affect GetThreadDescription. */ + hr = pSetThreadDescription(GetCurrentThread(), desc); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); + + vectored_handler = pRtlAddVectoredExceptionHandler(FALSE, &msvc_threadname_vec_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + info.dwType = 0x1000; + info.szName = "123"; + info.dwThreadID = -1; + info.dwFlags = 0; + RaiseException(EXCEPTION_WINE_NAME_THREAD, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)&info); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); + + ptr = NULL; + hr = pGetThreadDescription(GetCurrentThread(), &ptr); + ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to get thread description, hr %#x.\n", hr); + ok(!lstrcmpW(ptr, desc), "Unexpected description %s.\n", wine_dbgstr_w(ptr)); + LocalFree(ptr); } static void init_funcs(void) @@ -2524,6 +2617,8 @@ static void init_funcs(void) X(NtQueryInformationThread); X(RtlGetThreadErrorMode); X(NtSetInformationThread); + X(RtlAddVectoredExceptionHandler); + X(RtlRemoveVectoredExceptionHandler); } #undef X } -- 2.34.1

1 1

[PATCH] winepulse: Move "last_time" to a local variable.
by Huw Davies 03 Mar '22

03 Mar '22

It's unused outside of pulse_timer_loop(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 6552e4ce250..901e054f6d0 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -65,7 +65,7 @@ struct pulse_stream BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; BOOL please_quit, just_started, just_underran; - pa_usec_t last_time, mmdev_period_usec; + pa_usec_t mmdev_period_usec; INT64 clock_lastpos, clock_written; @@ -1409,13 +1409,14 @@ static NTSTATUS pulse_timer_loop(void *args) struct timer_loop_params *params = args; struct pulse_stream *stream = params->stream; LARGE_INTEGER delay; + pa_usec_t last_time; UINT32 adv_bytes; int success; pa_operation *o; pulse_lock(); delay.QuadPart = -stream->mmdev_period_usec * 10; - pa_stream_get_time(stream->stream, &stream->last_time); + pa_stream_get_time(stream->stream, &last_time); pulse_unlock(); while (!stream->please_quit) @@ -1439,31 +1440,31 @@ static NTSTATUS pulse_timer_loop(void *args) err = pa_stream_get_time(stream->stream, &now); if (err == 0) { - TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(stream->last_time)); + TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(last_time)); if (stream->started && (stream->dataflow == eCapture || stream->held_bytes)) { if(stream->just_underran) { - stream->last_time = now; + last_time = now; stream->just_started = TRUE; } if (stream->just_started) { /* let it play out a period to absorb some latency and get accurate timing */ - pa_usec_t diff = now - stream->last_time; + pa_usec_t diff = now - last_time; if (diff > stream->mmdev_period_usec) { stream->just_started = FALSE; - stream->last_time = now; + last_time = now; } } else { - INT32 adjust = stream->last_time + stream->mmdev_period_usec - now; + INT32 adjust = last_time + stream->mmdev_period_usec - now; - adv_usec = now - stream->last_time; + adv_usec = now - last_time; if(adjust > ((INT32)(stream->mmdev_period_usec / 2))) adjust = stream->mmdev_period_usec / 2; @@ -1472,7 +1473,7 @@ static NTSTATUS pulse_timer_loop(void *args) delay.QuadPart = -(stream->mmdev_period_usec + adjust) * 10; - stream->last_time += stream->mmdev_period_usec; + last_time += stream->mmdev_period_usec; } if (stream->dataflow == eRender) @@ -1492,7 +1493,7 @@ static NTSTATUS pulse_timer_loop(void *args) } else { - stream->last_time = now; + last_time = now; delay.QuadPart = -stream->mmdev_period_usec * 10; } } -- 2.25.1

2 1

[PATCH v2 6/6] winealsa: Move set_event_handle to the unixlib.
by Huw Davies 03 Mar '22

03 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 21 +++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 22 +++++----------------- dlls/winealsa.drv/unixlib.h | 8 ++++++++ 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 8d148a9828f..d7c6ae7779c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1889,6 +1889,26 @@ static NTSTATUS get_current_padding(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS set_event_handle(void *args) +{ + struct set_event_handle_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED); + + if (stream->event){ + FIXME("called twice\n"); + return alsa_unlock_result(stream, &params->result, HRESULT_FROM_WIN32(ERROR_INVALID_NAME)); + } + + stream->event = params->event; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1903,4 +1923,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + set_event_handle, }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fa05cb00968..7a99a6b5d43 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct set_event_handle_params params; TRACE("(%p)->(%p)\n", This, event); @@ -1048,24 +1048,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(!(stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - alsa_unlock(stream); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (stream->event){ - alsa_unlock(stream); - FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } - - stream->event = event; + params.stream = This->stream; + params.event = event; - alsa_unlock(stream); + ALSA_CALL(set_event_handle, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 3d88d8d7f9b..bd3a1a4bc6a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -153,6 +153,13 @@ struct get_current_padding_params UINT32 *padding; }; +struct set_event_handle_params +{ + struct alsa_stream *stream; + HANDLE event; + HRESULT result; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -167,6 +174,7 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + alsa_set_event_handle, }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH v2 5/6] winealsa: Move reset to the unixlib.
by Huw Davies 03 Mar '22

03 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 36 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 37 ++++-------------------------------- dlls/winealsa.drv/unixlib.h | 7 +++++++ 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e5efb6b201b..8d148a9828f 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1514,6 +1514,41 @@ static NTSTATUS stop(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(stream->started) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->getbuf_last) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING); + + if(snd_pcm_drop(stream->pcm_handle) < 0) + WARN("snd_pcm_drop failed\n"); + + if(snd_pcm_reset(stream->pcm_handle) < 0) + WARN("snd_pcm_reset failed\n"); + + if(snd_pcm_prepare(stream->pcm_handle) < 0) + WARN("snd_pcm_prepare failed\n"); + + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; + }else{ + stream->written_frames += stream->held_frames; + } + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1861,6 +1896,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index d9e96b7790c..fa05cb00968 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1020,47 +1020,18 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(stream->started){ - alsa_unlock(stream); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->getbuf_last){ - alsa_unlock(stream); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(snd_pcm_drop(stream->pcm_handle) < 0) - WARN("snd_pcm_drop failed\n"); - - if(snd_pcm_reset(stream->pcm_handle) < 0) - WARN("snd_pcm_reset failed\n"); - - if(snd_pcm_prepare(stream->pcm_handle) < 0) - WARN("snd_pcm_prepare failed\n"); - - if(stream->flow == eRender){ - stream->written_frames = 0; - stream->last_pos_frames = 0; - }else{ - stream->written_frames += stream->held_frames; - } - stream->held_frames = 0; - stream->lcl_offs_frames = 0; - stream->wri_offs_frames = 0; + params.stream = This->stream; - alsa_unlock(stream); + ALSA_CALL(reset, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 1c3caabcc26..3d88d8d7f9b 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -103,6 +103,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -154,6 +160,7 @@ enum alsa_funcs alsa_release_stream, alsa_start, alsa_stop, + alsa_reset, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, -- 2.25.1

2 1

[PATCH v2 4/6] winealsa: Move stop to the unixlib.
by Huw Davies 03 Mar '22

03 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 51 +++--------------------------- dlls/winealsa.drv/unixlib.h | 7 +++++ 3 files changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index a5558718f47..e5efb6b201b 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1409,6 +1409,47 @@ exit: NtSetEvent(stream->event, NULL); } +static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) +{ + LARGE_INTEGER time_freq, current_time, time_diff; + + NtQueryPerformanceCounter(&current_time, &time_freq); + time_diff.QuadPart = current_time.QuadPart - stream->last_period_time.QuadPart; + return muldiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); +} + +static int alsa_rewind_best_effort(struct alsa_stream *stream) +{ + snd_pcm_uframes_t len, leave; + + /* we can't use snd_pcm_rewindable, some PCM devices crash. so follow + * PulseAudio's example and rewind as much data as we believe is in the + * buffer, minus 1.33ms for safety. */ + + /* amount of data to leave in ALSA buffer */ + leave = interp_elapsed_frames(stream) + stream->safe_rewind_frames; + + if(stream->held_frames < leave) + stream->held_frames = 0; + else + stream->held_frames -= leave; + + if(stream->data_in_alsa_frames < leave) + len = 0; + else + len = stream->data_in_alsa_frames - leave; + + TRACE("rewinding %lu frames, now held %u\n", len, stream->held_frames); + + if(len) + /* snd_pcm_rewind return value is often broken, assume it succeeded */ + snd_pcm_rewind(stream->pcm_handle, len); + + stream->data_in_alsa_frames = 0; + + return len; +} + static NTSTATUS start(void *args) { struct start_params *params = args; @@ -1455,6 +1496,24 @@ static NTSTATUS start(void *args) return alsa_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if(!stream->started) + return alsa_unlock_result(stream, &params->result, S_FALSE); + + if(stream->flow == eRender) + alsa_rewind_best_effort(stream); + + stream->started = FALSE; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1801,6 +1860,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = create_stream, release_stream, start, + stop, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 5eab548e606..d9e96b7790c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -972,39 +972,6 @@ static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) return MulDiv(time_diff.QuadPart, stream->fmt->nSamplesPerSec, time_freq.QuadPart); } -static int alsa_rewind_best_effort(ACImpl *This) -{ - struct alsa_stream *stream = This->stream; - snd_pcm_uframes_t len, leave; - - /* we can't use snd_pcm_rewindable, some PCM devices crash. so follow - * PulseAudio's example and rewind as much data as we believe is in the - * buffer, minus 1.33ms for safety. */ - - /* amount of data to leave in ALSA buffer */ - leave = interp_elapsed_frames(stream) + stream->safe_rewind_frames; - - if(stream->held_frames < leave) - stream->held_frames = 0; - else - stream->held_frames -= leave; - - if(stream->data_in_alsa_frames < leave) - len = 0; - else - len = stream->data_in_alsa_frames - leave; - - TRACE("rewinding %lu frames, now held %u\n", len, stream->held_frames); - - if(len) - /* snd_pcm_rewind return value is often broken, assume it succeeded */ - snd_pcm_rewind(stream->pcm_handle, len); - - stream->data_in_alsa_frames = 0; - - return len; -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1036,28 +1003,18 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - alsa_lock(stream); - - if(!stream->started){ - alsa_unlock(stream); - return S_FALSE; - } - - if(stream->flow == eRender) - alsa_rewind_best_effort(This); - - stream->started = FALSE; + params.stream = This->stream; - alsa_unlock(stream); + ALSA_CALL(stop, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index c058a920b6e..1c3caabcc26 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -97,6 +97,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -147,6 +153,7 @@ enum alsa_funcs alsa_create_stream, alsa_release_stream, alsa_start, + alsa_stop, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, -- 2.25.1

2 1

[PATCH v2 3/6] winealsa: Move start to the unixlib.
by Huw Davies 03 Mar '22

03 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 56 +++++++++++++++++---- dlls/winealsa.drv/mmdevdrv.c | 97 ++---------------------------------- dlls/winealsa.drv/unixlib.h | 17 +++---- 3 files changed, 59 insertions(+), 111 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index d455a3787e8..a5558718f47 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -1214,13 +1214,6 @@ static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE return written; } -static NTSTATUS write_best_effort(void *args) -{ - struct write_best_effort_tmp_params *params = args; - *params->written = alsa_write_best_effort(params->stream, params->buf, params->frames); - return STATUS_SUCCESS; -} - static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, snd_pcm_uframes_t to_write) @@ -1416,6 +1409,52 @@ exit: NtSetEvent(stream->event, NULL); } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct alsa_stream *stream = params->stream; + + alsa_lock(stream); + + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_SET); + + if(stream->started) + return alsa_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->flow == eCapture){ + /* dump any data that might be leftover in the ALSA capture buffer */ + snd_pcm_readi(stream->pcm_handle, stream->local_buffer, + stream->bufsize_frames); + }else{ + snd_pcm_sframes_t avail, written; + snd_pcm_uframes_t offs; + + avail = snd_pcm_avail_update(stream->pcm_handle); + avail = min(avail, stream->held_frames); + + if(stream->wri_offs_frames < stream->held_frames) + offs = stream->bufsize_frames - stream->held_frames + stream->wri_offs_frames; + else + offs = stream->wri_offs_frames - stream->held_frames; + + /* fill it with data */ + written = alsa_write_buffer_wrap(stream, stream->local_buffer, + stream->bufsize_frames, offs, avail); + + if(written > 0){ + stream->lcl_offs_frames = (offs + written) % stream->bufsize_frames; + stream->data_in_alsa_frames = written; + }else{ + stream->lcl_offs_frames = offs; + stream->data_in_alsa_frames = 0; + } + } + stream->started = TRUE; + + return alsa_unlock_result(stream, &params->result, S_OK); +} + static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; @@ -1761,12 +1800,11 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + start, timer_loop, is_format_supported, get_mix_format, get_buffer_size, get_latency, get_current_padding, - - write_best_effort /* temporary */ }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2748cc552a6..5eab548e606 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -963,51 +963,6 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) -{ - struct write_best_effort_tmp_params params; - snd_pcm_sframes_t written; - - params.stream = stream; - params.buf = buf; - params.frames = frames; - params.written = &written; - - ALSA_CALL(write_best_effort_tmp, &params); - - return written; -} - -static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, - snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, - snd_pcm_uframes_t to_write) -{ - snd_pcm_sframes_t ret = 0; - - while(to_write){ - snd_pcm_uframes_t chunk; - snd_pcm_sframes_t tmp; - - if(offs + to_write > buflen) - chunk = buflen - offs; - else - chunk = to_write; - - tmp = alsa_write_best_effort(stream, buf + offs * stream->fmt->nBlockAlign, chunk); - if(tmp < 0) - return ret; - if(!tmp) - break; - - ret += tmp; - to_write -= tmp; - offs += tmp; - offs %= buflen; - } - - return ret; -} - static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) { LARGE_INTEGER time_freq, current_time, time_diff; @@ -1053,7 +1008,7 @@ static int alsa_rewind_best_effort(ACImpl *This) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct start_params params; TRACE("(%p)\n", This); @@ -1064,60 +1019,18 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - alsa_lock(stream); - - if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - alsa_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(stream->started){ - alsa_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->flow == eCapture){ - /* dump any data that might be leftover in the ALSA capture buffer */ - snd_pcm_readi(stream->pcm_handle, stream->local_buffer, - stream->bufsize_frames); - }else{ - snd_pcm_sframes_t avail, written; - snd_pcm_uframes_t offs; - - avail = snd_pcm_avail_update(stream->pcm_handle); - avail = min(avail, stream->held_frames); - - if(stream->wri_offs_frames < stream->held_frames) - offs = stream->bufsize_frames - stream->held_frames + stream->wri_offs_frames; - else - offs = stream->wri_offs_frames - stream->held_frames; + params.stream = This->stream; - /* fill it with data */ - written = alsa_write_buffer_wrap(stream, stream->local_buffer, - stream->bufsize_frames, offs, avail); + ALSA_CALL(start, &params); - if(written > 0){ - stream->lcl_offs_frames = (offs + written) % stream->bufsize_frames; - stream->data_in_alsa_frames = written; - }else{ - stream->lcl_offs_frames = offs; - stream->data_in_alsa_frames = 0; - } - } - - if(!This->timer_thread){ + if(SUCCEEDED(params.result) && !This->timer_thread){ This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This->stream, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - stream->started = TRUE; - - alsa_unlock(stream); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 4acbbcbcf11..c058a920b6e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -91,6 +91,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct alsa_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct alsa_stream *stream; @@ -135,27 +141,18 @@ struct get_current_padding_params UINT32 *padding; }; -struct write_best_effort_tmp_params -{ - struct alsa_stream *stream; - BYTE *buf; - snd_pcm_uframes_t frames; - snd_pcm_sframes_t *written; -}; - enum alsa_funcs { alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, + alsa_start, alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, - - alsa_write_best_effort_tmp }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH v2 2/6] winealsa: Move timer_loop to the unixlib.
by Huw Davies 03 Mar '22

03 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 240 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 229 +++------------------------------ dlls/winealsa.drv/unixlib.h | 9 +- 3 files changed, 268 insertions(+), 210 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 73971c0f8bb..d455a3787e8 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -960,6 +960,12 @@ static NTSTATUS release_stream(void *args) struct alsa_stream *stream = params->stream; SIZE_T size; + if(params->timer_thread){ + stream->please_quit = TRUE; + NtWaitForSingleObject(params->timer_thread, FALSE, NULL); + NtClose(params->timer_thread); + } + snd_pcm_drop(stream->pcm_handle); snd_pcm_close(stream->pcm_handle); if(stream->local_buffer){ @@ -1215,6 +1221,239 @@ static NTSTATUS write_best_effort(void *args) return STATUS_SUCCESS; } +static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE *buf, + snd_pcm_uframes_t buflen, snd_pcm_uframes_t offs, + snd_pcm_uframes_t to_write) +{ + snd_pcm_sframes_t ret = 0; + + while(to_write){ + snd_pcm_uframes_t chunk; + snd_pcm_sframes_t tmp; + + if(offs + to_write > buflen) + chunk = buflen - offs; + else + chunk = to_write; + + tmp = alsa_write_best_effort(stream, buf + offs * stream->fmt->nBlockAlign, chunk); + if(tmp < 0) + return ret; + if(!tmp) + break; + + ret += tmp; + to_write -= tmp; + offs += tmp; + offs %= buflen; + } + + return ret; +} + +static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) +{ + if(left <= right) + return right - left; + return bufsize - (left - right); +} + +static UINT data_not_in_alsa(struct alsa_stream *stream) +{ + UINT32 diff; + + diff = buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, stream->bufsize_frames); + if(diff) + return diff; + + return stream->held_frames - stream->data_in_alsa_frames; +} + +/* Here's the buffer setup: + * + * vvvvvvvv sent to HW already + * vvvvvvvv in ALSA buffer but rewindable + * [dddddddddddddddd] ALSA buffer + * [dddddddddddddddd--------] mmdevapi buffer + * ^^^^^^^^ data_in_alsa_frames + * ^^^^^^^^^^^^^^^^ held_frames + * ^ lcl_offs_frames + * ^ wri_offs_frames + * + * GetCurrentPadding is held_frames + * + * During period callback, we decrement held_frames, fill ALSA buffer, and move + * lcl_offs forward + * + * During Stop, we rewind the ALSA buffer + */ +static void alsa_write_data(struct alsa_stream *stream) +{ + snd_pcm_sframes_t written; + snd_pcm_uframes_t avail, max_copy_frames, data_frames_played; + int err; + + /* this call seems to be required to get an accurate snd_pcm_state() */ + avail = snd_pcm_avail_update(stream->pcm_handle); + + if(snd_pcm_state(stream->pcm_handle) == SND_PCM_STATE_XRUN){ + TRACE("XRun state, recovering\n"); + + avail = stream->alsa_bufsize_frames; + + if((err = snd_pcm_recover(stream->pcm_handle, -EPIPE, 1)) < 0) + WARN("snd_pcm_recover failed: %d (%s)\n", err, snd_strerror(err)); + + if((err = snd_pcm_reset(stream->pcm_handle)) < 0) + WARN("snd_pcm_reset failed: %d (%s)\n", err, snd_strerror(err)); + + if((err = snd_pcm_prepare(stream->pcm_handle)) < 0) + WARN("snd_pcm_prepare failed: %d (%s)\n", err, snd_strerror(err)); + } + + TRACE("avail: %ld\n", avail); + + /* Add a lead-in when starting with too few frames to ensure + * continuous rendering. Additional benefit: Force ALSA to start. */ + if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) + { + alsa_write_best_effort(stream, stream->silence_buf, + stream->alsa_period_frames - stream->held_frames); + stream->vol_adjusted_frames = 0; + } + + if(stream->started) + max_copy_frames = data_not_in_alsa(stream); + else + max_copy_frames = 0; + + data_frames_played = min(stream->data_in_alsa_frames, avail); + stream->data_in_alsa_frames -= data_frames_played; + + if(stream->held_frames > data_frames_played){ + if(stream->started) + stream->held_frames -= data_frames_played; + }else + stream->held_frames = 0; + + while(avail && max_copy_frames){ + snd_pcm_uframes_t to_write; + + to_write = min(avail, max_copy_frames); + + written = alsa_write_buffer_wrap(stream, stream->local_buffer, + stream->bufsize_frames, stream->lcl_offs_frames, to_write); + if(written <= 0) + break; + + avail -= written; + stream->lcl_offs_frames += written; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->data_in_alsa_frames += written; + max_copy_frames -= written; + } + + if(stream->event) + NtSetEvent(stream->event, NULL); +} + +static void alsa_read_data(struct alsa_stream *stream) +{ + snd_pcm_sframes_t nread; + UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; + unsigned int i; + + if(!stream->started) + goto exit; + + /* FIXME: Detect overrun and signal DATA_DISCONTINUITY + * How to count overrun frames and report them as position increase? */ + limit = stream->bufsize_frames - max(limit, pos); + + nread = snd_pcm_readi(stream->pcm_handle, + stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); + TRACE("read %ld from %u limit %u\n", nread, pos, limit); + if(nread < 0){ + int ret; + + if(nread == -EAGAIN) /* no data yet */ + return; + + WARN("read failed, recovering: %ld (%s)\n", nread, snd_strerror(nread)); + + ret = snd_pcm_recover(stream->pcm_handle, nread, 0); + if(ret < 0){ + WARN("Recover failed: %d (%s)\n", ret, snd_strerror(ret)); + return; + } + + nread = snd_pcm_readi(stream->pcm_handle, + stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); + if(nread < 0){ + WARN("read failed: %ld (%s)\n", nread, snd_strerror(nread)); + return; + } + } + + for(i = 0; i < stream->fmt->nChannels; i++) + if(stream->vols[i] != 0.0f) + break; + if(i == stream->fmt->nChannels){ /* mute */ + int err; + if((err = snd_pcm_format_set_silence(stream->alsa_format, + stream->local_buffer + pos * stream->fmt->nBlockAlign, + nread)) < 0) + WARN("Setting buffer to silence failed: %d (%s)\n", err, + snd_strerror(err)); + } + + stream->wri_offs_frames += nread; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += nread; + +exit: + if(stream->event) + NtSetEvent(stream->event, NULL); +} + +static NTSTATUS timer_loop(void *args) +{ + struct timer_loop_params *params = args; + struct alsa_stream *stream = params->stream; + LARGE_INTEGER delay, next; + int adjust; + + alsa_lock(stream); + + delay.QuadPart = -stream->mmdev_period_rt; + NtQueryPerformanceCounter(&stream->last_period_time, NULL); + next.QuadPart = stream->last_period_time.QuadPart + stream->mmdev_period_rt; + + while(!stream->please_quit){ + if(stream->flow == eRender) + alsa_write_data(stream); + else if(stream->flow == eCapture) + alsa_read_data(stream); + alsa_unlock(stream); + + NtDelayExecution(FALSE, &delay); + + alsa_lock(stream); + NtQueryPerformanceCounter(&stream->last_period_time, NULL); + adjust = next.QuadPart - stream->last_period_time.QuadPart; + if(adjust > stream->mmdev_period_rt / 2) + adjust = stream->mmdev_period_rt / 2; + else if(adjust < -stream->mmdev_period_rt / 2) + adjust = -stream->mmdev_period_rt / 2; + delay.QuadPart = -(stream->mmdev_period_rt + adjust); + next.QuadPart += stream->mmdev_period_rt; + } + + alsa_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1522,6 +1761,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + timer_loop, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c06b08709f2..2748cc552a6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -109,7 +109,7 @@ struct ACImpl { UINT32 channel_count; struct alsa_stream *stream; - HANDLE timer; + HANDLE timer_thread; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -128,8 +128,6 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static HANDLE g_timer_q; - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { @@ -216,9 +214,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, &alsa_handle, sizeof(alsa_handle), NULL)) return FALSE; - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return FALSE; break; case DLL_PROCESS_DETACH: @@ -252,17 +247,30 @@ static void alsa_unlock(struct alsa_stream *stream) pthread_mutex_unlock(&stream->lock); } -static HRESULT alsa_stream_release(struct alsa_stream *stream) +static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thread) { struct release_stream_params params; params.stream = stream; + params.timer_thread = timer_thread; ALSA_CALL(release_stream, &params); return params.result; } +static DWORD WINAPI alsa_timer_thread(void *user) +{ + struct alsa_stream *stream = user; + struct timer_loop_params params; + + params.stream = stream; + + ALSA_CALL(timer_loop, &params); + + return 0; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -552,17 +560,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - if(This->timer){ - HANDLE event; - DWORD wait; - event = CreateEventW(NULL, TRUE, FALSE, NULL); - wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); - wait = wait && GetLastError() == ERROR_IO_PENDING; - if(event && wait) - WaitForSingleObject(event, INFINITE); - CloseHandle(event); - } - IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); @@ -573,7 +570,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) - alsa_stream_release(This->stream); + alsa_stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -807,7 +804,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ - alsa_stream_release(stream); + alsa_stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; }else{ @@ -1011,187 +1008,6 @@ static snd_pcm_sframes_t alsa_write_buffer_wrap(struct alsa_stream *stream, BYTE return ret; } -static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) -{ - if(left <= right) - return right - left; - return bufsize - (left - right); -} - -static UINT data_not_in_alsa(struct alsa_stream *stream) -{ - UINT32 diff; - - diff = buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, stream->bufsize_frames); - if(diff) - return diff; - - return stream->held_frames - stream->data_in_alsa_frames; -} -/* Here's the buffer setup: - * - * vvvvvvvv sent to HW already - * vvvvvvvv in ALSA buffer but rewindable - * [dddddddddddddddd] ALSA buffer - * [dddddddddddddddd--------] mmdevapi buffer - * ^^^^^^^^ data_in_alsa_frames - * ^^^^^^^^^^^^^^^^ held_frames - * ^ lcl_offs_frames - * ^ wri_offs_frames - * - * GetCurrentPadding is held_frames - * - * During period callback, we decrement held_frames, fill ALSA buffer, and move - * lcl_offs forward - * - * During Stop, we rewind the ALSA buffer - */ -static void alsa_write_data(struct alsa_stream *stream) -{ - snd_pcm_sframes_t written; - snd_pcm_uframes_t avail, max_copy_frames, data_frames_played; - int err; - - /* this call seems to be required to get an accurate snd_pcm_state() */ - avail = snd_pcm_avail_update(stream->pcm_handle); - - if(snd_pcm_state(stream->pcm_handle) == SND_PCM_STATE_XRUN){ - TRACE("XRun state, recovering\n"); - - avail = stream->alsa_bufsize_frames; - - if((err = snd_pcm_recover(stream->pcm_handle, -EPIPE, 1)) < 0) - WARN("snd_pcm_recover failed: %d (%s)\n", err, snd_strerror(err)); - - if((err = snd_pcm_reset(stream->pcm_handle)) < 0) - WARN("snd_pcm_reset failed: %d (%s)\n", err, snd_strerror(err)); - - if((err = snd_pcm_prepare(stream->pcm_handle)) < 0) - WARN("snd_pcm_prepare failed: %d (%s)\n", err, snd_strerror(err)); - } - - TRACE("avail: %ld\n", avail); - - /* Add a lead-in when starting with too few frames to ensure - * continuous rendering. Additional benefit: Force ALSA to start. */ - if(stream->data_in_alsa_frames == 0 && stream->held_frames < stream->alsa_period_frames) - { - alsa_write_best_effort(stream, stream->silence_buf, - stream->alsa_period_frames - stream->held_frames); - stream->vol_adjusted_frames = 0; - } - - if(stream->started) - max_copy_frames = data_not_in_alsa(stream); - else - max_copy_frames = 0; - - data_frames_played = min(stream->data_in_alsa_frames, avail); - stream->data_in_alsa_frames -= data_frames_played; - - if(stream->held_frames > data_frames_played){ - if(stream->started) - stream->held_frames -= data_frames_played; - }else - stream->held_frames = 0; - - while(avail && max_copy_frames){ - snd_pcm_uframes_t to_write; - - to_write = min(avail, max_copy_frames); - - written = alsa_write_buffer_wrap(stream, stream->local_buffer, - stream->bufsize_frames, stream->lcl_offs_frames, to_write); - if(written <= 0) - break; - - avail -= written; - stream->lcl_offs_frames += written; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->data_in_alsa_frames += written; - max_copy_frames -= written; - } - - if(stream->event) - SetEvent(stream->event); -} - -static void alsa_read_data(struct alsa_stream *stream) -{ - snd_pcm_sframes_t nread; - UINT32 pos = stream->wri_offs_frames, limit = stream->held_frames; - unsigned int i; - - if(!stream->started) - goto exit; - - /* FIXME: Detect overrun and signal DATA_DISCONTINUITY - * How to count overrun frames and report them as position increase? */ - limit = stream->bufsize_frames - max(limit, pos); - - nread = snd_pcm_readi(stream->pcm_handle, - stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); - TRACE("read %ld from %u limit %u\n", nread, pos, limit); - if(nread < 0){ - int ret; - - if(nread == -EAGAIN) /* no data yet */ - return; - - WARN("read failed, recovering: %ld (%s)\n", nread, snd_strerror(nread)); - - ret = snd_pcm_recover(stream->pcm_handle, nread, 0); - if(ret < 0){ - WARN("Recover failed: %d (%s)\n", ret, snd_strerror(ret)); - return; - } - - nread = snd_pcm_readi(stream->pcm_handle, - stream->local_buffer + pos * stream->fmt->nBlockAlign, limit); - if(nread < 0){ - WARN("read failed: %ld (%s)\n", nread, snd_strerror(nread)); - return; - } - } - - for(i = 0; i < stream->fmt->nChannels; i++) - if(stream->vols[i] != 0.0f) - break; - if(i == stream->fmt->nChannels){ /* mute */ - int err; - if((err = snd_pcm_format_set_silence(stream->alsa_format, - stream->local_buffer + pos * stream->fmt->nBlockAlign, - nread)) < 0) - WARN("Setting buffer to silence failed: %d (%s)\n", err, - snd_strerror(err)); - } - - stream->wri_offs_frames += nread; - stream->wri_offs_frames %= stream->bufsize_frames; - stream->held_frames += nread; - -exit: - if(stream->event) - SetEvent(stream->event); -} - -static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) -{ - ACImpl *This = user; - struct alsa_stream *stream = This->stream; - - alsa_lock(stream); - - QueryPerformanceCounter(&stream->last_period_time); - - if(stream->flow == eRender) - alsa_write_data(stream); - else if(stream->flow == eCapture) - alsa_read_data(stream); - - alsa_unlock(stream); -} - static snd_pcm_uframes_t interp_elapsed_frames(struct alsa_stream *stream) { LARGE_INTEGER time_freq, current_time, time_diff; @@ -1291,14 +1107,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) } } - if(!This->timer){ - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, alsa_push_buffer_data, - This, 0, stream->mmdev_period_rt / 10000, WT_EXECUTEINTIMERTHREAD)){ - alsa_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - WARN("Unable to create timer: %u\n", GetLastError()); - return E_OUTOFMEMORY; - } + if(!This->timer_thread){ + This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This->stream, 0, NULL); + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } stream->started = TRUE; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 3fd6d2a73ee..4acbbcbcf11 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -37,7 +37,7 @@ struct alsa_stream int alsa_channels; int alsa_channel_map[32]; - BOOL started; + BOOL started, please_quit; REFERENCE_TIME mmdev_period_rt; UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames, mmdev_period_frames; @@ -87,9 +87,15 @@ struct create_stream_params struct release_stream_params { struct alsa_stream *stream; + HANDLE timer_thread; HRESULT result; }; +struct timer_loop_params +{ + struct alsa_stream *stream; +}; + struct is_format_supported_params { const char *alsa_name; @@ -142,6 +148,7 @@ enum alsa_funcs alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, + alsa_timer_loop, alsa_is_format_supported, alsa_get_mix_format, alsa_get_buffer_size, -- 2.25.1

2 1

[PATCH v2 1/6] winealsa: Add a temporary write_best_effort syscall.
by Huw Davies 03 Mar '22

03 Mar '22

This will allow the timing loop to move over without needing to move "start" at the same time. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 237 ++++++++++++++++++++++++++++++++++- dlls/winealsa.drv/mmdevdrv.c | 230 +-------------------------------- dlls/winealsa.drv/unixlib.h | 10 ++ 3 files changed, 252 insertions(+), 225 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index c73490ebfe6..73971c0f8bb 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -970,7 +970,7 @@ static NTSTATUS release_stream(void *args) size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); } - /* free(stream->remapping_buf); */ + free(stream->remapping_buf); free(stream->silence_buf); free(stream->hw_params); free(stream->fmt); @@ -982,6 +982,239 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) +{ + snd_pcm_uframes_t i; + UINT c; + UINT bytes_per_sample = stream->fmt->wBitsPerSample / 8; + + if(!stream->need_remapping) + return buf; + + if(stream->remapping_buf_frames < frames){ + stream->remapping_buf = realloc(stream->remapping_buf, + bytes_per_sample * stream->alsa_channels * frames); + stream->remapping_buf_frames = frames; + } + + snd_pcm_format_set_silence(stream->alsa_format, stream->remapping_buf, + frames * stream->alsa_channels); + + switch(stream->fmt->wBitsPerSample){ + case 8: { + UINT8 *tgt_buf, *src_buf; + tgt_buf = stream->remapping_buf; + src_buf = buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; + } + break; + } + case 16: { + UINT16 *tgt_buf, *src_buf; + tgt_buf = (UINT16*)stream->remapping_buf; + src_buf = (UINT16*)buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; + } + } + break; + case 32: { + UINT32 *tgt_buf, *src_buf; + tgt_buf = (UINT32*)stream->remapping_buf; + src_buf = (UINT32*)buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < stream->fmt->nChannels; ++c) + tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += stream->alsa_channels; + src_buf += stream->fmt->nChannels; + } + } + break; + default: { + BYTE *tgt_buf, *src_buf; + tgt_buf = stream->remapping_buf; + src_buf = buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < stream->fmt->nChannels; ++c) + memcpy(&tgt_buf[stream->alsa_channel_map[c] * bytes_per_sample], + &src_buf[c * bytes_per_sample], bytes_per_sample); + tgt_buf += stream->alsa_channels * bytes_per_sample; + src_buf += stream->fmt->nChannels * bytes_per_sample; + } + } + break; + } + + return stream->remapping_buf; +} + +static void adjust_buffer_volume(const struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) +{ + BOOL adjust = FALSE; + UINT32 i, channels, mute = 0; + BYTE *end; + + if (stream->vol_adjusted_frames >= frames) + return; + channels = stream->fmt->nChannels; + + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + { + adjust |= stream->vols[i] != 1.0f; + if (stream->vols[i] == 0.0f) + mute++; + } + + if (mute == channels) + { + int err = snd_pcm_format_set_silence(stream->alsa_format, buf, frames * channels); + if (err < 0) + WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); + return; + } + if (!adjust) return; + + /* Skip the frames we've already adjusted before */ + end = buf + frames * stream->fmt->nBlockAlign; + buf += stream->vol_adjusted_frames * stream->fmt->nBlockAlign; + + switch (stream->alsa_format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buf; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * stream->vols[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0) + case SND_PCM_FORMAT_S16_LE: + PROCESS_BUFFER(INT16); + break; + case SND_PCM_FORMAT_S32_LE: + PROCESS_BUFFER(INT32); + break; + case SND_PCM_FORMAT_FLOAT_LE: + PROCESS_BUFFER(float); + break; + case SND_PCM_FORMAT_FLOAT64_LE: + PROCESS_BUFFER(double); + break; +#undef PROCESS_BUFFER + case SND_PCM_FORMAT_S20_3LE: + case SND_PCM_FORMAT_S24_3LE: + { + /* Do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buf, mask = ~0xff; + BYTE *p; + + /* After we adjust the volume, we need to mask out low bits */ + if (stream->alsa_format == SND_PCM_FORMAT_S20_3LE) + mask = ~0x0fff; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * stream->vols[i]); + v[k] &= mask; + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | v[1] << 16; + *q++ = v[1] >> 16 | v[2] << 8; + *q++ = v[2] >> 24 | v[3]; + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * stream->vols[i]); + v &= mask; + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case SND_PCM_FORMAT_U8: + { + UINT8 *p = (UINT8*)buf; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * stream->vols[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", stream->alsa_format); + break; + } +} + +static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) +{ + snd_pcm_sframes_t written; + + adjust_buffer_volume(stream, buf, frames); + + /* Mark the frames we've already adjusted */ + if (stream->vol_adjusted_frames < frames) + stream->vol_adjusted_frames = frames; + + buf = remap_channels(stream, buf, frames); + + written = snd_pcm_writei(stream->pcm_handle, buf, frames); + if(written < 0){ + int ret; + + if(written == -EAGAIN) + /* buffer full */ + return 0; + + WARN("writei failed, recovering: %ld (%s)\n", written, + snd_strerror(written)); + + ret = snd_pcm_recover(stream->pcm_handle, written, 0); + if(ret < 0){ + WARN("Could not recover: %d (%s)\n", ret, snd_strerror(ret)); + return ret; + } + + written = snd_pcm_writei(stream->pcm_handle, buf, frames); + } + + if (written > 0) + stream->vol_adjusted_frames -= written; + return written; +} + +static NTSTATUS write_best_effort(void *args) +{ + struct write_best_effort_tmp_params *params = args; + *params->written = alsa_write_best_effort(params->stream, params->buf, params->frames); + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -1294,4 +1527,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_buffer_size, get_latency, get_current_padding, + + write_best_effort /* temporary */ }; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a4ab0e179d1..c06b08709f2 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -256,9 +256,6 @@ static HRESULT alsa_stream_release(struct alsa_stream *stream) { struct release_stream_params params; - /* FIXME: to be moved with remap_channels() */ - HeapFree(GetProcessHeap(), 0, stream->remapping_buf); - params.stream = stream; ALSA_CALL(release_stream, &params); @@ -969,233 +966,18 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, return S_OK; } -static BYTE *remap_channels(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) -{ - snd_pcm_uframes_t i; - UINT c; - UINT bytes_per_sample = stream->fmt->wBitsPerSample / 8; - - if(!stream->need_remapping) - return buf; - - if(!stream->remapping_buf){ - stream->remapping_buf = HeapAlloc(GetProcessHeap(), 0, - bytes_per_sample * stream->alsa_channels * frames); - stream->remapping_buf_frames = frames; - }else if(stream->remapping_buf_frames < frames){ - stream->remapping_buf = HeapReAlloc(GetProcessHeap(), 0, stream->remapping_buf, - bytes_per_sample * stream->alsa_channels * frames); - stream->remapping_buf_frames = frames; - } - - snd_pcm_format_set_silence(stream->alsa_format, stream->remapping_buf, - frames * stream->alsa_channels); - - switch(stream->fmt->wBitsPerSample){ - case 8: { - UINT8 *tgt_buf, *src_buf; - tgt_buf = stream->remapping_buf; - src_buf = buf; - for(i = 0; i < frames; ++i){ - for(c = 0; c < stream->fmt->nChannels; ++c) - tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += stream->alsa_channels; - src_buf += stream->fmt->nChannels; - } - break; - } - case 16: { - UINT16 *tgt_buf, *src_buf; - tgt_buf = (UINT16*)stream->remapping_buf; - src_buf = (UINT16*)buf; - for(i = 0; i < frames; ++i){ - for(c = 0; c < stream->fmt->nChannels; ++c) - tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += stream->alsa_channels; - src_buf += stream->fmt->nChannels; - } - } - break; - case 32: { - UINT32 *tgt_buf, *src_buf; - tgt_buf = (UINT32*)stream->remapping_buf; - src_buf = (UINT32*)buf; - for(i = 0; i < frames; ++i){ - for(c = 0; c < stream->fmt->nChannels; ++c) - tgt_buf[stream->alsa_channel_map[c]] = src_buf[c]; - tgt_buf += stream->alsa_channels; - src_buf += stream->fmt->nChannels; - } - } - break; - default: { - BYTE *tgt_buf, *src_buf; - tgt_buf = stream->remapping_buf; - src_buf = buf; - for(i = 0; i < frames; ++i){ - for(c = 0; c < stream->fmt->nChannels; ++c) - memcpy(&tgt_buf[stream->alsa_channel_map[c] * bytes_per_sample], - &src_buf[c * bytes_per_sample], bytes_per_sample); - tgt_buf += stream->alsa_channels * bytes_per_sample; - src_buf += stream->fmt->nChannels * bytes_per_sample; - } - } - break; - } - - return stream->remapping_buf; -} - -static void adjust_buffer_volume(const struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) -{ - BOOL adjust = FALSE; - UINT32 i, channels, mute = 0; - BYTE *end; - - if (stream->vol_adjusted_frames >= frames) - return; - channels = stream->fmt->nChannels; - - /* Adjust the buffer based on the volume for each channel */ - for (i = 0; i < channels; i++) - { - adjust |= stream->vols[i] != 1.0f; - if (stream->vols[i] == 0.0f) - mute++; - } - - if (mute == channels) - { - int err = snd_pcm_format_set_silence(stream->alsa_format, buf, frames * channels); - if (err < 0) - WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); - return; - } - if (!adjust) return; - - /* Skip the frames we've already adjusted before */ - end = buf + frames * stream->fmt->nBlockAlign; - buf += stream->vol_adjusted_frames * stream->fmt->nBlockAlign; - - switch (stream->alsa_format) - { -#ifndef WORDS_BIGENDIAN -#define PROCESS_BUFFER(type) do \ -{ \ - type *p = (type*)buf; \ - do \ - { \ - for (i = 0; i < channels; i++) \ - p[i] = p[i] * stream->vols[i]; \ - p += i; \ - } while ((BYTE*)p != end); \ -} while (0) - case SND_PCM_FORMAT_S16_LE: - PROCESS_BUFFER(INT16); - break; - case SND_PCM_FORMAT_S32_LE: - PROCESS_BUFFER(INT32); - break; - case SND_PCM_FORMAT_FLOAT_LE: - PROCESS_BUFFER(float); - break; - case SND_PCM_FORMAT_FLOAT64_LE: - PROCESS_BUFFER(double); - break; -#undef PROCESS_BUFFER - case SND_PCM_FORMAT_S20_3LE: - case SND_PCM_FORMAT_S24_3LE: - { - /* Do it 12 bytes at a time until it is no longer possible */ - UINT32 *q = (UINT32*)buf, mask = ~0xff; - BYTE *p; - - /* After we adjust the volume, we need to mask out low bits */ - if (stream->alsa_format == SND_PCM_FORMAT_S20_3LE) - mask = ~0x0fff; - - i = 0; - while (end - (BYTE*)q >= 12) - { - UINT32 v[4], k; - v[0] = q[0] << 8; - v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); - v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); - v[3] = q[2] & ~0xff; - for (k = 0; k < 4; k++) - { - v[k] = (INT32)((INT32)v[k] * stream->vols[i]); - v[k] &= mask; - if (++i == channels) i = 0; - } - *q++ = v[0] >> 8 | v[1] << 16; - *q++ = v[1] >> 16 | v[2] << 8; - *q++ = v[2] >> 24 | v[3]; - } - p = (BYTE*)q; - while (p != end) - { - UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * stream->vols[i]); - v &= mask; - *p++ = v >> 8 & 0xff; - *p++ = v >> 16 & 0xff; - *p++ = v >> 24; - if (++i == channels) i = 0; - } - break; - } -#endif - case SND_PCM_FORMAT_U8: - { - UINT8 *p = (UINT8*)buf; - do - { - for (i = 0; i < channels; i++) - p[i] = (int)((p[i] - 128) * stream->vols[i]) + 128; - p += i; - } while ((BYTE*)p != end); - break; - } - default: - TRACE("Unhandled format %i, not adjusting volume.\n", stream->alsa_format); - break; - } -} - static snd_pcm_sframes_t alsa_write_best_effort(struct alsa_stream *stream, BYTE *buf, snd_pcm_uframes_t frames) { + struct write_best_effort_tmp_params params; snd_pcm_sframes_t written; - adjust_buffer_volume(stream, buf, frames); - - /* Mark the frames we've already adjusted */ - if (stream->vol_adjusted_frames < frames) - stream->vol_adjusted_frames = frames; - - buf = remap_channels(stream, buf, frames); - - written = snd_pcm_writei(stream->pcm_handle, buf, frames); - if(written < 0){ - int ret; - - if(written == -EAGAIN) - /* buffer full */ - return 0; - - WARN("writei failed, recovering: %ld (%s)\n", written, - snd_strerror(written)); - - ret = snd_pcm_recover(stream->pcm_handle, written, 0); - if(ret < 0){ - WARN("Could not recover: %d (%s)\n", ret, snd_strerror(ret)); - return ret; - } + params.stream = stream; + params.buf = buf; + params.frames = frames; + params.written = &written; - written = snd_pcm_writei(stream->pcm_handle, buf, frames); - } + ALSA_CALL(write_best_effort_tmp, &params); - if (written > 0) - stream->vol_adjusted_frames -= written; return written; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 2484fca8c90..3fd6d2a73ee 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -129,6 +129,14 @@ struct get_current_padding_params UINT32 *padding; }; +struct write_best_effort_tmp_params +{ + struct alsa_stream *stream; + BYTE *buf; + snd_pcm_uframes_t frames; + snd_pcm_sframes_t *written; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -139,6 +147,8 @@ enum alsa_funcs alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, + + alsa_write_best_effort_tmp }; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH] ntdll: Ensure CONTEXT_EX on exception stack is initialized.
by Brendan Shanks 03 Mar '22

03 Mar '22

On non-AVX CPUs, CONTEXT_EX is not being initialized. In WOW64 mode, this results in invalid exception records when dispatch_wow_exception() uses RtlCopyContext(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- - The XState/All lengths come from RtlInitializeExtendedContext2(). - I only experienced the bug on x86_64, but made the i386 change for consistency. dlls/ntdll/unix/signal_i386.c | 23 +++++++++++++++++++---- dlls/ntdll/unix/signal_x86_64.c | 23 +++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..e2a6148d609 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -581,12 +581,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } @@ -1456,6 +1467,10 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index ac67e12240a..29096261723 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -413,12 +413,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ @@ -2198,6 +2209,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } CS_sig(sigcontext) = cs64_sel; RIP_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; -- 2.32.0 (Apple Git-132)

1 0

[PATCH 01/27] dlls/devenum/tests: enable compilation with long types
by Eric Pouech 03 Mar '22

03 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/devenum/tests/Makefile.in | 1 dlls/devenum/tests/devenum.c | 266 ++++++++++++++++++++-------------------- 2 files changed, 133 insertions(+), 134 deletions(-) diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 762c007deee..2d6ec2d87ea 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = devenum.dll IMPORTS = advapi32 dsound msdmo msvfw32 oleaut32 ole32 winmm diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 3e0d6f57dc3..d91f8699985 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -48,26 +48,26 @@ static void test_devenum(void) hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - ok(hr == S_OK, "Failed to create devenum: %#x\n", hr); + ok(hr == S_OK, "Failed to create devenum: %#lx\n", hr); hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_ActiveMovieCategories, &enum_cat, 0); - ok(hr == S_OK, "Failed to enum categories: %#x\n", hr); + ok(hr == S_OK, "Failed to enum categories: %#lx\n", hr); while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); + ok(hr == S_OK, "Failed to read CLSID: %#lx\n", hr); hr = CLSIDFromString(V_BSTR(&var), &cat_guid); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + ok(hr == S_OK, "Failed to read FriendlyName: %#lx\n", hr); if (winetest_debug > 1) trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); @@ -77,7 +77,7 @@ static void test_devenum(void) IMoniker_Release(moniker); hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &cat_guid, &enum_moniker, 0); - ok(SUCCEEDED(hr), "Failed to enum devices: %#x\n", hr); + ok(SUCCEEDED(hr), "Failed to enum devices: %#lx\n", hr); if (hr == S_OK) { @@ -86,29 +86,29 @@ static void test_devenum(void) while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IMoniker_GetClassID(moniker, NULL); - ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); + ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %lx\n", hr); hr = IMoniker_GetClassID(moniker, &clsid); - ok(hr == S_OK, "IMoniker_GetClassID failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_GetClassID failed with error %lx\n", hr); ok(IsEqualGUID(&clsid, &CLSID_CDeviceMoniker), "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), - "IPropertyBag_Read failed: %#x\n", hr); + "IPropertyBag_Read failed: %#lx\n", hr); if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got %#x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); @@ -122,13 +122,13 @@ static void test_devenum(void) &IID_IUnknown, (void **)&unk); if (hr2 == S_OK) IUnknown_Release(unk); - ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + ok(hr2 == hr, "Expected hr %#lx, got %#lx.\n", hr, hr2); } hr = CreateBindCtx(0, &bindctx); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %lx\n", hr); IPropertyBag_Release(prop_bag); IBindCtx_Release(bindctx); @@ -159,22 +159,22 @@ static void test_moniker_isequal(void) &IID_ICreateDevEnum, (LPVOID*)&create_devenum); if (FAILED(res)) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); + skip("Cannot create SystemDeviceEnum object (%lx)\n", res); return; } res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -185,19 +185,19 @@ static void test_moniker_isequal(void) IEnumMoniker_Release(enum_moniker0); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -209,19 +209,19 @@ static void test_moniker_isequal(void) IEnumMoniker_Release(enum_moniker1); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -271,7 +271,7 @@ static void test_register_filter(void) HRESULT hr; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, (void **)&mapper2); - ok(hr == S_OK, "Failed to create FilterMapper2: %#x\n", hr); + ok(hr == S_OK, "Failed to create FilterMapper2: %#lx\n", hr); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; @@ -284,24 +284,24 @@ static void test_register_filter(void) IFilterMapper2_Release(mapper2); return; } - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); hr = IFilterMapper2_UnregisterFilter(mapper2, NULL, NULL, &CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); mon = NULL; hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); hr = IFilterMapper2_UnregisterFilter(mapper2, &CLSID_AudioRendererCategory, NULL, &CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); @@ -317,10 +317,10 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR WCHAR *str; hr = IParseDisplayName_ParseDisplayName(parser, NULL, buffer, &eaten, &mon); - ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#lx\n", hr); hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); - ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#lx\n", hr); ok_(__FILE__, line)(!wcscmp(str, buffer), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); @@ -343,7 +343,7 @@ static void test_directshow_filter(void) /* Test ParseDisplayName and GetDisplayName */ hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:sw:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -354,11 +354,11 @@ static void test_directshow_filter(void) ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); /* writing causes the key to be created */ V_VT(&var) = VT_BSTR; @@ -366,60 +366,60 @@ static void test_directshow_filter(void) hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_I4; V_I4(&var) = 0xdeadbeef; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_I4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); @@ -427,12 +427,12 @@ static void test_directshow_filter(void) memcpy(array_data, "test data", 10); SafeArrayUnaccessData(V_ARRAY(&var)); hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_UI1), "Got type %#x.\n", V_VT(&var)); SafeArrayAccessData(V_ARRAY(&var), &array_data); ok(!memcmp(array_data, "test data", 10), "Got wrong data.\n"); @@ -445,7 +445,7 @@ static void test_directshow_filter(void) StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); wcscat(buffer, L"\\Instance\\test"); res = RegDeleteKeyW(HKEY_CLASSES_ROOT, buffer); - ok(!res, "RegDeleteKey failed: %lu\n", res); + ok(!res, "RegDeleteKey failed: %Iu\n", res); } VariantClear(&var); @@ -457,22 +457,22 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); IMoniker_Release(mon); @@ -481,7 +481,7 @@ static void test_directshow_filter(void) RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test\\Instance"); res = RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test"); - ok(!res, "RegDeleteKey failed: %lu\n", res); + ok(!res, "RegDeleteKey failed: %Iu\n", res); } VariantClear(&var); @@ -502,7 +502,7 @@ static void test_codec(void) /* Test ParseDisplayName and GetDisplayName */ hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -513,66 +513,66 @@ static void test_codec(void) ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); V_VT(&var) = VT_I4; V_I4(&var) = 0xdeadbeef; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_I4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); @@ -580,7 +580,7 @@ static void test_codec(void) memcpy(array_data, "test data", 10); SafeArrayUnaccessData(V_ARRAY(&var)); hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ @@ -588,7 +588,7 @@ static void test_codec(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -611,7 +611,7 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) GUID clsid; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:dmo:"); StringFromGUID2(&CLSID_TestFilter, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -621,47 +621,47 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) ok(!find_moniker(enum_category, mon), "DMO should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_FAIL, "got %#x\n", hr); + ok(hr == E_FAIL, "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); hr = DMORegister(L"devenum test", &CLSID_TestFilter, dmo_category, 0, 0, NULL, 0, NULL); if (hr != E_FAIL) { - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(find_moniker(enum_category, mon), "DMO should be registered\n"); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), L"devenum test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#lx\n", hr); hr = DMOUnregister(&CLSID_TestFilter, dmo_category); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } IPropertyBag_Release(prop_bag); IMoniker_Release(mon); hr = DMOEnum(&DMOCATEGORY_AUDIO_DECODER, 0, 0, NULL, 0, NULL, &enumdmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); while (IEnumDMO_Next(enumdmo, 1, &clsid, &name, NULL) == S_OK) { @@ -672,35 +672,35 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) ok(find_moniker(&DMOCATEGORY_AUDIO_DECODER, mon), "DMO was not found.\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), name), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#lx\n", hr); IPropertyBag_Release(prop_bag); CoTaskMemFree(name); hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IBaseFilter_GetClassID(filter, &clsid); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(IsEqualGUID(&clsid, &CLSID_DMOWrapperFilter), "Got CLSID %s.\n", debugstr_guid(&clsid)); hr = IBaseFilter_QueryInterface(filter, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); IMediaObject_Release(dmo); IBaseFilter_Release(filter); @@ -721,10 +721,10 @@ static void test_legacy_filter(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper, (void **)&mapper); - ok(hr == S_OK, "Failed to create FilterMapper: %#x\n", hr); + ok(hr == S_OK, "Failed to create FilterMapper: %#lx\n", hr); hr = IFilterMapper_RegisterFilter(mapper, CLSID_TestFilter, L"test", 0xdeadbeef); if (hr == VFW_E_BAD_KEY) @@ -732,7 +732,7 @@ static void test_legacy_filter(void) win_skip("not enough permissions to register filters\n"); goto end; } - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_LegacyAmFilterCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -743,11 +743,11 @@ static void test_legacy_filter(void) ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_TestFilter, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -755,7 +755,7 @@ static void test_legacy_filter(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); @@ -763,7 +763,7 @@ static void test_legacy_filter(void) IPropertyBag_Release(prop_bag); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); @@ -795,7 +795,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod } hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -805,7 +805,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -823,19 +823,19 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_DSoundRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -843,7 +843,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"DSGuid", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(guid, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -871,7 +871,7 @@ static void test_waveout(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = waveOutGetNumDevs(); @@ -892,7 +892,7 @@ static void test_waveout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -914,18 +914,18 @@ static void test_waveout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcsncmp(name, V_BSTR(&var), wcslen(name)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -933,9 +933,9 @@ static void test_waveout(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"WaveOutId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -958,7 +958,7 @@ static void test_wavein(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = waveInGetNumDevs(); @@ -974,7 +974,7 @@ static void test_wavein(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -996,18 +996,18 @@ static void test_wavein(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcsncmp(caps.szPname, V_BSTR(&var), wcslen(caps.szPname)), "expected %s, got %s\n", wine_dbgstr_w(caps.szPname), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AudioRecord, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1015,9 +1015,9 @@ static void test_wavein(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"WaveInId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -1039,7 +1039,7 @@ static void test_midiout(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = midiOutGetNumDevs(); @@ -1060,18 +1060,18 @@ static void test_midiout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AVIMIDIRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1079,9 +1079,9 @@ static void test_midiout(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"MidiOutId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -1109,7 +1109,7 @@ static void test_vfw(void) } hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); while (ICInfo(ICTYPE_VIDEO, i++, &info)) { @@ -1128,18 +1128,18 @@ static void test_vfw(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(info.szDescription, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(info.szDescription), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AVICo, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1147,7 +1147,7 @@ static void test_vfw(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FccHandler", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); @@ -1176,7 +1176,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); test_waveout(); test_wavein(); test_midiout();

6 35

[PATCH 01/21] dlls/kernel32/tests/debugger.c: enable compilation with long types
by Eric Pouech 03 Mar '22

03 Mar '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 511 ++++++++++++++++++++-------------------- 1 file changed, 256 insertions(+), 255 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 8b82aaecb9e..2b55da80b34 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdio.h> #include <assert.h> @@ -157,8 +158,8 @@ static int load_blackbox(const char* logfile, void* blackbox, int size) } SetLastError(0xdeadbeef); ret=ReadFile(hFile, blackbox, size, &read, NULL); - ok(ret, "ReadFile failed: %d\n", GetLastError()); - ok(read == size, "wrong size for '%s': read=%d\n", logfile, read); + ok(ret, "ReadFile failed: %ld\n", GetLastError()); + ok(read == size, "wrong size for '%s': read=%ld\n", logfile, read); ret = ReadFile(hFile, buf, sizeof(buf) - 1, &read, NULL); if (ret && read) { @@ -259,7 +260,7 @@ static void add_thread(struct debugger_context *ctx, DWORD tid) static struct debuggee_thread *get_debuggee_thread(struct debugger_context *ctx, DWORD tid) { struct wine_rb_entry *entry = wine_rb_get(&ctx->threads, &tid); - ok(entry != NULL, "unknown thread %x\n", tid); + ok(entry != NULL, "unknown thread %lx\n", tid); return WINE_RB_ENTRY_VALUE(entry, struct debuggee_thread, entry); } @@ -301,13 +302,13 @@ static void fetch_thread_context_(unsigned line, struct debuggee_thread *thread) { thread->handle = OpenThread(THREAD_GET_CONTEXT | THREAD_SET_CONTEXT | THREAD_QUERY_INFORMATION, FALSE, thread->tid); - ok_(__FILE__,line)(thread->handle != NULL, "OpenThread failed: %u\n", GetLastError()); + ok_(__FILE__,line)(thread->handle != NULL, "OpenThread failed: %lu\n", GetLastError()); } memset(&thread->ctx, 0xaa, sizeof(thread->ctx)); thread->ctx.ContextFlags = CONTEXT_FULL; ret = GetThreadContext(thread->handle, &thread->ctx); - ok_(__FILE__,line)(ret, "GetThreadContext failed: %u\n", GetLastError()); + ok_(__FILE__,line)(ret, "GetThreadContext failed: %lu\n", GetLastError()); } #define set_thread_context(a,b) set_thread_context_(__LINE__,a,b) @@ -315,7 +316,7 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str { BOOL ret; ret = SetThreadContext(thread->handle, &thread->ctx); - ok_(__FILE__,line)(ret, "SetThreadContext failed: %u\n", GetLastError()); + ok_(__FILE__,line)(ret, "SetThreadContext failed: %lu\n", GetLastError()); } static void fetch_process_context(struct debugger_context *ctx) @@ -343,14 +344,14 @@ static void next_event_(unsigned line, struct debugger_context *ctx, unsigned ti if (ctx->process_cnt && ctx->ev.dwDebugEventCode != -1) { ret = ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_CONTINUE); - ok_(__FILE__,line)(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ok_(__FILE__,line)(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); } ret = WaitForDebugEvent(&ctx->ev, timeout); if (!ret) { ok_(__FILE__,line)(GetLastError() == ERROR_SEM_TIMEOUT, - "WaitForDebugEvent failed, last error %d.\n", GetLastError()); + "WaitForDebugEvent failed, last error %ld.\n", GetLastError()); ctx->ev.dwDebugEventCode = -1; return; } @@ -401,8 +402,8 @@ static void wait_for_breakpoint_(unsigned line, struct debugger_context *ctx) while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT); - ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); - ok_(__FILE__,line)(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + ok_(__FILE__,line)(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); } @@ -413,12 +414,12 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except ctx->ev.dwDebugEventCode = -1; next_event(ctx, 0); - ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); next_event(ctx, 0); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) /* Vista+ reports ntdll.dll before reporting threads */ { - ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); ok(ctx->ev.u.LoadDll.lpBaseOfDll == ntdll, "The first reported DLL is not ntdll.dll\n"); next_event(ctx, 0); } @@ -430,7 +431,7 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except { /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); - ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); next_event(ctx, WAIT_EVENT_TIMEOUT); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) @@ -439,7 +440,7 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except ok(ctx->dll_cnt > 2, "dll_cnt = %d\n", ctx->dll_cnt); /* a new thread is created and it executes DbgBreakPoint, which causes the exception */ - ok(ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); if (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) { DWORD last_thread = ctx->ev.dwThreadId; @@ -447,15 +448,15 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except ok(ctx->ev.dwThreadId == last_thread, "unexpected thread\n"); } - ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); - ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ok(ctx->ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx->ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); if (pass_exception) { ret = ContinueDebugEvent(ctx->ev.dwProcessId, ctx->ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); - ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); ctx->ev.dwDebugEventCode = -1; } @@ -463,7 +464,7 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except do next_event(ctx, POLL_EVENT_TIMEOUT); while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT || ctx->ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT); - ok(ctx->ev.dwDebugEventCode == -1, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); + ok(ctx->ev.dwDebugEventCode == -1, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); } static void doDebugger(int argc, char** argv) @@ -509,8 +510,8 @@ static void doDebugger(int argc, char** argv) if (strstr(myARGV[2], "process")) { next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == STATUS_ACCESS_VIOLATION, "ExceptionCode = %x\n", + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == STATUS_ACCESS_VIOLATION, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); } @@ -594,14 +595,14 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) return; } - ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%ld\n", ret); get_file_name(dbglog); get_events(dbglog, &start_event, &done_event); cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(dbgtasks)+1+strlen(dbglog)+2+34+1); sprintf(cmd, "%s debugger %s \"%s\" %%ld %%ld", argv0, dbgtasks, dbglog); ret=RegSetValueExA(hkey, "debugger", 0, REG_SZ, (BYTE*)cmd, strlen(cmd)+1); - ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%d\n", ret); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%ld\n", ret); HeapFree(GetProcessHeap(), 0, cmd); cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv0) + 16); @@ -613,7 +614,7 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; ret=CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); - ok(ret, "CreateProcess: err=%d\n", GetLastError()); + ok(ret, "CreateProcess: err=%ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cmd); CloseHandle(info.hThread); @@ -635,7 +636,7 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) #endif ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); bRet = GetExitCodeProcess(info.hProcess, &exit_code); - ok(bRet, "GetExitCodeProcess failed: err=%d\n", GetLastError()); + ok(bRet, "GetExitCodeProcess failed: err=%ld\n", GetLastError()); if (strstr(dbgtasks, "code2")) { /* If, after attaching to the debuggee, the debugger exits without @@ -644,12 +645,12 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STATUS_ACCESS_VIOLATION) || /* Intermittent Vista+ */ broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ - "wrong exit code : %08x\n", exit_code); + "wrong exit code : %08lx\n", exit_code); } else ok(exit_code == STATUS_ACCESS_VIOLATION || broken(exit_code == WAIT_ABANDONED), /* NT4, W2K, W2K3 */ - "wrong exit code : %08x\n", exit_code); + "wrong exit code : %08lx\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ @@ -673,12 +674,12 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)), "failed to open: %s\n", dbglog); ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); - ok(dbg_blackbox.pid == info.dwProcessId, "the child and debugged pids don't match: %d != %d\n", info.dwProcessId, dbg_blackbox.pid); - ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%d\n", dbg_blackbox.debug_err); - ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.attach_err); - ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); - ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); - ok(!dbg_blackbox.failures, "debugger reported %u failures\n", dbg_blackbox.failures); + ok(dbg_blackbox.pid == info.dwProcessId, "the child and debugged pids don't match: %ld != %ld\n", info.dwProcessId, dbg_blackbox.pid); + ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%ld\n", dbg_blackbox.debug_err); + ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%ld) failed err=%ld\n", dbg_blackbox.pid, dbg_blackbox.attach_err); + ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%ld\n", dbg_blackbox.nokill_err); + ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%ld) failed err=%ld\n", dbg_blackbox.pid, dbg_blackbox.detach_err); + ok(!dbg_blackbox.failures, "debugger reported %lu failures\n", dbg_blackbox.failures); DeleteFileA(dbglog); } @@ -693,7 +694,7 @@ static void crash_and_winedbg(HKEY hkey, const char* argv0) DWORD exit_code; ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); - ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%ld\n", ret); cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+15+1); sprintf(cmd, "%s debugger crash", argv0); @@ -703,15 +704,15 @@ static void crash_and_winedbg(HKEY hkey, const char* argv0) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; ret=CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); - ok(ret, "CreateProcess: err=%d\n", GetLastError()); + ok(ret, "CreateProcess: err=%ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cmd); CloseHandle(info.hThread); trace("waiting for child exit...\n"); ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); bRet = GetExitCodeProcess(info.hProcess, &exit_code); - ok(bRet, "GetExitCodeProcess failed: err=%d\n", GetLastError()); - ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + ok(bRet, "GetExitCodeProcess failed: err=%ld\n", GetLastError()); + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08lx\n", exit_code); CloseHandle(info.hProcess); } @@ -749,7 +750,7 @@ static void test_ExitCode(void) } else if (ret != ERROR_FILE_NOT_FOUND) { - ok(0, "could not open the AeDebug key: %d\n", ret); + ok(0, "could not open the AeDebug key: %ld\n", ret); return; } else @@ -776,7 +777,7 @@ static void test_ExitCode(void) RegCloseKey(hkeyWinedbg); } else - ok(0, "Couldn't access WineDbg Key - error %u\n", ret); + ok(0, "Couldn't access WineDbg Key - error %lu\n", ret); } if (winetest_interactive) @@ -786,7 +787,7 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,none"); else skip("\"none\" debugger test needs user interaction\n"); - ok(disposition == REG_OPENED_EXISTING_KEY, "expected REG_OPENED_EXISTING_KEY, got %d\n", disposition); + ok(disposition == REG_OPENED_EXISTING_KEY, "expected REG_OPENED_EXISTING_KEY, got %ld\n", disposition); crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); @@ -820,7 +821,7 @@ static void test_RemoteDebugger(void) bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),&present); ok(bret , "expected CheckRemoteDebuggerPresent to succeed\n"); ok(0xdeadbeef == GetLastError(), - "expected error to be unchanged, got %d/%x\n",GetLastError(), GetLastError()); + "expected error to be unchanged, got %ld/%lx\n",GetLastError(), GetLastError()); present = TRUE; SetLastError(0xdeadbeef); @@ -828,13 +829,13 @@ static void test_RemoteDebugger(void) ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); ok(present, "expected parameter to be unchanged\n"); ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); + "expected error ERROR_INVALID_PARAMETER, got %ld/%lx\n",GetLastError(), GetLastError()); SetLastError(0xdeadbeef); bret = pCheckRemoteDebuggerPresent(GetCurrentProcess(),NULL); ok(!bret , "expected CheckRemoteDebuggerPresent to fail\n"); ok(ERROR_INVALID_PARAMETER == GetLastError(), - "expected error ERROR_INVALID_PARAMETER, got %d/%x\n",GetLastError(), GetLastError()); + "expected error ERROR_INVALID_PARAMETER, got %ld/%lx\n",GetLastError(), GetLastError()); } struct child_blackbox @@ -854,36 +855,36 @@ static void doChild(int argc, char **argv) BOOL ret; blackbox_file = argv[4]; - sscanf(argv[3], "%08x", &ppid); + sscanf(argv[3], "%08lx", &ppid); parent = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, ppid); - child_ok(!!parent, "OpenProcess failed, last error %#x.\n", GetLastError()); + child_ok(!!parent, "OpenProcess failed, last error %#lx.\n", GetLastError()); ret = pCheckRemoteDebuggerPresent(parent, &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); child_ok(!debug, "Expected debug == 0, got %#x.\n", debug); ret = DebugActiveProcess(ppid); - child_ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); + child_ok(ret, "DebugActiveProcess failed, last error %#lx.\n", GetLastError()); ret = pCheckRemoteDebuggerPresent(parent, &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); ret = DebugActiveProcessStop(ppid); - child_ok(ret, "DebugActiveProcessStop failed, last error %#x.\n", GetLastError()); + child_ok(ret, "DebugActiveProcessStop failed, last error %#lx.\n", GetLastError()); ret = pCheckRemoteDebuggerPresent(parent, &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); child_ok(!debug, "Expected debug == 0, got %#x.\n", debug); ret = CloseHandle(parent); - child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = IsDebuggerPresent(); child_ok(ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); NtCurrentTeb()->Peb->BeingDebugged = FALSE; @@ -891,7 +892,7 @@ static void doChild(int argc, char **argv) ret = IsDebuggerPresent(); child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); - child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); child_ok(debug, "Expected debug != 0, got %#x.\n", debug); NtCurrentTeb()->Peb->BeingDebugged = TRUE; @@ -902,11 +903,11 @@ static void doChild(int argc, char **argv) GetSystemDirectoryW( path, MAX_PATH ); wcscat( path, L"\\oleaut32.dll" ); file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - child_ok( file != INVALID_HANDLE_VALUE, "failed to open %s: %u\n", debugstr_w(path), GetLastError()); + child_ok( file != INVALID_HANDLE_VALUE, "failed to open %s: %lu\n", debugstr_w(path), GetLastError()); map = CreateFileMappingW( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); - child_ok( map != NULL, "failed to create mapping %s: %u\n", debugstr_w(path), GetLastError() ); + child_ok( map != NULL, "failed to create mapping %s: %lu\n", debugstr_w(path), GetLastError() ); mod = MapViewOfFile( map, FILE_MAP_READ, 0, 0, 0 ); - child_ok( mod != NULL, "failed to map %s: %u\n", debugstr_w(path), GetLastError() ); + child_ok( mod != NULL, "failed to map %s: %lu\n", debugstr_w(path), GetLastError() ); CloseHandle( file ); CloseHandle( map ); UnmapViewOfFile( mod ); @@ -923,11 +924,11 @@ static void doChild(int argc, char **argv) else goto done; file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - child_ok( file != INVALID_HANDLE_VALUE, "failed to open %s: %u\n", debugstr_w(path), GetLastError()); + child_ok( file != INVALID_HANDLE_VALUE, "failed to open %s: %lu\n", debugstr_w(path), GetLastError()); map = CreateFileMappingW( file, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); - child_ok( map != NULL, "failed to create mapping %s: %u\n", debugstr_w(path), GetLastError() ); + child_ok( map != NULL, "failed to create mapping %s: %lu\n", debugstr_w(path), GetLastError() ); mod = MapViewOfFile( map, FILE_MAP_READ, 0, 0, 0 ); - child_ok( mod != NULL, "failed to map %s: %u\n", debugstr_w(path), GetLastError() ); + child_ok( mod != NULL, "failed to map %s: %lu\n", debugstr_w(path), GetLastError() ); CloseHandle( file ); CloseHandle( map ); UnmapViewOfFile( mod ); @@ -987,17 +988,17 @@ static void test_debug_loop(int argc, char **argv) get_file_name(blackbox_file); cmd = HeapAlloc(GetProcessHeap(), 0, strlen(argv[0]) + strlen(arguments) + strlen(blackbox_file) + 2 + 10); - sprintf(cmd, "%s%s%08x \"%s\"", argv[0], arguments, pid, blackbox_file); + sprintf(cmd, "%s%s%08lx \"%s\"", argv[0], arguments, pid, blackbox_file); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cmd); ret = pCheckRemoteDebuggerPresent(pi.hProcess, &debug); - ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); + ok(ret, "CheckRemoteDebuggerPresent failed, last error %#lx.\n", GetLastError()); ok(debug, "Expected debug != 0, got %#x.\n", debug); for (;;) @@ -1005,7 +1006,7 @@ static void test_debug_loop(int argc, char **argv) DEBUG_EVENT ev; ret = WaitForDebugEvent(&ev, INFINITE); - ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "WaitForDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; @@ -1020,7 +1021,7 @@ static void test_debug_loop(int argc, char **argv) } #endif ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); if (!ret) break; } @@ -1033,15 +1034,15 @@ static void test_debug_loop(int argc, char **argv) #endif ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); load_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); - ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures); + ok(!blackbox.failures, "Got %ld failures from child process.\n", blackbox.failures); ret = DeleteFileA(blackbox_file); - ok(ret, "DeleteFileA failed, last error %#x.\n", GetLastError()); + ok(ret, "DeleteFileA failed, last error %#lx.\n", GetLastError()); } static void doChildren(int argc, char **argv) @@ -1067,7 +1068,7 @@ static void doChildren(int argc, char **argv) strcpy(event_name, p); strcat(event_name, "_init"); event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); - child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + child_ok(event != NULL, "OpenEvent failed, last error %ld.\n", GetLastError()); SetEvent(event); CloseHandle(event); @@ -1076,7 +1077,7 @@ static void doChildren(int argc, char **argv) strcpy(event_name, p); strcat(event_name, "_attach"); event = OpenEventA(EVENT_ALL_ACCESS, FALSE, event_name); - child_ok(event != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + child_ok(event != NULL, "OpenEvent failed, last error %ld.\n", GetLastError()); WaitForSingleObject(event, INFINITE); CloseHandle(event); @@ -1086,15 +1087,15 @@ static void doChildren(int argc, char **argv) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - child_ok(ret, "CreateProcess failed, last error %d.\n", GetLastError()); + child_ok(ret, "CreateProcess failed, last error %ld.\n", GetLastError()); child_ok(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0, "Timed out waiting for the child to exit\n"); ret = CloseHandle(pi.hThread); - child_ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + child_ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - child_ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + child_ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox), NULL); @@ -1130,31 +1131,31 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, strcpy(event_name, p); strcat(event_name, "_init"); event_init = CreateEventA(NULL, FALSE, FALSE, event_name); - ok(event_init != NULL, "OpenEvent failed, last error %d.\n", GetLastError()); + ok(event_init != NULL, "OpenEvent failed, last error %ld.\n", GetLastError()); p = strrchr(blackbox_file, '\\'); p = p ? p+1 : blackbox_file; strcpy(event_name, p); strcat(event_name, "_attach"); event_attach = CreateEventA(NULL, FALSE, flag!=0, event_name); - ok(event_attach != NULL, "CreateEvent failed, last error %d.\n", GetLastError()); + ok(event_attach != NULL, "CreateEvent failed, last error %ld.\n", GetLastError()); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessA(NULL, cmd, NULL, NULL, FALSE, flag, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %d.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %ld.\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cmd); if (!flag) { WaitForSingleObject(event_init, INFINITE); Sleep(100); ret = DebugActiveProcess(pi.dwProcessId); - ok(ret, "DebugActiveProcess failed, last error %d.\n", GetLastError()); + ok(ret, "DebugActiveProcess failed, last error %ld.\n", GetLastError()); } ret = pCheckRemoteDebuggerPresent(pi.hProcess, &debug); - ok(ret, "CheckRemoteDebuggerPresent failed, last error %d.\n", GetLastError()); + ok(ret, "CheckRemoteDebuggerPresent failed, last error %ld.\n", GetLastError()); ok(debug, "Expected debug != 0, got %x.\n", debug); trace("starting debugger loop\n"); @@ -1164,19 +1165,19 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, DWORD last_thread; next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); - ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, @@ -1195,11 +1196,11 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (pass_exception) { ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); - ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); } } else @@ -1207,32 +1208,32 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, DWORD last_thread; process_attach_events(&ctx, pass_exception); - ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.pid); + ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %lx\n", ctx.pid); ret = DebugBreakProcess(pi.hProcess); - ok(ret, "BreakProcess failed: %u\n", GetLastError()); + ok(ret, "BreakProcess failed: %lu\n", GetLastError()); /* a new thread, which executes DbgBreakPoint, is created */ next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); last_thread = ctx.ev.dwThreadId; if (ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint, "ExceptionAddress != DbgBreakPoint\n"); ret = SetEvent(event_attach); - ok(ret, "SetEvent failed, last error %d.\n", GetLastError()); + ok(ret, "SetEvent failed, last error %ld.\n", GetLastError()); if (pass_exception) { ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); - ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; } } @@ -1241,27 +1242,27 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, while (ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx.ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT || ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT || ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT); - ok(ctx.ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_CONTINUE); - ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error %ld.\n", GetLastError()); if(debug_child) - ok(ctx.process_cnt == 2, "didn't get any child events (flag: %x).\n", flag); + ok(ctx.process_cnt == 2, "didn't get any child events (flag: %lx).\n", flag); else - ok(ctx.process_cnt == 1, "got child event (flag: %x).\n", flag); + ok(ctx.process_cnt == 1, "got child event (flag: %lx).\n", flag); CloseHandle(event_init); CloseHandle(event_attach); ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); load_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); - ok(!blackbox.failures, "Got %d failures from child process.\n", blackbox.failures); + ok(!blackbox.failures, "Got %ld failures from child process.\n", blackbox.failures); ret = DeleteFileA(blackbox_file); - ok(ret, "DeleteFileA failed, last error %d.\n", GetLastError()); + ok(ret, "DeleteFileA failed, last error %ld.\n", GetLastError()); } static void wait_debugger(HANDLE event, unsigned int cnt) @@ -1274,7 +1275,7 @@ static void wait_debugger(HANDLE event, unsigned int cnt) static void expect_event_(unsigned line, struct debugger_context *ctx, DWORD event_code) { next_event(ctx, WAIT_EVENT_TIMEOUT); - ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == event_code, "dwDebugEventCode = %d expected %d\n", + ok_(__FILE__,line)(ctx->ev.dwDebugEventCode == event_code, "dwDebugEventCode = %ld expected %ld\n", ctx->ev.dwDebugEventCode, event_code); } @@ -1282,7 +1283,7 @@ static void expect_event_(unsigned line, struct debugger_context *ctx, DWORD eve static void expect_exception_(unsigned line, struct debugger_context *ctx, DWORD exception_code) { expect_event_(line, ctx, EXCEPTION_DEBUG_EVENT); - ok_(__FILE__,line)(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == exception_code, "ExceptionCode = %x expected %x\n", + ok_(__FILE__,line)(ctx->ev.u.Exception.ExceptionRecord.ExceptionCode == exception_code, "ExceptionCode = %lx expected %lx\n", ctx->ev.u.Exception.ExceptionRecord.ExceptionCode, exception_code); } @@ -1313,7 +1314,7 @@ static void single_step_(unsigned line, struct debugger_context *ctx, struct deb fetch_thread_context(thread); ok_(__FILE__,line)(get_ip(&thread->ctx) == expect_addr, "unexpected instruction pointer %p expected %p\n", get_ip(&thread->ctx), expect_addr); - ok_(__FILE__,line)(!(thread->ctx.EFlags & 0x100), "EFlags = %x\n", thread->ctx.EFlags); + ok_(__FILE__,line)(!(thread->ctx.EFlags & 0x100), "EFlags = %lx\n", thread->ctx.EFlags); #endif } @@ -1393,19 +1394,19 @@ static void test_debugger(const char *argv0) BOOL ret; event = CreateEventW(&sa, FALSE, FALSE, NULL); - ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); + ok(event != NULL, "CreateEvent failed: %lu\n", GetLastError()); cmd = heap_alloc(strlen(argv0) + strlen(arguments) + 16); - sprintf(cmd, "%s%s%x %u\n", argv0, arguments, (DWORD)(DWORD_PTR)event, OP_BP ? 3 : 1); + sprintf(cmd, "%s%s%lx %u\n", argv0, arguments, (DWORD)(DWORD_PTR)event, OP_BP ? 3 : 1); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); heap_free(cmd); next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); if ((skip_reply_later = !ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER))) win_skip("Skipping unsupported DBG_REPLY_LATER tests\n"); @@ -1417,49 +1418,49 @@ static void test_debugger(const char *argv0) ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(de.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); ok(de.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de.dwProcessId); ok(de.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de.dwThreadId); /* Suspending the thread should prevent other attach debug events * to be received until it's resumed */ thread = OpenThread(THREAD_SUSPEND_RESUME, FALSE, ctx.ev.dwThreadId); - ok(thread != INVALID_HANDLE_VALUE, "OpenThread failed, last error:%u\n", GetLastError()); + ok(thread != INVALID_HANDLE_VALUE, "OpenThread failed, last error:%lu\n", GetLastError()); status = NtSuspendThread(thread, NULL); - ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); + ok(!status, "NtSuspendThread failed, last error:%lu\n", GetLastError()); ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); - ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error:%lu\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread, NULL); - ok(!status, "NtResumeThread failed, last error:%u\n", GetLastError()); + ok(!status, "NtResumeThread failed, last error:%lu\n", GetLastError()); ret = CloseHandle(thread); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); ok(WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent failed.\n"); ok(de.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); de = ctx.ev; ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); - ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error:%lu\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(de.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de.dwDebugEventCode); ok(de.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de.dwProcessId); ok(de.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de.dwThreadId); } wait_for_breakpoint(&ctx); @@ -1467,7 +1468,7 @@ static void test_debugger(const char *argv0) while(ctx.ev.dwDebugEventCode != -1); mem = VirtualAllocEx(pi.hProcess, NULL, sizeof(buf), MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(mem != NULL, "VirtualAllocEx failed: %u\n", GetLastError()); + ok(mem != NULL, "VirtualAllocEx failed: %lu\n", GetLastError()); proc_code = buf + 1024; thread_proc = mem + 1024; @@ -1478,10 +1479,10 @@ static void test_debugger(const char *argv0) memcpy(proc_code, &loop_code, sizeof(loop_code)); proc_code[0] = OP_BP; /* set a breakpoint */ ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); - ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); expect_event(&ctx, CREATE_THREAD_DEBUG_EVENT); debuggee_thread = get_debuggee_thread(&ctx, ctx.ev.dwThreadId); @@ -1499,7 +1500,7 @@ static void test_debugger(const char *argv0) byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); expect_event(&ctx, EXIT_THREAD_DEBUG_EVENT); } @@ -1511,23 +1512,23 @@ static void test_debugger(const char *argv0) memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, call_debug_service_code, sizeof(call_debug_service_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); /* BREAKPOINT_PRINT */ thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, (void*)2, 0, NULL); - ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); expect_event(&ctx, CREATE_THREAD_DEBUG_EVENT); expect_breakpoint_exception(&ctx, NULL); expect_event(&ctx, EXIT_THREAD_DEBUG_EVENT); /* BREAKPOINT_PROMPT */ thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, (void*)1, 0, NULL); - ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); expect_event(&ctx, CREATE_THREAD_DEBUG_EVENT); next_event(&ctx, WAIT_EVENT_TIMEOUT); /* some 32-bit Windows versions report exception to the debugger */ if (sizeof(void *) == 4 && ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT, "unexpected debug event %u\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT, "unexpected debug event %lu\n", ctx.ev.dwDebugEventCode); } else win_skip("call_debug_service_code not supported on this architecture\n"); @@ -1541,64 +1542,64 @@ static void test_debugger(const char *argv0) memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); byte = OP_BP; ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); thread_a = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); - ok(thread_a != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread_a != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); de_a = ctx.ev; thread_b = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); - ok(thread_b != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread_b != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); do next_event(&ctx, POLL_EVENT_TIMEOUT); while(ctx.ev.dwDebugEventCode != CREATE_THREAD_DEBUG_EVENT); de_b = ctx.ev; status = NtSuspendThread(thread_b, NULL); - ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); + ok(!status, "NtSuspendThread failed, last error:%lu\n", GetLastError()); ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); - ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error:%lu\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, - "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ok(de_a.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_a.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_a.dwProcessId); ok(de_a.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_a.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_a.dwThreadId); de_a = ctx.ev; byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); ok(pNtSuspendProcess != NULL, "NtSuspendProcess not found\n"); ok(pNtResumeProcess != NULL, "pNtResumeProcess not found\n"); if (pNtSuspendProcess && pNtResumeProcess) { status = pNtSuspendProcess(pi.hProcess); - ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError()); + ok(!status, "NtSuspendProcess failed, last error:%lu\n", GetLastError()); ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); - ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ok(ret, "ContinueDebugEvent failed, last error:%lu\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread_b, NULL); - ok(!status, "NtResumeThread failed, last error:%u\n", GetLastError()); + ok(!status, "NtResumeThread failed, last error:%lu\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = pNtResumeProcess(pi.hProcess); - ok(!status, "pNtResumeProcess failed, last error:%u\n", GetLastError()); + ok(!status, "pNtResumeProcess failed, last error:%lu\n", GetLastError()); } else { status = NtResumeThread(thread_b, NULL); - ok(!status, "NtResumeThread failed, last error:%u\n", GetLastError()); + ok(!status, "NtResumeThread failed, last error:%lu\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); } @@ -1622,74 +1623,74 @@ static void test_debugger(const char *argv0) if (ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) { ok(de_a.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de_a.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de_a.dwDebugEventCode); ok(de_a.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_a.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_a.dwProcessId); ok(de_a.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_a.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_a.dwThreadId); next_event(&ctx, POLL_EVENT_TIMEOUT); if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT) { ok(de_a.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_a.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_a.dwProcessId); ok(de_a.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_a.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_a.dwThreadId); ret = CloseHandle(thread_a); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); thread_a = NULL; next_event(&ctx, POLL_EVENT_TIMEOUT); } ok(de_b.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de_b.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de_b.dwDebugEventCode); ok(de_b.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_b.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_b.dwProcessId); ok(de_b.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_b.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_b.dwThreadId); } else { ok(de_b.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de_b.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de_b.dwDebugEventCode); ok(de_b.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_b.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_b.dwProcessId); ok(de_b.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_b.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_b.dwThreadId); next_event(&ctx, POLL_EVENT_TIMEOUT); if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT) { ok(de_b.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_b.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_b.dwProcessId); ok(de_b.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_b.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_b.dwThreadId); ret = CloseHandle(thread_b); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); thread_b = NULL; next_event(&ctx, POLL_EVENT_TIMEOUT); } ok(de_a.dwDebugEventCode == ctx.ev.dwDebugEventCode, - "dwDebugEventCode differs: %x (was %x)\n", ctx.ev.dwDebugEventCode, de_a.dwDebugEventCode); + "dwDebugEventCode differs: %lx (was %lx)\n", ctx.ev.dwDebugEventCode, de_a.dwDebugEventCode); ok(de_a.dwProcessId == ctx.ev.dwProcessId, - "dwProcessId differs: %x (was %x)\n", ctx.ev.dwProcessId, de_a.dwProcessId); + "dwProcessId differs: %lx (was %lx)\n", ctx.ev.dwProcessId, de_a.dwProcessId); ok(de_a.dwThreadId == ctx.ev.dwThreadId, - "dwThreadId differs: %x (was %x)\n", ctx.ev.dwThreadId, de_a.dwThreadId); + "dwThreadId differs: %lx (was %lx)\n", ctx.ev.dwThreadId, de_a.dwThreadId); } if (thread_a) { next_event(&ctx, POLL_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT, - "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ret = CloseHandle(thread_a); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); } @@ -1697,10 +1698,10 @@ static void test_debugger(const char *argv0) { next_event(&ctx, POLL_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT, - "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ret = CloseHandle(thread_b); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); } } @@ -1711,7 +1712,7 @@ static void test_debugger(const char *argv0) memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); ctx.thread_tag = 1; @@ -1719,18 +1720,18 @@ static void test_debugger(const char *argv0) for (i = 0; i < worker_cnt; i++) { thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); - ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + ok(thread != NULL, "CreateRemoteThread failed: %lu\n", GetLastError()); next_event(&ctx, WAIT_EVENT_TIMEOUT); - ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); ret = CloseHandle(thread); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); } byte = OP_BP; ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; @@ -1740,7 +1741,7 @@ static void test_debugger(const char *argv0) byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); for (;;) { @@ -1748,12 +1749,12 @@ static void test_debugger(const char *argv0) /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); - ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); next_event(&ctx, POLL_EVENT_TIMEOUT); if (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) break; - trace("exception at %p in thread %04x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress, ctx.ev.dwThreadId); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + trace("exception at %p in thread %04lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress, ctx.ev.dwThreadId); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); @@ -1775,7 +1776,7 @@ static void test_debugger(const char *argv0) { ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT || broken(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT), /* sometimes happens on vista */ - "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT && !--worker_cnt) break; next_event(&ctx, WAIT_EVENT_TIMEOUT); } @@ -1792,7 +1793,7 @@ static void test_debugger(const char *argv0) fetch_thread_context(ctx.main_thread); ret = ReadProcessMemory(pi.hProcess, get_ip(&ctx.main_thread->ctx), &instr, 1, NULL); - ok(ret, "ReadProcessMemory failed: %u\n", GetLastError()); + ok(ret, "ReadProcessMemory failed: %lu\n", GetLastError()); orig_context = ctx.main_thread->ctx; ip = get_ip(&ctx.main_thread->ctx); @@ -1825,36 +1826,36 @@ static void test_debugger(const char *argv0) fetch_thread_context(ctx.main_thread); #if defined(__i386__) /* win2k8 do not preserve eax, rcx and edx; newer versions do */ - ok(ctx.main_thread->ctx.Ebx == 102, "Ebx = %x\n", ctx.main_thread->ctx.Ebx); - ok(ctx.main_thread->ctx.Esi == 105, "Esi = %x\n", ctx.main_thread->ctx.Esi); - ok(ctx.main_thread->ctx.Edi == 106, "Edi = %x\n", ctx.main_thread->ctx.Edi); + ok(ctx.main_thread->ctx.Ebx == 102, "Ebx = %lx\n", ctx.main_thread->ctx.Ebx); + ok(ctx.main_thread->ctx.Esi == 105, "Esi = %lx\n", ctx.main_thread->ctx.Esi); + ok(ctx.main_thread->ctx.Edi == 106, "Edi = %lx\n", ctx.main_thread->ctx.Edi); #elif defined(__x86_64__) - ok(ctx.main_thread->ctx.Rax == 101, "Rax = %x\n", ctx.main_thread->ctx.Rax); - ok(ctx.main_thread->ctx.Rbx == 102, "Rbx = %x\n", ctx.main_thread->ctx.Rbx); - ok(ctx.main_thread->ctx.Rcx == 103, "Rcx = %x\n", ctx.main_thread->ctx.Rcx); - ok(ctx.main_thread->ctx.Rdx == 104, "Rdx = %x\n", ctx.main_thread->ctx.Rdx); - ok(ctx.main_thread->ctx.Rsi == 105, "Rsi = %x\n", ctx.main_thread->ctx.Rsi); - ok(ctx.main_thread->ctx.Rdi == 106, "Rdi = %x\n", ctx.main_thread->ctx.Rdi); - ok(ctx.main_thread->ctx.R8 == 107, "R8 = %x\n", ctx.main_thread->ctx.R8); - ok(ctx.main_thread->ctx.R9 == 108, "R9 = %x\n", ctx.main_thread->ctx.R9); - ok(ctx.main_thread->ctx.R10 == 109, "R10 = %x\n", ctx.main_thread->ctx.R10); - ok(ctx.main_thread->ctx.R11 == 110, "R11 = %x\n", ctx.main_thread->ctx.R11); - ok(ctx.main_thread->ctx.R12 == 111, "R12 = %x\n", ctx.main_thread->ctx.R12); - ok(ctx.main_thread->ctx.R13 == 112, "R13 = %x\n", ctx.main_thread->ctx.R13); - ok(ctx.main_thread->ctx.R14 == 113, "R14 = %x\n", ctx.main_thread->ctx.R14); - ok(ctx.main_thread->ctx.R15 == 114, "R15 = %x\n", ctx.main_thread->ctx.R15); + ok(ctx.main_thread->ctx.Rax == 101, "Rax = %llx\n", ctx.main_thread->ctx.Rax); + ok(ctx.main_thread->ctx.Rbx == 102, "Rbx = %llx\n", ctx.main_thread->ctx.Rbx); + ok(ctx.main_thread->ctx.Rcx == 103, "Rcx = %llx\n", ctx.main_thread->ctx.Rcx); + ok(ctx.main_thread->ctx.Rdx == 104, "Rdx = %llx\n", ctx.main_thread->ctx.Rdx); + ok(ctx.main_thread->ctx.Rsi == 105, "Rsi = %llx\n", ctx.main_thread->ctx.Rsi); + ok(ctx.main_thread->ctx.Rdi == 106, "Rdi = %llx\n", ctx.main_thread->ctx.Rdi); + ok(ctx.main_thread->ctx.R8 == 107, "R8 = %llx\n", ctx.main_thread->ctx.R8); + ok(ctx.main_thread->ctx.R9 == 108, "R9 = %llx\n", ctx.main_thread->ctx.R9); + ok(ctx.main_thread->ctx.R10 == 109, "R10 = %llx\n", ctx.main_thread->ctx.R10); + ok(ctx.main_thread->ctx.R11 == 110, "R11 = %llx\n", ctx.main_thread->ctx.R11); + ok(ctx.main_thread->ctx.R12 == 111, "R12 = %llx\n", ctx.main_thread->ctx.R12); + ok(ctx.main_thread->ctx.R13 == 112, "R13 = %llx\n", ctx.main_thread->ctx.R13); + ok(ctx.main_thread->ctx.R14 == 113, "R14 = %llx\n", ctx.main_thread->ctx.R14); + ok(ctx.main_thread->ctx.R15 == 114, "R15 = %llx\n", ctx.main_thread->ctx.R15); #endif byte = OP_BP; ret = WriteProcessMemory(pi.hProcess, ip, &byte, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); SetEvent(event); ResumeThread(ctx.main_thread->handle); next_event(&ctx, 2000); - ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == ip, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); @@ -1863,27 +1864,27 @@ static void test_debugger(const char *argv0) ok(get_ip(&ctx.main_thread->ctx) == ip + 1, "unexpected instruction pointer %p\n", get_ip(&ctx.main_thread->ctx)); #if defined(__i386__) - ok(ctx.main_thread->ctx.Eax == 0, "Eax = %x\n", ctx.main_thread->ctx.Eax); - ok(ctx.main_thread->ctx.Ebx == 102, "Ebx = %x\n", ctx.main_thread->ctx.Ebx); - ok(ctx.main_thread->ctx.Ecx != 103, "Ecx = %x\n", ctx.main_thread->ctx.Ecx); - ok(ctx.main_thread->ctx.Edx != 104, "Edx = %x\n", ctx.main_thread->ctx.Edx); - ok(ctx.main_thread->ctx.Esi == 105, "Esi = %x\n", ctx.main_thread->ctx.Esi); - ok(ctx.main_thread->ctx.Edi == 106, "Edi = %x\n", ctx.main_thread->ctx.Edi); + ok(ctx.main_thread->ctx.Eax == 0, "Eax = %lx\n", ctx.main_thread->ctx.Eax); + ok(ctx.main_thread->ctx.Ebx == 102, "Ebx = %lx\n", ctx.main_thread->ctx.Ebx); + ok(ctx.main_thread->ctx.Ecx != 103, "Ecx = %lx\n", ctx.main_thread->ctx.Ecx); + ok(ctx.main_thread->ctx.Edx != 104, "Edx = %lx\n", ctx.main_thread->ctx.Edx); + ok(ctx.main_thread->ctx.Esi == 105, "Esi = %lx\n", ctx.main_thread->ctx.Esi); + ok(ctx.main_thread->ctx.Edi == 106, "Edi = %lx\n", ctx.main_thread->ctx.Edi); #elif defined(__x86_64__) - ok(ctx.main_thread->ctx.Rax == 0, "Rax = %x\n", ctx.main_thread->ctx.Rax); - ok(ctx.main_thread->ctx.Rbx == 102, "Rbx = %x\n", ctx.main_thread->ctx.Rbx); - ok(ctx.main_thread->ctx.Rcx != 103, "Rcx = %x\n", ctx.main_thread->ctx.Rcx); - ok(ctx.main_thread->ctx.Rdx != 104, "Rdx = %x\n", ctx.main_thread->ctx.Rdx); - ok(ctx.main_thread->ctx.Rsi == 105, "Rsi = %x\n", ctx.main_thread->ctx.Rsi); - ok(ctx.main_thread->ctx.Rdi == 106, "Rdi = %x\n", ctx.main_thread->ctx.Rdi); - ok(ctx.main_thread->ctx.R8 != 107, "R8 = %x\n", ctx.main_thread->ctx.R8); - ok(ctx.main_thread->ctx.R9 != 108, "R9 = %x\n", ctx.main_thread->ctx.R9); - ok(ctx.main_thread->ctx.R10 != 109, "R10 = %x\n", ctx.main_thread->ctx.R10); - ok(ctx.main_thread->ctx.R11 != 110, "R11 = %x\n", ctx.main_thread->ctx.R11); - ok(ctx.main_thread->ctx.R12 == 111, "R12 = %x\n", ctx.main_thread->ctx.R12); - ok(ctx.main_thread->ctx.R13 == 112, "R13 = %x\n", ctx.main_thread->ctx.R13); - ok(ctx.main_thread->ctx.R14 == 113, "R14 = %x\n", ctx.main_thread->ctx.R14); - ok(ctx.main_thread->ctx.R15 == 114, "R15 = %x\n", ctx.main_thread->ctx.R15); + ok(ctx.main_thread->ctx.Rax == 0, "Rax = %llx\n", ctx.main_thread->ctx.Rax); + ok(ctx.main_thread->ctx.Rbx == 102, "Rbx = %llx\n", ctx.main_thread->ctx.Rbx); + ok(ctx.main_thread->ctx.Rcx != 103, "Rcx = %llx\n", ctx.main_thread->ctx.Rcx); + ok(ctx.main_thread->ctx.Rdx != 104, "Rdx = %llx\n", ctx.main_thread->ctx.Rdx); + ok(ctx.main_thread->ctx.Rsi == 105, "Rsi = %llx\n", ctx.main_thread->ctx.Rsi); + ok(ctx.main_thread->ctx.Rdi == 106, "Rdi = %llx\n", ctx.main_thread->ctx.Rdi); + ok(ctx.main_thread->ctx.R8 != 107, "R8 = %llx\n", ctx.main_thread->ctx.R8); + ok(ctx.main_thread->ctx.R9 != 108, "R9 = %llx\n", ctx.main_thread->ctx.R9); + ok(ctx.main_thread->ctx.R10 != 109, "R10 = %llx\n", ctx.main_thread->ctx.R10); + ok(ctx.main_thread->ctx.R11 != 110, "R11 = %llx\n", ctx.main_thread->ctx.R11); + ok(ctx.main_thread->ctx.R12 == 111, "R12 = %llx\n", ctx.main_thread->ctx.R12); + ok(ctx.main_thread->ctx.R13 == 112, "R13 = %llx\n", ctx.main_thread->ctx.R13); + ok(ctx.main_thread->ctx.R14 == 113, "R14 = %llx\n", ctx.main_thread->ctx.R14); + ok(ctx.main_thread->ctx.R15 == 114, "R15 = %llx\n", ctx.main_thread->ctx.R15); #endif ctx.main_thread->ctx = orig_context; @@ -1891,11 +1892,11 @@ static void test_debugger(const char *argv0) set_thread_context(&ctx, ctx.main_thread); ret = WriteProcessMemory(pi.hProcess, ip, &instr, 1, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); memset(buf + 10, 0x90, 10); /* nop */ ret = WriteProcessMemory(pi.hProcess, mem + 10, buf + 10, 10, NULL); - ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); next_event(&ctx, POLL_EVENT_TIMEOUT); @@ -1918,8 +1919,8 @@ static void test_debugger(const char *argv0) next_event(&ctx, WAIT_EVENT_TIMEOUT); if (sizeof(void*) != 4 || ctx.ev.u.Exception.ExceptionRecord.ExceptionCode != EXCEPTION_BREAKPOINT) { - ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); - ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_SINGLE_STEP, "ExceptionCode = %x\n", + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_SINGLE_STEP, "ExceptionCode = %lx\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == mem + 10 || ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == mem + 11, @@ -1946,11 +1947,11 @@ static void test_debugger(const char *argv0) while (ctx.ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); ret = CloseHandle(event); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); ret = CloseHandle(pi.hThread); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); ret = CloseHandle(pi.hProcess); - ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + ok(ret, "CloseHandle failed, last error %ld.\n", GetLastError()); } static DWORD run_child_wait( char *cmd, HANDLE event ) @@ -1961,14 +1962,14 @@ static DWORD run_child_wait( char *cmd, HANDLE event ) DWORD exit_code; ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); Sleep(200); CloseHandle( pDbgUiGetThreadDebugObject() ); pDbgUiSetThreadDebugObject( 0 ); SetEvent( event ); WaitForSingleObject( pi.hProcess, 1000 ); ret = GetExitCodeProcess( pi.hProcess, &exit_code ); - ok( ret, "GetExitCodeProcess failed err=%d\n", GetLastError()); + ok( ret, "GetExitCodeProcess failed err=%ld\n", GetLastError()); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); return exit_code; @@ -1986,11 +1987,11 @@ static DWORD WINAPI debug_and_exit(void *arg) BOOL ret; ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); debug = pDbgUiGetThreadDebugObject(); status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); *(HANDLE *)arg = debug; Sleep(200); ExitThread(0); @@ -2006,11 +2007,11 @@ static DWORD WINAPI debug_and_wait(void *arg) pDbgUiSetThreadDebugObject( debug ); ret = CreateProcessA(NULL, cmd, NULL, NULL, TRUE, DEBUG_PROCESS, NULL, NULL, &si, &pi); - ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + ok(ret, "CreateProcess failed, last error %#lx.\n", GetLastError()); debug = pDbgUiGetThreadDebugObject(); status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); Sleep(INFINITE); ExitThread(0); } @@ -2020,7 +2021,7 @@ static DWORD WINAPI create_debug_port(void *arg) STARTUPINFOA si = { sizeof(si) }; NTSTATUS status = pDbgUiConnectToDbg(); - ok( !status, "DbgUiConnectToDbg failed %x\n", status ); + ok( !status, "DbgUiConnectToDbg failed %lx\n", status ); *(HANDLE *)arg = pDbgUiGetThreadDebugObject(); Sleep( INFINITE ); ExitThread(0); @@ -2037,50 +2038,50 @@ static void test_kill_on_exit(const char *argv0) ULONG val; event = CreateEventW(&sa, FALSE, FALSE, NULL); - ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); + ok(event != NULL, "CreateEvent failed: %lu\n", GetLastError()); cmd = heap_alloc(strlen(argv0) + strlen(arguments) + 16); - sprintf(cmd, "%s%s%x\n", argv0, arguments, (DWORD)(DWORD_PTR)event); + sprintf(cmd, "%s%s%lx\n", argv0, arguments, (DWORD)(DWORD_PTR)event); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); pDbgUiSetThreadDebugObject( debug ); exit_code = run_child_wait( cmd, event ); - ok( exit_code == 0, "exit code = %08x\n", exit_code); + ok( exit_code == 0, "exit code = %08lx\n", exit_code); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); pDbgUiSetThreadDebugObject( debug ); exit_code = run_child_wait( cmd, event ); - ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); + ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08lx\n", exit_code); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, 0xfffe ); - ok( status == STATUS_INVALID_PARAMETER, "NtCreateDebugObject failed %x\n", status ); + ok( status == STATUS_INVALID_PARAMETER, "NtCreateDebugObject failed %lx\n", status ); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, 0 ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); pDbgUiSetThreadDebugObject( debug ); val = DEBUG_KILL_ON_CLOSE; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); exit_code = run_child_wait( cmd, event ); - ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); + ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08lx\n", exit_code); status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); pDbgUiSetThreadDebugObject( debug ); val = 0; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( !status, "NtSetInformationDebugObject failed %x\n", status ); + ok( !status, "NtSetInformationDebugObject failed %lx\n", status ); exit_code = run_child_wait( cmd, event ); - ok( exit_code == 0, "exit code = %08x\n", exit_code); + ok( exit_code == 0, "exit code = %08lx\n", exit_code); status = pDbgUiConnectToDbg(); - ok( !status, "DbgUiConnectToDbg failed %x\n", status ); + ok( !status, "DbgUiConnectToDbg failed %lx\n", status ); exit_code = run_child_wait( cmd, event ); - ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08x\n", exit_code); + ok( exit_code == STATUS_DEBUGGER_INACTIVE, "exit code = %08lx\n", exit_code); /* test that threads close the debug port on exit */ thread = CreateThread(NULL, 0, debug_and_exit, &debug, 0, &tid); @@ -2090,41 +2091,41 @@ static void test_kill_on_exit(const char *argv0) status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_SUCCESS), /* wow64 */ - "NtSetInformationDebugObject failed %x\n", status ); + "NtSetInformationDebugObject failed %lx\n", status ); SetEvent( event ); if (!status) { WaitForSingleObject( pi.hProcess, 100 ); GetExitCodeProcess( pi.hProcess, &exit_code ); - ok( exit_code == STILL_ACTIVE, "exit code = %08x\n", exit_code); + ok( exit_code == STILL_ACTIVE, "exit code = %08lx\n", exit_code); CloseHandle( debug ); } WaitForSingleObject( pi.hProcess, 1000 ); GetExitCodeProcess( pi.hProcess, &exit_code ); - ok( exit_code == 0, "exit code = %08x\n", exit_code); + ok( exit_code == 0, "exit code = %08lx\n", exit_code); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); CloseHandle( thread ); /* but not on forced exit */ status = pNtCreateDebugObject( &debug, DEBUG_ALL_ACCESS, &attr, DEBUG_KILL_ON_CLOSE ); - ok( !status, "NtCreateDebugObject failed %x\n", status ); + ok( !status, "NtCreateDebugObject failed %lx\n", status ); thread = CreateThread(NULL, 0, debug_and_wait, &debug, 0, &tid); Sleep( 100 ); ok( debug != 0, "no debug port\n" ); val = 1; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); TerminateThread( thread, 0 ); status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); WaitForSingleObject( pi.hProcess, 300 ); GetExitCodeProcess( pi.hProcess, &exit_code ); todo_wine ok( exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STILL_ACTIVE), /* wow64 */ - "exit code = %08x\n", exit_code); + "exit code = %08lx\n", exit_code); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); CloseHandle( thread ); @@ -2137,11 +2138,11 @@ static void test_kill_on_exit(const char *argv0) val = 0; status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); TerminateThread( thread, 0 ); status = pNtSetInformationDebugObject( debug, DebugObjectKillProcessOnExitInformation, &val, sizeof(val), NULL ); - ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %x\n", status ); + ok( status == STATUS_SUCCESS, "NtSetInformationDebugObject failed %lx\n", status ); CloseHandle( debug ); CloseHandle( thread ); @@ -2191,7 +2192,7 @@ START_TEST(debugger) else if (myARGC >= 4 && !strcmp(myARGV[2], "wait")) { DWORD event, cnt = 1; - sscanf(myARGV[3], "%x", &event); + sscanf(myARGV[3], "%lx", &event); if (myARGC >= 5) cnt = atoi(myARGV[4]); wait_debugger((HANDLE)(DWORD_PTR)event, cnt); }

3 26

[PATCH v2 1/5] devenum/tests: Remove workarounds from test_moniker_isequal().
by Zebediah Figura 03 Mar '22

03 Mar '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: New patch. dlls/devenum/tests/devenum.c | 113 +++++++++++++++++------------------ 1 file changed, 54 insertions(+), 59 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 3e0d6f57dc3..1a1e48e1a4b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -150,91 +150,85 @@ static void test_devenum(void) static void test_moniker_isequal(void) { - HRESULT res; ICreateDevEnum *create_devenum = NULL; IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; IMoniker *moniker0 = NULL, *moniker1 = NULL; + HRESULT hr; - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - if (FAILED(res)) + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); - return; + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); } - - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + else { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); - - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); - - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + { + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); IEnumMoniker_Release(enum_moniker1); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + { + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); IEnumMoniker_Release(enum_moniker1); ICreateDevEnum_Release(create_devenum); - - return; } static BOOL find_moniker(const GUID *class, IMoniker *needle) @@ -277,6 +271,7 @@ static void test_register_filter(void) rgf2.dwMerit = MERIT_UNLIKELY; S2(U(rgf2)).cPins2 = 0; + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, NULL, NULL, &rgf2); if (hr == E_ACCESSDENIED) { -- 2.35.1

1 4

[tools] testbot/cgi: Move CallGetEscapedDisplayValue() next to its target.
by Francois Gouget 03 Mar '22

03 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3af2a14ce5..a5e8187009 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -435,13 +435,6 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - sub CallGetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -495,6 +488,13 @@ sub GetDisplayValue($$$) return $Value; } +sub CallGetEscapedDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); +} + sub GetEscapedDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[tools] testbot/cgi: Mark an unused variable as such.
by Francois Gouget 03 Mar '22

03 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It's really just a naming convention. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 0ac599e137..03ddea64f2 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -391,8 +391,7 @@ sub Save($) return !1 if (!$self->SaveProperties()); - my $ErrKey; - ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); } -- 2.30.2

1 0

[tools] testbot/web: Override the default form actions instead of appending.
by Francois Gouget 03 Mar '22

03 Mar '22

Note that the parent FormPage class has no action anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I cannot think of any case where it would make sense to add a default set of actions to the base FormPage class that would make sense in any of these pages. So simplify the implementation by just specifying the set of actions that these web pages support. --- testbot/web/Feedback.pl | 8 ++------ testbot/web/ForgotPassword.pl | 8 ++------ testbot/web/Login.pl | 5 +---- testbot/web/ResetPassword.pl | 8 ++------ testbot/web/Stats.pl | 7 ++----- testbot/web/Submit.pl | 28 +++++----------------------- testbot/web/admin/Log.pl | 8 ++------ testbot/web/admin/SpecialJobs.pl | 7 ++----- 8 files changed, 18 insertions(+), 61 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index b43397fda0..9eba086ace 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -72,12 +72,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Send"; - - return $Actions; + #my ($self) = @_; + return ["Send"]; } sub OnSend($) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 4e1c508b23..cc0cd455d3 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -58,12 +58,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Reset password"; - - return $Actions; + #my ($self) = @_; + return ["Reset password"]; } sub OnResetPassword($) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 3c93dd869d..ef3f4cb064 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -89,10 +89,7 @@ sub GetActions($) { my ($self) = @_; - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Log in"; - - return $Actions; + return ["Log in"]; } sub OnLogIn($) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 1e2b94d031..81655e0c4f 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -73,12 +73,8 @@ sub GetInputType($$) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Change password"; - - return $Actions; + #my ($self) = @_; + return ["Change password"]; } sub Validate($) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 803fc59f9f..ab086976f7 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -394,11 +394,8 @@ sub GetDisplayValue($$) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Update"; - return $Actions; + #my ($self) = @_; + return ["Update"]; } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 76069bbc3f..9a7ac0b3e7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -913,29 +913,11 @@ sub GetActions($) { my ($self) = @_; - my $Actions = $self->SUPER::GetActions(); - if ($self->{Page} == 0) - { - push @$Actions, "OK"; - } - elsif ($self->{Page} == 1) - { - push @$Actions, "Single Page", "Next >"; - } - elsif ($self->{Page} == 2) - { - push @$Actions, "< Prev", "Next >"; - } - elsif ($self->{Page} == 3) - { - push @$Actions, "< Prev", "Submit"; - } - elsif ($self->{Page} == 4) - { - push @$Actions, "Submit"; - } - - return $Actions; + return ["Single Page", "Next >"] if ($self->{Page} == 1); + return ["< Prev", "Next >"] if ($self->{Page} == 2); + return ["< Prev", "Submit"] if ($self->{Page} == 3); + return ["Submit"] if ($self->{Page} == 4); + return ["OK"]; # Page == 0 (error case) } sub DisplayProperty($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index f0ac524681..cb253bd03e 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -64,12 +64,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Download"; - - return $Actions; + #my ($self) = @_; + return ["Download"]; } sub OnDownload($) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index c5a8f6587f..534336c483 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -145,11 +145,8 @@ sub GenerateFields($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Submit"; - return $Actions; + #my ($self) = @_; + return ["Submit"]; } -- 2.30.2

1 0

[tools] testbot/cgi: Rename the per-item action list variables.
by Francois Gouget 03 Mar '22

03 Mar '22

Rename it to $ItemActions to avoid confusion with the global actions list ($Actions). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 54 ++++++++++++++----- .../ObjectModel/CGI/CollectionBlockForPage.pm | 8 +-- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 8 +-- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index effd039fb2..3af2a14ce5 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -108,8 +108,8 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $Actions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + my $ItemActions = $self->CallGetItemActions(); + $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; print "<tbody>\n"; @@ -121,7 +121,7 @@ EOF my $Class = ($Row % 2) == 0 ? "even" : "odd"; my $Item = $self->{Collection}->GetItem($Key); $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $Actions); + $Class, $ItemActions); $Row++; } if (@$Keys == 0) @@ -132,7 +132,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$Actions != 0 && @$Keys != 0) + if (@$ItemActions != 0 && @$Keys != 0) { print <<EOF; <div class='CollectionBlockActions'> @@ -153,7 +153,7 @@ document.write("<a href='javascript:void(0)' onClick='ToggleAll();'>Toggle All<\ </script> EOF print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$Actions) + foreach my $Action (@$ItemActions) { print " <input type='submit' name='Action' value='" . $self->escapeHTML($Action) . "' />"; @@ -162,7 +162,7 @@ EOF print "</div>\n"; } - $Actions = $self->CallGetActions(); + my $Actions = $self->CallGetActions(); if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -231,17 +231,17 @@ sub GenerateFormEnd($) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->GenerateHeaderRow($PropertyDescriptors, $Actions); + $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; print "<tr>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<th> </th>\n"; } @@ -272,9 +272,9 @@ sub GenerateHeaderCell($$) sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub SelName($$) @@ -287,10 +287,10 @@ sub SelName($$) sub GenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; print "<tr class='$Class'>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<td><input name='", $self->SelName($Item->GetKey()), "' type='checkbox' /></td>\n"; @@ -369,6 +369,19 @@ sub CallGetItemActions($) return $self->GetItemActions(); } +=pod +=over 12 + +=item C<GetItemActions()> + +Returns the list of per-item actions. + +This is a set of actions that is applied to each selected item in the +collection. + +=back +=cut + sub GetItemActions($) { #my ($self) = @_; @@ -382,6 +395,19 @@ sub CallGetActions($) return $self->GetActions(); } +=pod +=over 12 + +=item C<GetActions()> + +Returns the list of global actions. + +This is a set of actions that do not impact any specific item in the +collection. + +=back +=cut + sub GetActions($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 03a45082f0..13ad5a8752 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -54,16 +54,16 @@ sub CallGenerateHeaderCell($$) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $Actions); + $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); } sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub CallGenerateDataCell($$$$) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 5c48954c68..72bba1bc4e 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -103,16 +103,16 @@ sub GenerateHeaderCell($$$) sub GenerateHeaderRow($$$$) { - my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_; + my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; - $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $Actions); + $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateDataRow($$$$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub GenerateDataCell($$$$$) -- 2.30.2

1 0