October 2020 - Wine-commits

Esme Povirk : windowscodecs: Move PNG CopyPixels to unix lib.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 53ce545e69e1cf88bd0949fb8981ff70a2f264b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ce545e69e1cf88bd0949fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:19 2020 -0500 windowscodecs: Move PNG CopyPixels to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 54 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 65 ------------------------------- dlls/windowscodecs/pngformat.c | 3 +- dlls/windowscodecs/unix_iface.c | 8 ++++ dlls/windowscodecs/unix_lib.c | 3 ++ dlls/windowscodecs/wincodecs_common.h | 71 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 6 +++ 7 files changed, 143 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53ce545e69e1cf88bd09…

1 0

Esme Povirk : windowscodecs: Use the unix library to find PNG metadata.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 70ea6485e8b4d46c59e9675807055d1e641f0b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ea6485e8b4d46c59e96758… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:20 2020 -0500 windowscodecs: Use the unix library to find PNG metadata. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 77 ++++++++++++++++++ dlls/windowscodecs/main.c | 1 + dlls/windowscodecs/pngformat.c | 143 +++++---------------------------- dlls/windowscodecs/unix_iface.c | 8 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 51 ++++++++++++ dlls/windowscodecs/wincodecs_private.h | 15 ++++ 7 files changed, 174 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70ea6485e8b4d46c59e9…

1 0

Esme Povirk : windowscodecs: Use unix lib to get PNG color contexts.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 980e6650db59a9afb3c300ff7a8c05e692863330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=980e6650db59a9afb3c300ff… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:21 2020 -0500 windowscodecs: Use unix lib to get PNG color contexts. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 45 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 35 ++++++++++++-------------- dlls/windowscodecs/unix_iface.c | 8 ++++++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 6 +++++ dlls/windowscodecs/wincodecs_private.h | 7 ++++++ 6 files changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 2a4fbca7d61..f7042c86a64 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -54,6 +54,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -105,6 +106,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); @@ -137,6 +139,8 @@ struct png_decoder struct decoder_frame decoder_frame; UINT stride; BYTE *image_bits; + BYTE *color_profile; + DWORD color_profile_len; }; static inline struct png_decoder *impl_from_decoder(struct decoder* iface) @@ -194,6 +198,10 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str int i; UINT image_size; png_bytep *row_pointers=NULL; + png_charp cp_name; + png_bytep cp_profile; + png_uint_32 cp_len; + int cp_compression; png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (!png_ptr) @@ -351,6 +359,22 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str This->decoder_frame.dpix = This->decoder_frame.dpiy = 96.0; } + ret = ppng_get_iCCP(png_ptr, info_ptr, &cp_name, &cp_compression, &cp_profile, &cp_len); + if (ret) + { + This->decoder_frame.num_color_contexts = 1; + This->color_profile_len = cp_len; + This->color_profile = malloc(cp_len); + if (!This->color_profile) + { + hr = E_OUTOFMEMORY; + goto end; + } + memcpy(This->color_profile, cp_profile, cp_len); + } + else + This->decoder_frame.num_color_contexts = 0; + if (color_type == PNG_COLOR_TYPE_PALETTE) { ret = ppng_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); @@ -437,6 +461,8 @@ end: { free(This->image_bits); This->image_bits = NULL; + free(This->color_profile); + This->color_profile = NULL; } return hr; } @@ -531,11 +557,28 @@ end: return hr; } +HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, + BYTE **data, DWORD *datasize) +{ + struct png_decoder *This = impl_from_decoder(iface); + + *data = RtlAllocateHeap(GetProcessHeap(), 0, This->color_profile_len); + *datasize = This->color_profile_len; + + if (!*data) + return E_OUTOFMEMORY; + + memcpy(*data, This->color_profile, This->color_profile_len); + + return S_OK; +} + void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); free(This->image_bits); + free(This->color_profile); RtlFreeHeap(GetProcessHeap(), 0, This); } @@ -544,6 +587,7 @@ static const struct decoder_funcs png_decoder_vtable = { png_decoder_get_frame_info, png_decoder_copy_pixels, png_decoder_get_metadata_blocks, + png_decoder_get_color_context, png_decoder_destroy }; @@ -566,6 +610,7 @@ HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **res This->decoder.vtable = &png_decoder_vtable; This->image_bits = NULL; + This->color_profile = NULL; *result = &This->decoder; info->container_format = GUID_ContainerFormatPng; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1d696a4fe01..efd5f6ab2c1 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -976,37 +976,34 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - png_charp name; + HRESULT hr=S_OK; BYTE *profile; - png_uint_32 len; - int compression_type; - HRESULT hr; + DWORD profile_len; TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); if (!pcActualCount) return E_INVALIDARG; - EnterCriticalSection(&This->lock); + *pcActualCount = This->decoder_frame.num_color_contexts; - if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, (void *)&profile, &len)) + if (This->decoder_frame.num_color_contexts && cCount && ppIColorContexts) { - if (cCount && ppIColorContexts) + EnterCriticalSection(&This->lock); + + hr = decoder_get_color_context(This->png_decoder, 0, 0, + &profile, &profile_len); + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) { - hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, len); - if (FAILED(hr)) - { - LeaveCriticalSection(&This->lock); - return hr; - } + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, profile, profile_len); + + HeapFree(GetProcessHeap(), 0, profile); } - *pcActualCount = 1; } - else - *pcActualCount = 0; - LeaveCriticalSection(&This->lock); - - return S_OK; + return hr; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/unix_iface.c b/dlls/windowscodecs/unix_iface.c index ee2e38c5770..e376ea45841 100644 --- a/dlls/windowscodecs/unix_iface.c +++ b/dlls/windowscodecs/unix_iface.c @@ -92,6 +92,13 @@ HRESULT CDECL decoder_wrapper_get_metadata_blocks(struct decoder* iface, return unix_funcs->decoder_get_metadata_blocks(This->unix_decoder, frame, count, blocks); } +HRESULT CDECL decoder_wrapper_get_color_context(struct decoder* iface, + UINT frame, UINT num, BYTE **data, DWORD *datasize) +{ + struct decoder_wrapper* This = impl_from_decoder(iface); + return unix_funcs->decoder_get_color_context(This->unix_decoder, frame, num, data, datasize); +} + void CDECL decoder_wrapper_destroy(struct decoder* iface) { struct decoder_wrapper* This = impl_from_decoder(iface); @@ -104,6 +111,7 @@ static const struct decoder_funcs decoder_wrapper_vtable = { decoder_wrapper_get_frame_info, decoder_wrapper_copy_pixels, decoder_wrapper_get_metadata_blocks, + decoder_wrapper_get_color_context, decoder_wrapper_destroy }; diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 102cc505ca1..04cbe053a0e 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -71,6 +71,7 @@ static const struct unix_funcs unix_funcs = { decoder_get_frame_info, decoder_copy_pixels, decoder_get_metadata_blocks, + decoder_get_color_context, decoder_destroy }; diff --git a/dlls/windowscodecs/wincodecs_common.h b/dlls/windowscodecs/wincodecs_common.h index f041de7c3f2..07e6dcaf44a 100644 --- a/dlls/windowscodecs/wincodecs_common.h +++ b/dlls/windowscodecs/wincodecs_common.h @@ -37,6 +37,12 @@ HRESULT CDECL decoder_get_metadata_blocks(struct decoder *decoder, UINT frame, U return decoder->vtable->get_metadata_blocks(decoder, frame, count, blocks); } +HRESULT CDECL decoder_get_color_context(struct decoder *decoder, UINT frame, + UINT num, BYTE **data, DWORD *datasize) +{ + return decoder->vtable->get_color_context(decoder, frame, num, data, datasize); +} + void CDECL decoder_destroy(struct decoder *decoder) { decoder->vtable->destroy(decoder); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index c52bead5914..0f6980f6aa6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -275,6 +275,7 @@ struct decoder_frame UINT width, height; UINT bpp; double dpix, dpiy; + DWORD num_color_contexts; DWORD num_colors; WICColor palette[256]; }; @@ -299,6 +300,8 @@ struct decoder_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *destroy)(struct decoder* This); }; @@ -318,6 +321,8 @@ HRESULT CDECL decoder_copy_pixels(struct decoder* This, UINT frame, const WICRec UINT stride, UINT buffersize, BYTE *buffer); HRESULT CDECL decoder_get_metadata_blocks(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); +HRESULT CDECL decoder_get_color_context(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void CDECL decoder_destroy(struct decoder *This); HRESULT CDECL png_decoder_create(struct decoder_info *info, struct decoder **result); @@ -331,6 +336,8 @@ struct unix_funcs UINT stride, UINT buffersize, BYTE *buffer); HRESULT (CDECL *decoder_get_metadata_blocks)(struct decoder* This, UINT frame, UINT *count, struct decoder_block **blocks); + HRESULT (CDECL *decoder_get_color_context)(struct decoder* This, UINT frame, UINT num, + BYTE **data, DWORD *datasize); void (CDECL *decoder_destroy)(struct decoder* This); };

1 0

Esme Povirk : windowscodecs: Do not call png_read_end.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: cd778e0b7f54cbbb9b7faae0dd6d25f826f54d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd778e0b7f54cbbb9b7faae0… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:22 2020 -0500 windowscodecs: Do not call png_read_end. This isn't necessary because we do not use libpng to read metadata or verify checksums. If this happens to be the last thing we do, it will fail the pngformat tests which do not expect us to return with the stream seeked to the end of the file. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index f7042c86a64..201f5c700d3 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -61,7 +61,6 @@ MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); -MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); MAKE_FUNCPTR(png_set_bgr); @@ -111,7 +110,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); - LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); LOAD_FUNCPTR(png_set_bgr); @@ -183,7 +181,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; png_infop info_ptr; - png_infop end_info; jmp_buf jmpbuf; HRESULT hr = E_FAIL; int color_type, bit_depth; @@ -216,13 +213,6 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str return E_FAIL; } - end_info = ppng_create_info_struct(png_ptr); - if (!end_info) - { - ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); - return E_FAIL; - } - /* set up setjmp/longjmp error handling */ if (setjmp(jmpbuf)) { @@ -443,7 +433,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str free(row_pointers); row_pointers = NULL; - ppng_read_end(png_ptr, end_info); + /* png_read_end intentionally not called to not seek to the end of the file */ st->flags = WICBitmapDecoderCapabilityCanDecodeAllImages | WICBitmapDecoderCapabilityCanDecodeSomeImages | @@ -455,7 +445,7 @@ HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, str hr = S_OK; end: - ppng_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + ppng_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(row_pointers); if (FAILED(hr)) {

1 0

Esme Povirk : windowscodecs: Add a general wrapper around the decoder interface.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 1b37ac14a3e4a014c8440e691e9a2bbad9ba6575 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b37ac14a3e4a014c8440e69… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:23 2020 -0500 windowscodecs: Add a general wrapper around the decoder interface. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 745 ++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 809 +-------------------------------- dlls/windowscodecs/wincodecs_private.h | 3 + 4 files changed, 763 insertions(+), 795 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b37ac14a3e4a014c844…

1 0

Hans Leidekker : bcrypt/tests: Fix a key handle leak.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: f1e11804a02a2bf8c490484400e5d9251c18c4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e11804a02a2bf8c4904844… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:10 2020 +0200 bcrypt/tests: Fix a key handle leak. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d499ce65a65..0ae4b5dad53 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2603,6 +2603,9 @@ static void test_DSA(void) ok(!memcmp(dssKey, buf, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); }

1 0

Hans Leidekker : bcrypt: Copy all fields in key_duplicate.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 437d93280926dc85bd9c04f1e634bb56cd755913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=437d93280926dc85bd9c04f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:11 2020 +0200 bcrypt: Copy all fields in key_duplicate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b0ea7fce191..4eb1fc29e94 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1476,8 +1476,11 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) if (!(buffer = heap_alloc( key_orig->u.a.pubkey_len ))) return STATUS_NO_MEMORY; memcpy( buffer, key_orig->u.a.pubkey, key_orig->u.a.pubkey_len ); + key_copy->u.a.bitlen = key_orig->u.a.bitlen; + key_copy->u.a.flags = key_orig->u.a.flags; key_copy->u.a.pubkey = buffer; key_copy->u.a.pubkey_len = key_orig->u.a.pubkey_len; + key_copy->u.a.dss_seed = key_orig->u.a.dss_seed; if ((status = key_funcs->key_asymmetric_duplicate( key_orig, key_copy ))) return status; }

1 0

Hans Leidekker : dssenh: Implement CRYPT_DELETEKEYSET.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 320b9eb47451eb8c167b211282f2ea49fcfbbab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=320b9eb47451eb8c167b2112… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:12 2020 +0200 dssenh: Implement CRYPT_DELETEKEYSET. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 5ad0ef1505d..4867fef2f59 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -247,6 +247,23 @@ static struct container *read_key_container( const char *name, DWORD flags ) return ret; } +static void delete_key_container( const char *name, DWORD flags ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + RegDeleteKeyExA( rootkey, path, 0, 0 ); +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { struct container *ret; @@ -285,6 +302,11 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags ret = create_key_container( "", flags ); break; + case CRYPT_DELETEKEYSET: + delete_key_container( name, flags ); + *ret_prov = 0; + return TRUE; + default: FIXME( "unsupported flags %08x\n", flags ); return FALSE;

1 0

Hans Leidekker : dssenh: Implement CPGetUserKey.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 248d27ea2d47d26f9c328adaa8d94fec026d2476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=248d27ea2d47d26f9c328ada… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 19 11:24:13 2020 +0200 dssenh: Implement CPGetUserKey. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 29 +++++++++++++++++++++++++++++ dlls/dssenh/tests/dssenh.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index eb9ef06337a..473bd08205f 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -13,7 +13,7 @@ @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) -@ stub CPGetUserKey +@ stdcall CPGetUserKey(ptr long ptr) @ stdcall CPHashData(ptr ptr ptr long long) @ stub CPHashSessionKey @ stdcall CPImportKey(ptr ptr long ptr long ptr) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 4867fef2f59..2d9569672a5 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -615,6 +615,35 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGetUserKey( HCRYPTPROV hprov, DWORD keyspec, HCRYPTKEY *ret_key ) +{ + struct container *container = (struct container *)hprov; + BOOL ret = FALSE; + + TRACE( "%p, %08x, %p\n", (void *)hprov, keyspec, ret_key ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + if (!container->exch_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->exch_key ))) ret = TRUE; + break; + + case AT_SIGNATURE: + if (!container->sign_key) SetLastError( NTE_NO_KEY ); + else if ((*ret_key = (HCRYPTKEY)duplicate_key( container->sign_key ))) ret = TRUE; + break; + + default: + SetLastError( NTE_NO_KEY ); + return FALSE; + } + + return ret; +} + BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) { struct container *container = (struct container *)hprov; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4f401254f52..d3f3172230e 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1470,6 +1470,50 @@ static void test_duplicate_hash(void) ok(result, "got %08x\n", GetLastError()); } +static void test_userkey(void) +{ + HCRYPTPROV hprov; + HCRYPTKEY hkey; + BOOL result; + + CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_NEWKEYSET); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptGenKey(hprov, AT_SIGNATURE, 1024 << 16, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + result = CryptGetUserKey(hprov, AT_SIGNATURE, &hkey); + ok(result, "got %08x\n", GetLastError()); + result = CryptDestroyKey(hkey); + ok(result, "got %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + result = CryptGetUserKey(hprov, AT_KEYEXCHANGE, &hkey); + ok(!result, "success\n"); + ok(GetLastError() == NTE_NO_KEY, "got %08x\n", GetLastError()); + + result = CryptReleaseContext(hprov, 0); + ok(result, "got %08x\n", GetLastError()); + + hprov = 0xdeadbeef; + result = CryptAcquireContextA(&hprov, "winetest", MS_ENH_DSS_DH_PROV_A, PROV_DSS_DH, CRYPT_DELETEKEYSET); + ok(result, "got %08x\n", GetLastError()); + ok(!hprov, "got %08x\n", (DWORD)hprov); +} + START_TEST(dssenh) { test_acquire_context(); @@ -1480,4 +1524,5 @@ START_TEST(dssenh) test_verify_signature(); test_key_exchange(); test_duplicate_hash(); + test_userkey(); }

1 0

Michael Stefaniuc : wbemprox: Use 0 terminated WCHAR strings in wql.y.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: a03b796cc24edf7861a4499cd1ba6d53b9d7b8cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03b796cc24edf7861a4499c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:02 2020 +0200 wbemprox: Use 0 terminated WCHAR strings in wql.y. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index f5b249aaba4..95c8d8fe817 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -637,38 +637,25 @@ struct wql_keyword #define MIN_TOKEN_LEN 2 #define MAX_TOKEN_LEN 11 -static const WCHAR andW[] = {'A','N','D'}; -static const WCHAR associatorsW[] = {'A','S','S','O','C','I','A','T','O','R','S'}; -static const WCHAR byW[] = {'B','Y'}; -static const WCHAR falseW[] = {'F','A','L','S','E'}; -static const WCHAR fromW[] = {'F','R','O','M'}; -static const WCHAR isW[] = {'I','S'}; -static const WCHAR likeW[] = {'L','I','K','E'}; -static const WCHAR notW[] = {'N','O','T'}; -static const WCHAR nullW[] = {'N','U','L','L'}; -static const WCHAR ofW[] = {'O','F'}; -static const WCHAR orW[] = {'O','R'}; -static const WCHAR selectW[] = {'S','E','L','E','C','T'}; -static const WCHAR trueW[] = {'T','R','U','E'}; -static const WCHAR whereW[] = {'W','H','E','R','E'}; - +#define X(str) str, ARRAY_SIZE(str) - 1 static const struct wql_keyword keyword_table[] = { - { andW, ARRAY_SIZE(andW), TK_AND }, - { associatorsW, ARRAY_SIZE(associatorsW), TK_ASSOCIATORS }, - { byW, ARRAY_SIZE(byW), TK_BY }, - { falseW, ARRAY_SIZE(falseW), TK_FALSE }, - { fromW, ARRAY_SIZE(fromW), TK_FROM }, - { isW, ARRAY_SIZE(isW), TK_IS }, - { likeW, ARRAY_SIZE(likeW), TK_LIKE }, - { notW, ARRAY_SIZE(notW), TK_NOT }, - { nullW, ARRAY_SIZE(nullW), TK_NULL }, - { ofW, ARRAY_SIZE(ofW), TK_OF }, - { orW, ARRAY_SIZE(orW), TK_OR }, - { selectW, ARRAY_SIZE(selectW), TK_SELECT }, - { trueW, ARRAY_SIZE(trueW), TK_TRUE }, - { whereW, ARRAY_SIZE(whereW), TK_WHERE } + { X(L"AND"), TK_AND }, + { X(L"ASSOCIATORS"), TK_ASSOCIATORS }, + { X(L"BY"), TK_BY }, + { X(L"FALSE"), TK_FALSE }, + { X(L"FROM"), TK_FROM }, + { X(L"IS"), TK_IS }, + { X(L"LIKE"), TK_LIKE }, + { X(L"NOT"), TK_NOT }, + { X(L"NULL"), TK_NULL }, + { X(L"OF"), TK_OF }, + { X(L"OR"), TK_OR }, + { X(L"SELECT"), TK_SELECT }, + { X(L"TRUE"), TK_TRUE }, + { X(L"WHERE"), TK_WHERE } }; +#undef X static int __cdecl cmp_keyword( const void *arg1, const void *arg2 ) {

1 0