December 2020 - Wine-Commits

Henri Verbeet : wined3d: Allocate a new bo for busy DISCARD maps.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 8b3cc57df0b791ca6c33f383f9358e1613206b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3cc57df0b791ca6c33f383… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 18:33:33 2020 +0330 wined3d: Allocate a new bo for busy DISCARD maps. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/buffer.c | 26 --------------- dlls/wined3d/context_gl.c | 72 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/resource.c | 5 +-- dlls/wined3d/view.c | 25 ++++++++++++++- dlls/wined3d/wined3d_private.h | 9 ++++++ 6 files changed, 95 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b3cc57df0b791ca6c33…

1 0

Nikolay Sivov : bcrypt: Add initial support for asymmetric keys in BCryptDecrypt().
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 38d9020f29dad8d6d76916826da7a59ac308d92e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d9020f29dad8d6d7691682… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 4 16:40:06 2020 +0300 bcrypt: Add initial support for asymmetric keys in BCryptDecrypt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 22 ++++++++++++++++++++-- dlls/bcrypt/gnutls.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/macos.c | 8 ++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index e1777ed130b..eb136111509 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -206,6 +206,7 @@ struct key_funcs void (CDECL *key_symmetric_destroy)( struct key * ); NTSTATUS (CDECL *key_asymmetric_init)( struct key * ); NTSTATUS (CDECL *key_asymmetric_generate)( struct key * ); + NTSTATUS (CDECL *key_asymmetric_decrypt)( struct key *, UCHAR *, ULONG, UCHAR *, ULONG * ); NTSTATUS (CDECL *key_asymmetric_duplicate)( struct key *, struct key * ); NTSTATUS (CDECL *key_asymmetric_sign)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ); NTSTATUS (CDECL *key_asymmetric_verify)( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ); diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 591c01c710c..a1423dcd836 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1160,8 +1160,8 @@ static NTSTATUS key_encrypt( struct key *key, UCHAR *input, ULONG input_len, vo return status; } -static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, - ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +static NTSTATUS key_symmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { ULONG bytes_left = input_len; UCHAR *buf, *src, *dst; @@ -1240,6 +1240,24 @@ static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, voi return status; } +static NTSTATUS key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + NTSTATUS status; + + if (!(status = key_funcs->key_asymmetric_decrypt( key, input, input_len, output, &output_len ))) + *ret_len = output_len; + + return status; +} + +static NTSTATUS key_decrypt( struct key *key, UCHAR *input, ULONG input_len, void *padding, UCHAR *iv, + ULONG iv_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + return key_is_symmetric( key ) ? key_symmetric_decrypt( key, input, input_len, padding, iv, iv_len, + output, output_len, ret_len, flags ) : key_asymmetric_decrypt( key, input, input_len, output, output_len, ret_len ); +} + static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYPT_KEY_HANDLE *ret_key, UCHAR *input, ULONG input_len ) { diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 162ac9ea732..c065ac31fba 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -109,6 +109,7 @@ static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_privkey_decrypt_data)(gnutls_privkey_t, unsigned int flags, const gnutls_datum_t *, gnutls_datum_t *); /* Not present in gnutls version < 3.6.0 */ static int (*pgnutls_decode_rs_value)(const gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); @@ -124,6 +125,7 @@ MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); +MAKE_FUNCPTR(gnutls_privkey_decrypt_data); MAKE_FUNCPTR(gnutls_privkey_deinit); MAKE_FUNCPTR(gnutls_privkey_import_dsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); @@ -215,6 +217,12 @@ static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnut return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_decrypt_data(gnutls_privkey_t key, unsigned int flags, const gnutls_datum_t *cipher_text, + gnutls_datum_t *plain_text) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -341,6 +349,11 @@ static BOOL gnutls_initialize(void) WARN("gnutls_privkey_import_rsa_raw not found\n"); pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; } + if (!(pgnutls_privkey_decrypt_data = dlsym( libgnutls_handle, "gnutls_privkey_decrypt_data" ))) + { + WARN("gnutls_privkey_decrypt_data not found\n"); + pgnutls_privkey_decrypt_data = compat_gnutls_privkey_decrypt_data; + } if (TRACE_ON( bcrypt )) { @@ -1883,6 +1896,35 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key return STATUS_SUCCESS; } +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, + UCHAR *output, ULONG *output_len ) +{ + gnutls_datum_t e, d = { 0 }; + NTSTATUS status = STATUS_SUCCESS; + int ret; + + e.data = (unsigned char *)input; + e.size = input_len; + + if ((ret = pgnutls_privkey_decrypt_data( key_data(key)->privkey, 0, &e, &d ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (*output_len >= d.size) + { + *output_len = d.size; + memcpy( output, d.data, *output_len ); + } + else + status = STATUS_BUFFER_TOO_SMALL; + + free( d.data ); + + return status; +} + static const struct key_funcs key_funcs = { key_set_property, @@ -1895,6 +1937,7 @@ static const struct key_funcs key_funcs = key_symmetric_destroy, key_asymmetric_init, key_asymmetric_generate, + key_asymmetric_decrypt, key_asymmetric_duplicate, key_asymmetric_sign, key_asymmetric_verify, diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 57edc3e262b..44906519cef 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -271,6 +271,13 @@ static NTSTATUS CDECL key_asymmetric_duplicate( struct key *key_orig, struct key return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len, + UCHAR *output, ULONG *output_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static const struct key_funcs key_funcs = { key_set_property, @@ -283,6 +290,7 @@ static const struct key_funcs key_funcs = key_symmetric_destroy, key_asymmetric_init, key_asymmetric_generate, + key_asymmetric_decrypt, key_asymmetric_duplicate, key_asymmetric_sign, key_asymmetric_verify,

1 0

Derek Lesho : winegstreamer: Implement ::SetInputType for audio conversion transform.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: c880e5b1a01600ce7fa4246f3320a9f72ef732b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c880e5b1a01600ce7fa4246f… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Dec 3 16:55:49 2020 -0500 winegstreamer: Implement ::SetInputType for audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 77 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 9499920347f..8bfd28b1ef2 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include <gst/gst.h> #include "gst_private.h" @@ -36,6 +37,8 @@ struct audio_converter { IMFTransform IMFTransform_iface; LONG refcount; + IMFMediaType *input_type; + CRITICAL_SECTION cs; }; static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) @@ -79,6 +82,8 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) if (!refcount) { + transform->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&transform->cs); heap_free(transform); } @@ -270,9 +275,74 @@ fail: static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + GstCaps *input_caps; + HRESULT hr; - return E_NOTIMPL; + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (type) + { + GUID major_type, subtype; + DWORD unused; + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(input_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(input_caps); + } + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + hr = S_OK; + + if (type) + { + if (!converter->input_type) + hr = MFCreateMediaType(&converter->input_type); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type); + + if (FAILED(hr)) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + } + else if (converter->input_type) + { + IMFMediaType_Release(converter->input_type); + converter->input_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return hr; } static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -395,6 +465,9 @@ HRESULT audio_converter_create(REFIID riid, void **ret) object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; object->refcount = 1; + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_converter_lock"); + *ret = &object->IMFTransform_iface; return S_OK; }

1 0

Piotr Caban : msvcrt: Remove non-needed defines from msvcrt.h.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: f67f1ce79ee98f88aedde3a915bb6d85b9a934ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67f1ce79ee98f88aedde3a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:17 2020 +0100 msvcrt: Remove non-needed defines from msvcrt.h. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 5 +- dlls/msvcrt/exit.c | 22 +++--- dlls/msvcrt/file.c | 212 +++++++++++++++++++++++++------------------------- dlls/msvcrt/heap.c | 4 +- dlls/msvcrt/mbcs.c | 4 +- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 72 ----------------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/process.c | 57 +++++++------- dlls/msvcrt/string.c | 6 +- dlls/msvcrt/time.c | 4 +- dlls/msvcrt/wcs.c | 18 ++--- 12 files changed, 169 insertions(+), 241 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f67f1ce79ee98f88aedd…

1 0

Piotr Caban : msvcrt: Use _stat64 definition from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 951968c88a2a705ebe7bbb1ac02cd64f8f899f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=951968c88a2a705ebe7bbb1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:15 2020 +0100 msvcrt: Use _stat64 definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 56 ---------------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1ef72c31057..21ef0e82408 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3003,7 +3003,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs say-what is it? Bon 011120: This FIXME seems incorrect @@ -3159,7 +3159,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (iswalpha(*path) && path[1] == ':') diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 48b2ddfce72..5416dd9966e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,62 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -struct MSVCRT__stat32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat32i64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat64i32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - -struct MSVCRT__stat64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_NO_CONSOLE_FD (-2)

1 0

Piotr Caban : msvcrt: Use _Dcomplex definition from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 494a78940735ab31bef9a8ae1d5e58175667df37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=494a78940735ab31bef9a8ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:01 2020 +0100 msvcrt: Use _Dcomplex definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 ++++--- dlls/msvcrt/msvcrt.h | 2 -- include/Makefile.in | 1 + include/msvcrt/complex.h | 27 +++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 84f08544092..f9327659f98 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -35,6 +35,7 @@ * ==================================================== */ +#include <complex.h> #include <stdio.h> #include <fenv.h> #include <fpieee.h> @@ -4177,14 +4178,14 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, _Dcomplex* CDECL _Cbuild(_Dcomplex *ret, double r, double i) { - ret->x = r; - ret->y = i; + ret->_Val[0] = r; + ret->_Val[1] = i; return ret; } double CDECL MSVCR120_creal(_Dcomplex z) { - return z.x; + return z._Val[0]; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 26cb5fee996..b26d736cb18 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,8 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -typedef struct _complex _Dcomplex; - #ifdef __i386__ struct MSVCRT___JUMP_BUFFER { unsigned long Ebp; diff --git a/include/Makefile.in b/include/Makefile.in index a84e44998cc..9b6858b78f9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -443,6 +443,7 @@ SOURCES = \ mstask.idl \ mstcpip.h \ msvcrt/assert.h \ + msvcrt/complex.h \ msvcrt/conio.h \ msvcrt/corecrt.h \ msvcrt/corecrt_startup.h \ diff --git a/include/msvcrt/complex.h b/include/msvcrt/complex.h new file mode 100644 index 00000000000..2d7009c470c --- /dev/null +++ b/include/msvcrt/complex.h @@ -0,0 +1,27 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _COMPLEX_H_DEFINED +#define _COMPLEX_H_DEFINED + +#include <corecrt.h> + +#ifndef _C_COMPLEX_T +#define _C_COMPLEX_T +typedef struct _C_double_complex +{ + double _Val[2]; +} _C_double_complex; + +typedef struct _C_float_complex +{ + float _Val[2]; +} _C_float_complex; +#endif + +typedef _C_double_complex _Dcomplex; +typedef _C_float_complex _Fcomplex; + +#endif /* _COMPLEX_H_DEFINED */

1 0

Piotr Caban : msvcrt: Use _purecall_handler from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 200fe8ac42ff0800c784ec686ccf494391f6907b URL: https://source.winehq.org/git/wine.git/?a=commit;h=200fe8ac42ff0800c784ec68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:49:58 2020 +0100 msvcrt: Use _purecall_handler from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 1 - include/msvcrt/stdlib.h | 4 ++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index ee6c30356fd..bb977f7c957 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_EXIT _lock(_EXIT_LOCK1) #define UNLOCK_EXIT _unlock(_EXIT_LOCK1) -static MSVCRT_purecall_handler purecall_handler = NULL; +static _purecall_handler purecall_handler = NULL; static _onexit_table_t MSVCRT_atexit_table; @@ -461,9 +461,9 @@ void CDECL _register_thread_local_exe_atexit_callback(_tls_callback_type callbac /********************************************************************* * _set_purecall_handler (MSVCR71.@) */ -MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler function) +_purecall_handler CDECL _set_purecall_handler(_purecall_handler function) { - MSVCRT_purecall_handler ret = purecall_handler; + _purecall_handler ret = purecall_handler; TRACE("(%p)\n", function); purecall_handler = function; @@ -475,7 +475,7 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func /********************************************************************* * _get_purecall_handler (MSVCR80.@) */ -MSVCRT_purecall_handler CDECL _get_purecall_handler(void) +_purecall_handler CDECL _get_purecall_handler(void) { TRACE("\n"); return purecall_handler; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a8bb25132e5..26cb5fee996 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -40,7 +40,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *); typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index cdfe3e4b742..ed6560bc318 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -230,6 +230,10 @@ _ACRTIMP int __cdecl system(const char*); _ACRTIMP void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); _ACRTIMP void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); +typedef void (__cdecl *_purecall_handler)(void); +_ACRTIMP _purecall_handler __cdecl _set_purecall_handler(_purecall_handler); +_ACRTIMP _purecall_handler __cdecl _get_purecall_handler(void); + typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); _ACRTIMP _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); _ACRTIMP _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void);

1 0

Henri Verbeet : wined3d: Use the "bo user" mechanism to invalidate existing bindings in wined3d_buffer_gl_destroy_buffer_object().
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 4c5581c2eb7ed40185807082241662001e317f98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c5581c2eb7ed40185807082… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 18:33:32 2020 +0330 wined3d: Use the "bo user" mechanism to invalidate existing bindings in wined3d_buffer_gl_destroy_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/buffer.c | 47 +++++++++++------------------------------- dlls/wined3d/context_gl.c | 20 +++++++++++++++--- dlls/wined3d/state.c | 36 ++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 8 ++++--- 5 files changed, 62 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c5581c2eb7ed4018580…

1 0

Derek Lesho : winegstreamer: Implement Get(Input/Output)CurrentType functions for audio converter transform.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: f7230992cc2eda2651901843bdaac30d119d078f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7230992cc2eda2651901843… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Dec 3 16:55:54 2020 -0500 winegstreamer: Implement Get(Input/Output)CurrentType functions for audio converter transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 56 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 7fb0dee99f6..c5762bfdc60 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -423,16 +423,64 @@ static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD i static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", converter, id, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + EnterCriticalSection(&converter->cs); + + if (converter->input_type) + hr = IMFMediaType_CopyAllItems(converter->input_type, (IMFAttributes *)ret); + else + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + + LeaveCriticalSection(&converter->cs); + + if (SUCCEEDED(hr)) + *type = ret; + else + IMFMediaType_Release(ret); + + return hr; } static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, id, type); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + IMFMediaType *ret; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", converter, id, type); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(&ret))) + return hr; + + EnterCriticalSection(&converter->cs); + + if (converter->output_type) + hr = IMFMediaType_CopyAllItems(converter->output_type, (IMFAttributes *)ret); + else + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + + LeaveCriticalSection(&converter->cs); + + if (SUCCEEDED(hr)) + *type = ret; + else + IMFMediaType_Release(ret); + + return hr; } static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Derek Lesho : winegstreamer: Implement ::SetOutputType for audio conversion transform.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 8771d06b94ccd92fca84be6e9080d1951d6cef6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8771d06b94ccd92fca84be6e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Dec 3 16:55:50 2020 -0500 winegstreamer: Implement ::SetOutputType for audio conversion transform. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 73 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 8bfd28b1ef2..7fb0dee99f6 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -38,6 +38,7 @@ struct audio_converter IMFTransform IMFTransform_iface; LONG refcount; IMFMediaType *input_type; + IMFMediaType *output_type; CRITICAL_SECTION cs; }; @@ -347,9 +348,77 @@ static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); + GUID major_type, subtype; + GstCaps *output_caps; + DWORD unused; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); + + if (id != 0) + return MF_E_INVALIDSTREAMNUMBER; + + if (!converter->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (type) + { + /* validate the type */ + + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) + return MF_E_INVALIDTYPE; + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) + return MF_E_INVALIDTYPE; + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) + return MF_E_INVALIDTYPE; + + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) + return MF_E_INVALIDTYPE; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM) && !IsEqualGUID(&subtype, &MFAudioFormat_Float)) + return MF_E_INVALIDTYPE; + + if (!(output_caps = caps_from_mf_media_type(type))) + return MF_E_INVALIDTYPE; + + gst_caps_unref(output_caps); + } + + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + EnterCriticalSection(&converter->cs); + + hr = S_OK; + + if (type) + { + if (!converter->output_type) + hr = MFCreateMediaType(&converter->output_type); + + if (SUCCEEDED(hr)) + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type); + + if (FAILED(hr)) + { + IMFMediaType_Release(converter->output_type); + converter->output_type = NULL; + } + } + else if (converter->output_type) + { + IMFMediaType_Release(converter->output_type); + converter->output_type = NULL; + } + + LeaveCriticalSection(&converter->cs); + + return hr; } static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type)

1 0