March 2022 - Wine-commits - list.winehq.org

Eric Pouech : vcomp110/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: f7345120b1e3bf7e452f96f25ef925c4cf3ca7e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7345120b1e3bf7e452f96f2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:17 2022 +0100 vcomp110/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp110/tests/Makefile.in | 1 - dlls/vcomp110/tests/vcomp110.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp110/tests/Makefile.in b/dlls/vcomp110/tests/Makefile.in index cc48f6e9fc8..98fba09e5b4 100644 --- a/dlls/vcomp110/tests/Makefile.in +++ b/dlls/vcomp110/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vcomp110.dll C_SRCS = \ diff --git a/dlls/vcomp110/tests/vcomp110.c b/dlls/vcomp110/tests/vcomp110.c index e0be668dffd..214e52428c0 100644 --- a/dlls/vcomp110/tests/vcomp110.c +++ b/dlls/vcomp110/tests/vcomp110.c @@ -271,14 +271,14 @@ static void test_C2VectParallel(void) pC2VectParallel(test->start, test->end, test->step, test->end_included, test->thread_count, FALSE, test_C2VectParallel_payload, 6, (void *)0xdeadbeef, test, i, FALSE); ok(test_C2VectParallel_call_count == test->expected_call_count, - "Got unexpected call count %u, expected %u, test %u.\n", + "Got unexpected call count %lu, expected %u, test %u.\n", test_C2VectParallel_call_count, test->expected_call_count, i); test_C2VectParallel_call_count = 0; pC2VectParallel(test->start, test->end, test->step, test->end_included, test->thread_count, ~0u, test_C2VectParallel_payload, 6, (void *)0xdeadbeef, test, i, TRUE); ok(test_C2VectParallel_call_count == test->expected_dynamic_call_count, - "Got unexpected call count %u, expected %u, test %u.\n", + "Got unexpected call count %lu, expected %u, test %u.\n", test_C2VectParallel_call_count, test->expected_dynamic_call_count, i); } }

1 0

Eric Pouech : vcomp/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: b65bde4d3906a3b25f52993bf53f9f92fc91478d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65bde4d3906a3b25f52993b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:23 2022 +0100 vcomp/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/Makefile.in | 1 - dlls/vcomp/tests/vcomp.c | 156 +++++++++++++++++++++---------------------- 2 files changed, 78 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b65bde4d3906a3b25f52…

1 0

Eric Pouech : version/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 68b44938f8f2d0238e11856f133a8d980e05d28b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b44938f8f2d0238e11856f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:29 2022 +0100 version/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/Makefile.in | 1 - dlls/version/tests/info.c | 138 ++++++++++++++++++++--------------------- dlls/version/tests/install.c | 76 +++++++++++------------ 3 files changed, 107 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68b44938f8f2d0238e11…

1 0

Eric Pouech : virtdisk/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 659f6fe32aa8c6158860ea7e32a45e3d481186e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=659f6fe32aa8c6158860ea7e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:35 2022 +0100 virtdisk/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/Makefile.in | 1 - dlls/virtdisk/tests/virtdisk.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/virtdisk/tests/Makefile.in b/dlls/virtdisk/tests/Makefile.in index 6d573f357e9..3ace1a702d3 100644 --- a/dlls/virtdisk/tests/Makefile.in +++ b/dlls/virtdisk/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = virtdisk.dll C_SRCS = \ diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index 34118e532b1..bbbaf4d45e4 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -40,10 +40,10 @@ static void test_GetStorageDependencyInformation(void) info = heap_alloc(size); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); heap_free(info); CloseHandle(handle); @@ -58,27 +58,27 @@ static void test_OpenVirtualDisk(void) static const WCHAR vdisk[] = L"test.vhd"; ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); stgtype.DeviceId = VIRTUAL_STORAGE_TYPE_DEVICE_UNKNOWN; stgtype.VendorId = VIRTUAL_STORAGE_TYPE_VENDOR_UNKNOWN; ret = pOpenVirtualDisk(&stgtype, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_3; ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %d\n", ret); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 10), got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_2; ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %d\n", ret); + ok((ret == ERROR_INVALID_PARAMETER) || (ret == ERROR_FILE_NOT_FOUND), "Expected ERROR_INVALID_PARAMETER or ERROR_FILE_NOT_FOUND (>= Win 8), got %ld\n", ret); param.Version = OPEN_VIRTUAL_DISK_VERSION_1; ret = pOpenVirtualDisk(&stgtype, vdisk, 0xffffff, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, &param, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); ret = pOpenVirtualDisk(&stgtype, vdisk, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NONE, &param, &handle); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", ret); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); } START_TEST(virtdisk)

1 0

Eric Pouech : vulkan-1/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 2fec470ade45ed904c61e315c17510ee8bcefa8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fec470ade45ed904c61e315… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:41 2022 +0100 vulkan-1/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/Makefile.in | 1 - dlls/vulkan-1/tests/vulkan.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in index 6bff576d70f..c9f9f0727c8 100644 --- a/dlls/vulkan-1/tests/Makefile.in +++ b/dlls/vulkan-1/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = vulkan-1.dll IMPORTS = vulkan-1 diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 75e48bfc9d1..11d20120d1d 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -209,7 +209,7 @@ static void test_enumerate_physical_device2(void) pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); luid = (const LUID *)id.deviceLUID; - trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", + trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08lx:%08lx.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); @@ -584,7 +584,7 @@ static void test_cross_process_resource(VkPhysicalDeviceIDPropertiesKHR *device_ sprintf(buf, "\"%s\" vulkan resource %s %s %s %p", argv[0], driver_uuid, device_uuid, kmt ? "kmt" : "nt", handle); res = CreateProcessA(NULL, buf, NULL, NULL, TRUE, 0L, NULL, NULL, &si, &info); - ok(res, "CreateProcess failed: %u\n", GetLastError()); + ok(res, "CreateProcess failed: %lu\n", GetLastError()); CloseHandle(info.hThread); wait_child_process(info.hProcess);

1 0

Eric Pouech : wer/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: f42ab60a016219db7c980c069f932c7a6ac84895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42ab60a016219db7c980c06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:47 2022 +0100 wer/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/tests/Makefile.in | 1 - dlls/wer/tests/main.c | 82 +++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42ab60a016219db7c98…

1 0

Eric Pouech : wevtapi/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 96e9e1ea75b20a71b650e6eb3149dd48715ac546 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e9e1ea75b20a71b650e6eb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:31:53 2022 +0100 wevtapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/tests/Makefile.in | 1 - dlls/wevtapi/tests/wevtapi.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in index db69ecb71d2..47fde74b0eb 100644 --- a/dlls/wevtapi/tests/Makefile.in +++ b/dlls/wevtapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wevtapi.dll IMPORTS = wevtapi advapi32 diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c index a0a21aa9971..51dbbd33970 100644 --- a/dlls/wevtapi/tests/wevtapi.c +++ b/dlls/wevtapi/tests/wevtapi.c @@ -42,24 +42,24 @@ static void test_EvtGetChannelConfigProperty(void) skip("Not enough privileges to modify HKLM\n"); return; } - ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + ok(ret == ERROR_SUCCESS, "RegCreateKey error %lu\n", ret); config = EvtOpenChannelConfig(NULL, L"Winetest", 0); - ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + ok(config != NULL, "EvtOpenChannelConfig error %lu\n", GetLastError()); ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); ok(!ret, "EvtGetChannelConfigProperty should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); - ok(size < sizeof(path), "got %u\n", size); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(size < sizeof(path), "got %lu\n", size); memset(&path, 0, sizeof(path)); path.var.Count = 0xdeadbeef; path.var.Type = 0xdeadbeef; ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); - ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); - ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); - ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); - ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(ret, "EvtGetChannelConfigProperty error %lu\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %lu\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %lu\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %lu\n", size); ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); EvtClose(config);

1 0

Eric Pouech : spoolss/tests: Enable compilation with long types.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: e8804626e1fa4ab6e5f74548163ca3fe8a1bb733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8804626e1fa4ab6e5f74548… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:08:20 2022 +0100 spoolss/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/tests/Makefile.in | 1 - dlls/spoolss/tests/spoolss.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/tests/Makefile.in b/dlls/spoolss/tests/Makefile.in index 992090c3745..f54fe5937c1 100644 --- a/dlls/spoolss/tests/Makefile.in +++ b/dlls/spoolss/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = spoolss.dll C_SRCS = \ diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index acf2801a589..ce55cf50220 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -166,7 +166,7 @@ static void test_BuildOtherNamesFromMachineName(void) todo_wine ok( res && (buffers != NULL) && (numentries >= 3) && (buffers[0] != NULL) && (buffers[0][0] == '\0'), - "got %u with %u and %p,%u (%p:%d)\n", res, GetLastError(), buffers, numentries, + "got %lu with %lu and %p,%lu (%p:%d)\n", res, GetLastError(), buffers, numentries, ((numentries > 0) && buffers) ? buffers[0] : NULL, ((numentries > 0) && buffers && buffers[0]) ? lstrlenW(buffers[0]) : -1); @@ -183,7 +183,7 @@ static void test_SplInitializeWinSpoolDrv(VOID) memset(fn_spl, 0xff, sizeof(fn_spl)); SetLastError(0xdeadbeef); res = pSplInitializeWinSpoolDrv(fn_spl); - ok(res, "got %u with %u (expected '!= 0')\n", res, GetLastError()); + ok(res, "got %lu with %lu (expected '!= 0')\n", res, GetLastError()); /* functions 0 to 5 are the same in "spoolss.dll" from w2k and above */ if (fn_spl[6] == fn_w2k[6]) { @@ -196,7 +196,7 @@ static void test_SplInitializeWinSpoolDrv(VOID) id = 0; while (id < WINSPOOL_TABLESIZE) { ok( fn_spl[id] == fn_ref[id], - "(#%02u) spoolss: %p (vista: %p, xp: %p, w2k: %p)\n", + "(#%02lu) spoolss: %p (vista: %p, xp: %p, w2k: %p)\n", id, fn_spl[id], fn_v[id], fn_xp[id], fn_w2k[id]); id++; }

1 0

Floris Renaud : po: Update Dutch Translation.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 44bce619ef6b4c182a83c2be894f986a09b9ed24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bce619ef6b4c182a83c2be… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Mar 8 13:48:00 2022 +0100 po: Update Dutch Translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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"

1 0

Santino Mazza : bcrypt: Implement KeyLength property.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: bae287a1aad210c66dd067614d97c409a4fc4d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae287a1aad210c66dd06761… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Mar 8 11:10:54 2022 +0100 bcrypt: Implement KeyLength property. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0