January 2016 - Wine-Commits

Hans Leidekker : include: Add missing BCrypt declarations.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 5c1a92e1cf06bf6446f0da5982624beb4bc69a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1a92e1cf06bf6446f0da598… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:14 2016 +0100 include: Add missing BCrypt declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index fe3d854..30988be 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -40,6 +40,34 @@ typedef LONG NTSTATUS; #endif +#define BCRYPT_ALGORITHM_NAME (const WCHAR []){'A','l','g','o','r','i','t','h','m','N','a','m','e',0} +#define BCRYPT_AUTH_TAG_LENGTH (const WCHAR []){'A','u','t','h','T','a','g','L','e','n','g','t','h',0} +#define BCRYPT_BLOCK_LENGTH (const WCHAR []){'B','l','o','c','k','L','e','n','g','t','h',0} +#define BCRYPT_BLOCK_SIZE_LIST (const WCHAR []){'B','l','o','c','k','S','i','z','e','L','i','s','t',0} +#define BCRYPT_CHAINING_MODE (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e',0} +#define BCRYPT_EFFECTIVE_KEY_LENGTH (const WCHAR []){'E','f','f','e','c','t','i','v','e','K','e','y','L','e','n','g','t','h',0} +#define BCRYPT_HASH_BLOCK_LENGTH (const WCHAR []){'H','a','s','h','B','l','o','c','k','L','e','n','g','t','h',0} +#define BCRYPT_HASH_LENGTH (const WCHAR []){'H','a','s','h','D','i','g','e','s','t','L','e','n','g','t','h',0} +#define BCRYPT_HASH_OID_LIST (const WCHAR []){'H','a','s','h','O','I','D','L','i','s','t',0} +#define BCRYPT_KEY_LENGTH (const WCHAR []){'K','e','y','L','e','n','g','t','h',0} +#define BCRYPT_KEY_LENGTHS (const WCHAR []){'K','e','y','L','e','n','g','t','h','s',0} +#define BCRYPT_KEY_OBJECT_LENGTH (const WCHAR []){'K','e','y','O','b','j','e','c','t','L','e','n','g','t','h',0} +#define BCRYPT_KEY_STRENGTH (const WCHAR []){'K','e','y','S','t','r','e','n','g','t','h',0} +#define BCRYPT_OBJECT_LENGTH (const WCHAR []){'O','b','j','e','c','t','L','e','n','g','t','h',0} +#define BCRYPT_PADDING_SCHEMES (const WCHAR []){'P','a','d','d','i','n','g','S','c','h','e','m','e','s',0} +#define BCRYPT_PROVIDER_HANDLE (const WCHAR []){'P','r','o','v','i','d','e','r','H','a','n','d','l','e',0} +#define BCRYPT_SIGNATURE_LENGTH (const WCHAR []){'S','i','g','n','a','t','u','r','e','L','e','n','g','t','h',0} + +#define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ + {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} +#define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ + {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} + +#define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} +#define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} +#define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} +#define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -54,4 +82,15 @@ typedef PVOID BCRYPT_HASH_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002 +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); +NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); +NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); +NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *); +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); + #endif /* __WINE_BCRYPT_H */

1 0

Hans Leidekker : bcrypt: Implement BCryptOpenAlgorithmProvider and BCryptCloseAlgorithmProvider.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: eaf9e4154317cc160d5baa85aba22a62ba75103e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf9e4154317cc160d5baa85a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:15 2016 +0100 bcrypt: Implement BCryptOpenAlgorithmProvider and BCryptCloseAlgorithmProvider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 70 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b716aea..310c9b6 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -27,7 +27,9 @@ #include "winbase.h" #include "ntsecapi.h" #include "bcrypt.h" + #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -78,24 +80,72 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULON return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWSTR algorithmId, - LPCWSTR implementation, DWORD flags) +#define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') +struct object { - FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId), wine_dbgstr_w(implementation), flags); + ULONG magic; +}; - if (!algorithm) - return STATUS_INVALID_PARAMETER; +enum alg_id +{ + ALG_ID_SHA1 = 1, + ALG_ID_SHA256 = 2, + ALG_ID_SHA384 = 3, + ALG_ID_SHA512 = 4 +}; - *algorithm = NULL; +struct algorithm +{ + struct object hdr; + enum alg_id id; +}; - return STATUS_NOT_IMPLEMENTED; +NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) +{ + struct algorithm *alg; + enum alg_id alg_id; + + TRACE( "%p, %s, %s, %08x\n", handle, wine_dbgstr_w(id), wine_dbgstr_w(implementation), flags ); + + if (!handle || !id) return STATUS_INVALID_PARAMETER; + if (flags) + { + FIXME( "unimplemented flags %08x\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; + else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; + else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; + else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; + else + { + FIXME( "algorithm %s not supported\n", debugstr_w(id) ); + return STATUS_NOT_IMPLEMENTED; + } + if (!implementation || strcmpW( implementation, MS_PRIMITIVE_PROVIDER )) + { + FIXME( "implementation %s not supported\n", debugstr_w(implementation) ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!(alg = HeapAlloc( GetProcessHeap(), 0, sizeof(*alg) ))) return STATUS_NO_MEMORY; + alg->hdr.magic = MAGIC_ALG; + alg->id = alg_id; + + *handle = alg; + return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) +NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD flags ) { - FIXME("%p, %08x - stub\n", algorithm, flags); + struct algorithm *alg = handle; - return STATUS_NOT_IMPLEMENTED; + TRACE( "%p, %08x\n", handle, flags ); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + HeapFree( GetProcessHeap(), 0, alg ); + return STATUS_SUCCESS; } NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled)

1 0

Hans Leidekker : bcrypt: Implement BCryptCreateHash and BCryptDestroyHash.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 0c9b94eeb3bcf5f4b049de934b11f5a8dab0afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9b94eeb3bcf5f4b049de934… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:16 2016 +0100 bcrypt: Implement BCryptCreateHash and BCryptDestroyHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++-- include/config.h.in | 3 ++ 5 files changed, 101 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 06e3b4a..997833d 100755 --- a/configure +++ b/configure @@ -6675,6 +6675,7 @@ for ac_header in \ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ + CommonCrypto/CommonDigest.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/configure.ac b/configure.ac index d47f7e9..2b1dd81 100644 --- a/configure.ac +++ b/configure.ac @@ -393,6 +393,7 @@ AC_CHECK_HEADERS(\ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ + CommonCrypto/CommonDigest.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 1c848e1..53db32a 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -8,7 +8,7 @@ @ stub BCryptDecrypt @ stub BCryptDeleteContext @ stub BCryptDeriveKey -@ stub BCryptDestroyHash +@ stdcall BCryptDestroyHash(ptr) @ stub BCryptDestroyKey @ stub BCryptDestroySecret @ stub BCryptDuplicateHash diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 310c9b6..d496d80 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -20,6 +20,9 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H +#include <CommonCrypto/CommonDigest.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -81,6 +84,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULON } #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') +#define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') struct object { ULONG magic; @@ -159,6 +163,59 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) return STATUS_SUCCESS; } +#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H +struct hash +{ + struct object hdr; + enum alg_id alg_id; + union + { + CC_SHA1_CTX sha1_ctx; + CC_SHA256_CTX sha256_ctx; + CC_SHA512_CTX sha512_ctx; + } u; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Init( &hash->u.sha1_ctx ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Init( &hash->u.sha256_ctx ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Init( &hash->u.sha512_ctx ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Init( &hash->u.sha512_ctx ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + return STATUS_SUCCESS; +} +#else +struct hash +{ + struct object hdr; + enum alg_id alg_id; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + ERR( "support for hashes not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} +#endif + NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) { FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); @@ -166,10 +223,44 @@ NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer return STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE* hash, UCHAR* hashobject, - ULONG hashobjectlen, UCHAR *secret, ULONG secretlen, ULONG flags) +NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, + UCHAR *secret, ULONG secretlen, ULONG flags ) { - FIXME("%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, hash, hashobject, hashobjectlen, secret, secretlen, flags); + struct algorithm *alg = algorithm; + struct hash *hash; + NTSTATUS status; - return STATUS_NOT_IMPLEMENTED; + TRACE( "%p, %p, %p, %u, %p, %u, %08x - stub\n", algorithm, handle, object, objectlen, + secret, secretlen, flags ); + if (flags) + { + FIXME( "unimplemented flags %08x\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (object) FIXME( "ignoring object buffer\n" ); + + if (!(hash = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash) ))) return STATUS_NO_MEMORY; + hash->hdr.magic = MAGIC_HASH; + hash->alg_id = alg->id; + if ((status = hash_init( hash )) != STATUS_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, hash ); + return status; + } + + *handle = hash; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) +{ + struct hash *hash = handle; + + TRACE( "%p\n", handle ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + HeapFree( GetProcessHeap(), 0, hash ); + return STATUS_SUCCESS; } diff --git a/include/config.h.in b/include/config.h.in index 61817f4..514e5fe 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -71,6 +71,9 @@ /* Define to 1 if you have the <CL/cl.h> header file. */ #undef HAVE_CL_CL_H +/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */ +#undef HAVE_COMMONCRYPTO_COMMONDIGEST_H + /* Define to 1 if you have the <CoreAudio/CoreAudio.h> header file. */ #undef HAVE_COREAUDIO_COREAUDIO_H

1 0

Nikolay Sivov : ole32/tests: A couple of tests for ReadClassStm/ ReadClassStg.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 0a34f25487f65448104b85cb0a8f33748adf9fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a34f25487f65448104b85cb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 6 15:51:28 2016 +0300 ole32/tests: A couple of tests for ReadClassStm/ReadClassStg. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/storage32.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index afe9332..43c0c28 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1176,7 +1176,7 @@ static void test_writeclassstg(void) { IStorage *stg = NULL; HRESULT r; - CLSID temp_cls; + CLSID temp_cls, cls2; DeleteFileA(filenameA); @@ -1188,6 +1188,12 @@ static void test_writeclassstg(void) r = ReadClassStg( NULL, NULL ); ok(r == E_INVALIDARG, "ReadClassStg should return E_INVALIDARG instead of 0x%08X\n", r); + memset(&temp_cls, 0xcc, sizeof(temp_cls)); + memset(&cls2, 0xcc, sizeof(cls2)); + r = ReadClassStg( NULL, &temp_cls ); + ok(r == E_INVALIDARG, "got 0x%08x\n", r); + ok(IsEqualCLSID(&temp_cls, &cls2), "got wrong clsid\n"); + r = ReadClassStg( stg, NULL ); ok(r == E_INVALIDARG, "ReadClassStg should return E_INVALIDARG instead of 0x%08X\n", r); @@ -1957,7 +1963,7 @@ static void test_nonroot_transacted(void) static void test_ReadClassStm(void) { - CLSID clsid; + CLSID clsid, clsid2; HRESULT hr; IStream *pStream; static const LARGE_INTEGER llZero; @@ -1973,6 +1979,12 @@ static void test_ReadClassStm(void) hr = ReadClassStm(pStream, NULL); ok(hr == E_INVALIDARG, "ReadClassStm should have returned E_INVALIDARG instead of 0x%08x\n", hr); + memset(&clsid, 0xcc, sizeof(clsid)); + memset(&clsid2, 0xcc, sizeof(clsid2)); + hr = ReadClassStm(NULL, &clsid); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &clsid2), "got wrong clsid\n"); + /* test not rewound stream */ hr = ReadClassStm(pStream, &clsid); ok(hr == STG_E_READFAULT, "ReadClassStm should have returned STG_E_READFAULT instead of 0x%08x\n", hr);

1 0

Hans Leidekker : bcrypt: Implement BCryptFinishHash.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 085ed64df6b048f1237006f5b58994b11fea1fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085ed64df6b048f1237006f5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:19 2016 +0100 bcrypt: Implement BCryptFinishHash. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 5d67516..c52d89f 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -22,7 +22,7 @@ @ stub BCryptEnumRegisteredProviders @ stub BCryptExportKey @ stub BCryptFinalizeKeyPair -@ stub BCryptFinishHash +@ stdcall BCryptFinishHash(ptr ptr long long) @ stub BCryptFreeBuffer @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 806fee8..9cc5227 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -228,6 +228,33 @@ static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) break; } } + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Final( output, &hash->u.sha1_ctx ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Final( output, &hash->u.sha256_ctx ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Final( output, &hash->u.sha512_ctx ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Final( output, &hash->u.sha512_ctx ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + break; + } + return STATUS_SUCCESS; +} #else struct hash { @@ -245,6 +272,12 @@ static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) { ERR( "support for hashes not available at build time\n" ); } + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + ERR( "support for hashes not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} #endif #define OBJECT_LENGTH_SHA1 278 @@ -454,3 +487,15 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s hash_update( hash, input, size ); return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) +{ + struct hash *hash = handle; + + TRACE( "%p, %p, %u, %08x\n", handle, output, size, flags ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!output) return STATUS_INVALID_PARAMETER; + + return hash_finish( hash, output, size ); +}

1 0

Julian Rüger : German translation for release 1.8
by Jeremy Newman Jan. 5, 2016

Jan. 5, 2016

Module: website Branch: master Commit: 42682eb003c928ee6c12242c763ad3eacc246f42 URL: http://source.winehq.org/git/website.git/?a=commit;h=42682eb003c928ee6c1224… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 5 18:47:35 2016 +0100 German translation for release 1.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015121901.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/news/de/2015121901.xml b/news/de/2015121901.xml new file mode 100644 index 0000000..536715a --- /dev/null +++ b/news/de/2015121901.xml @@ -0,0 +1,10 @@ +<news> +<date>19. Dezember 2015</date> +<title>Wine 1.8 freigegeben</title> +<body> + Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 1.8 verfügbar ist. + Dieses Release verkörpert den Entwicklungsaufwand von 17 Monaten und rund 13.000 individuellen Änderungen. Höhepunkte sind die Implementierungen von DirectWrite und Direct2D, sowie der neue Pulseaudio-Treiber. + Ebenso enthalten sind etliche Verbesserungen in allen Bereichen, wie auch die Unterstützung vieler neuer Anwendungen und Spiele. Die <a href="{$root}/announce/1.8">Release notes (en)</a> enthalten eine Zusammenfassung aller größeren Änderungen. +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.0
by Jeremy Newman Jan. 5, 2016

Jan. 5, 2016

Module: website Branch: master Commit: ed5afc8c40ad5fec9c4c1e1ee260e7d53d66fc19 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed5afc8c40ad5fec9c4c1e… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jan 5 18:55:42 2016 +0100 German translation for release 1.9.0 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015122501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015122501.xml b/news/de/2015122501.xml new file mode 100644 index 0000000..3e251b7 --- /dev/null +++ b/news/de/2015122501.xml @@ -0,0 +1,16 @@ +<news> +<date>25. Dezember 2015</date> +<title>Wine 1.9.0 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.0 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.0">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Etliche Korrekturen, die während des Code-freezes aufgeschoben wurden.</li> + <li>WSAPoll-Implementierung.</li> + <li>Korrekturen am Standard-Schriftartendialog.</li> + <li>X11-drag&drop-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.0.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Piotr Caban : msvcp120: Add vtordisp field to classes with virtual base.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: 367b30d8278684aaff373f5666b78264137d7a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=367b30d8278684aaff373f566… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 5 16:28:58 2016 +0100 msvcp120: Add vtordisp field to classes with virtual base. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 223 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 187 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=367b30d8278684aaff373…

1 0

Nikolay Sivov : ole2disp: Implement VariantInit().
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: de60ddb8132b421abe2abbe81ed449a3d1a5f63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de60ddb8132b421abe2abbe81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 5 18:46:34 2016 +0300 ole2disp: Implement VariantInit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 ++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- dlls/ole2disp.dll16/ole2disp.h | 39 +++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 1850346..43336c4 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -276,3 +276,12 @@ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); return E_INVALIDARG; } + +/****************************************************************************** + * VariantInit [OLE2DISP.8] + */ +void WINAPI VariantInit16(VARIANTARG16 *v) +{ + TRACE("(%p)\n", v); + v->vt = VT_EMPTY; +} diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 2cf6784..e4655f0 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -5,7 +5,7 @@ 5 pascal SysReAllocStringLen(ptr str word) SysReAllocStringLen16 6 pascal SysFreeString(segstr) SysFreeString16 7 pascal SysStringLen(segstr) SysStringLen16 -8 stub VARIANTINIT +8 pascal VariantInit(ptr) VariantInit16 9 stub VARIANTCLEAR 10 stub VARIANTCOPY 11 stub VARIANTCOPYIND diff --git a/dlls/ole2disp.dll16/ole2disp.h b/dlls/ole2disp.dll16/ole2disp.h index 7804c82..d8ad6d1 100644 --- a/dlls/ole2disp.dll16/ole2disp.h +++ b/dlls/ole2disp.dll16/ole2disp.h @@ -39,4 +39,43 @@ INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16); int WINAPI SysReAllocStringLen16(BSTR16*, const char*, int); int WINAPI SysStringLen16(BSTR16); +typedef struct tagVARIANT16 { + VARTYPE vt; + WORD wReserved1; + WORD wReserved2; + WORD wReserved3; + union { + BYTE bVal; + SHORT iVal; + LONG lVal; + FLOAT fltVal; + DOUBLE dblVal; + VARIANT_BOOL boolVal; + SCODE scode; + DATE date; +/* BSTR16 */ SEGPTR bstrVal; + CY cyVal; +/* IUnknown* */ SEGPTR punkVal; +/* IDispatch* */ SEGPTR pdispVal; +/* SAFEARRAY* */ SEGPTR parray; +/* BYTE* */ SEGPTR pbVal; +/* SHORT* */ SEGPTR piVal; +/* LONG* */ SEGPTR plVal; +/* FLOAT* */ SEGPTR pfltVal; +/* DOUBLE* */ SEGPTR pdblVal; +/* VARIANT_BOOL* */ SEGPTR pboolVal; +/* SCODE* */ SEGPTR pscode; +/* DATE* */ SEGPTR pdate; +/* BSTR16* */ SEGPTR pbstrVal; +/* VARIANT16* */ SEGPTR pvarVal; +/* void* */ SEGPTR byref; +/* CY* */ SEGPTR pcyVal; +/* IUnknown** */ SEGPTR ppunkVal; +/* IDispatch** */ SEGPTR ppdispVal; +/* SAFEARRAY** */ SEGPTR pparray; + } u; +} VARIANT16; + +typedef VARIANT16 VARIANTARG16; + #endif /* !defined(__WINE_OLEAUT32_OLE2DISP_H) */

1 0

Hugh McMaster : kernel32/tests: Add tests for GetLargestConsoleWindowSize.
by Alexandre Julliard Jan. 5, 2016

Jan. 5, 2016

Module: wine Branch: master Commit: c3ea629f3c3c6a3970af3a8675cf05c2f4cdf5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ea629f3c3c6a3970af3a867… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:35 2016 +1100 kernel32/tests: Add tests for GetLargestConsoleWindowSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 3ba1da5..f362415 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2681,6 +2681,69 @@ static void test_GetConsoleFontSize(HANDLE std_output) ok(!c.Y, "got %d, expected 0\n", c.Y); } +static void test_GetLargestConsoleWindowSize(HANDLE std_output) +{ + COORD c, font; + RECT r; + LONG workarea_w, workarea_h, maxcon_w, maxcon_h; + CONSOLE_FONT_INFO cfi; + DWORD index, i; + HMODULE hmod; + DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + BOOL (WINAPI *pSetConsoleFont)(HANDLE, DWORD); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(NULL); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(GetStdHandle(STD_INPUT_HANDLE)); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); + workarea_w = r.right - r.left; + workarea_h = r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION); + + GetCurrentConsoleFont(std_output, FALSE, &cfi); + index = cfi.nFont; /* save current font index */ + + hmod = GetModuleHandleA("kernel32.dll"); + pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); + if (!pGetNumberOfConsoleFonts) + { + win_skip("GetNumberOfConsoleFonts is not available\n"); + return; + } + pSetConsoleFont = (void *)GetProcAddress(hmod, "SetConsoleFont"); + if (!pSetConsoleFont) + { + win_skip("SetConsoleFont is not available\n"); + return; + } + + for (i = 0; i < pGetNumberOfConsoleFonts(); i++) + { + pSetConsoleFont(std_output, i); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetLargestConsoleWindowSize(std_output); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + GetCurrentConsoleFont(std_output, FALSE, &cfi); + font = GetConsoleFontSize(std_output, cfi.nFont); + maxcon_w = workarea_w / font.X; + maxcon_h = workarea_h / font.Y; + ok(c.X == maxcon_w || c.X == maxcon_w - 1 /* Win10 */, "got %d, expected %d\n", c.X, maxcon_w); + ok(c.Y == maxcon_h || c.Y == maxcon_h - 1 /* Win10 */, "got %d, expected %d\n", c.Y, maxcon_h); + } + pSetConsoleFont(std_output, index); /* restore original font size */ +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2826,4 +2889,5 @@ START_TEST(console) test_ReadConsoleOutputAttribute(hConOut); test_GetCurrentConsoleFont(hConOut); test_GetConsoleFontSize(hConOut); + test_GetLargestConsoleWindowSize(hConOut); }

1 0