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

Eric Pouech : kernel32/tests/virtual: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: d87cc188897a03bb8f1729548ead47c9744f58f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87cc188897a03bb8f172954… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:08 2022 +0100 kernel32/tests/virtual: 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/kernel32/tests/virtual.c | 1839 +++++++++++++++++++++-------------------- 1 file changed, 920 insertions(+), 919 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d87cc188897a03bb8f17…

1 0

Eric Pouech : userenv/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: f0c165ed5cc37217e985bf5e64bdbaab4e0967ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c165ed5cc37217e985bf5e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:27 2022 +0100 userenv/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/userenv/tests/Makefile.in | 1 - dlls/userenv/tests/userenv.c | 46 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/userenv/tests/Makefile.in b/dlls/userenv/tests/Makefile.in index 4eca08ed851..c4aa8d0db4a 100644 --- a/dlls/userenv/tests/Makefile.in +++ b/dlls/userenv/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = userenv.dll IMPORTS = userenv advapi32 diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index c7a6791e2be..3f2b3442832 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -33,7 +33,7 @@ #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) #define expect_env(EXPECTED,GOT,VAR) ok((GOT)==(EXPECTED), "Expected %d, got %d for %s (%d)\n", (EXPECTED), (GOT), (VAR), j) -#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %d\n", (EXPECTED), GetLastError()) +#define expect_gle(EXPECTED) ok(GetLastError() == (EXPECTED), "Expected %d, got %ld\n", (EXPECTED), GetLastError()) static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -115,13 +115,13 @@ static void test_create_env(void) expect(TRUE, r); r = GetEnvironmentVariableA("SystemRoot", systemroot, sizeof(systemroot)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("SystemRoot", "overwrite"); expect(TRUE, r); r = GetEnvironmentVariableA("ProgramData", programdata, sizeof(programdata)); - ok(r != 0, "GetEnvironmentVariable failed (%d)\n", GetLastError()); + ok(r != 0, "GetEnvironmentVariable failed (%ld)\n", GetLastError()); r = SetEnvironmentVariableA("ProgramData", "overwrite"); expect(TRUE, r); @@ -250,7 +250,7 @@ static void test_get_profiles_dir(void) char *profiles_dir, *buf, small_buf[1]; l = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ProfileListA, 0, KEY_READ, &key); - ok(!l, "RegOpenKeyExA failed: %d\n", GetLastError()); + ok(!l, "RegOpenKeyExA failed: %ld\n", GetLastError()); l = RegQueryValueExA(key, ProfilesDirectory, NULL, NULL, NULL, &cch); if (l) @@ -282,7 +282,7 @@ static void test_get_profiles_dir(void) /* MSDN claims the returned character count includes the NULL terminator * when the buffer is too small, but that's not in fact what gets returned. */ - ok(cch == profiles_len - 1, "expected %d, got %d\n", profiles_len - 1, cch); + ok(cch == profiles_len - 1, "expected %ld, got %ld\n", profiles_len - 1, cch); /* Allocate one more character than the return value to prevent a buffer * overrun. */ @@ -291,7 +291,7 @@ static void test_get_profiles_dir(void) /* Rather than a BOOL, the return value is also the number of characters * stored in the buffer. */ - expect(profiles_len - 1, r); + ok(profiles_len - 1 == r, "expected %ld, got %d\n", profiles_len - 1, r); ok(!strcmp(buf, profiles_dir), "expected %s, got %s\n", profiles_dir, buf); HeapFree(GetProcessHeap(), 0, buf); @@ -330,26 +330,26 @@ static void test_get_user_profile_dir(void) } ret = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirA = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirA ); len = 0; @@ -357,8 +357,8 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); - ok(!len, "expected 0, got %u\n", len); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); + ok(!len, "expected 0, got %lu\n", len); len = 0; dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 ); @@ -374,34 +374,34 @@ static void test_get_user_profile_dir(void) dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenA( dirA ), len ); trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); } else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, NULL, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); dirW = HeapAlloc( GetProcessHeap(), 0, 32 ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, NULL ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); HeapFree( GetProcessHeap(), 0, dirW ); len = 0; @@ -409,15 +409,15 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryW( token, NULL, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", error); ok(len, "expected len > 0\n"); dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR) ); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( token, dirW, &len ); - ok(ret, "expected success %u\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ok(len, "expected len > 0\n"); - ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); + ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %ld - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); len2 = 0; @@ -428,10 +428,10 @@ static void test_get_user_profile_dir(void) ok(!ret, "expected failure\n"); HeapFree( GetProcessHeap(), 0, dirW ); if (error == ERROR_INSUFFICIENT_BUFFER) - ok(len2 == len, "expected %d, got %d\n", len, len2); + ok(len2 == len, "expected %ld, got %ld\n", len, len2); else ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, - "unexpected error %u\n", error); + "unexpected error %lu\n", error); CloseHandle( token ); }

1 0

Santino Mazza : ncrypt: Make use of bcrypt for low level cryptography.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: e679b7413eaa00161e326bffff3cd76d84f7c542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e679b7413eaa00161e326bff… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Mar 8 11:10:55 2022 +0100 ncrypt: Make use of bcrypt for low level cryptography. 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/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

1 0

Eric Pouech : spoolss/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

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 March 8, 2022

March 8, 2022

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 : ncrypt/tests: Test for symmetric keys support.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: a5ba63b80a9ffcfd5cf58820cb5c956e76f6065c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5ba63b80a9ffcfd5cf58820… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Mar 8 11:10:56 2022 +0100 ncrypt/tests: Test for symmetric keys support. 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/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); } }

1 0

Eric Pouech : wevtapi/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

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 : wer/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

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 : vcomp110/tests: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

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 March 8, 2022

March 8, 2022

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