wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Piotr Caban : ucrtbase: Added stub for _get_FMA3_enable.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 87f42c3ae778029067add5c27629704d65bb6f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f42c3ae778029067add5c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 11 13:06:21 2020 +0100 ucrtbase: Added stub for _get_FMA3_enable. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 15 ++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index cb8fdc9227..579b97fee3 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -81,7 +81,7 @@ @ cdecl _fpclass(double) ucrtbase._fpclass @ stub _fpclassf @ cdecl -arch=i386 -ret64 _ftol() ucrtbase._ftol -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() ucrtbase._get_FMA3_enable @ cdecl _hypot(double double) ucrtbase._hypot @ cdecl _hypotf(float float) ucrtbase._hypotf @ cdecl _isnan(double) ucrtbase._isnan diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f6824128cd..19a4da222b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -117,7 +117,19 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#if defined(_WIN64) && _MSVCR_VER>=120 +#if defined(_WIN64) +# if _MSVCR_VER>=140 +/********************************************************************* + * _get_FMA3_enable (UCRTBASE.@) + */ +int CDECL MSVCRT__get_FMA3_enable(void) +{ + FIXME("() stub\n"); + return 0; +} +# endif + +# if _MSVCR_VER>=120 /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ @@ -126,6 +138,7 @@ int CDECL MSVCRT__set_FMA3_enable(int flag) FIXME("(%x) stub\n", flag); return 0; } +# endif #endif #if !defined(__i386__) || _MSVCR_VER>=120 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 568019da51..6cac7a5ef5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -357,7 +357,7 @@ @ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ cdecl _gcvt(double long str) MSVCRT__gcvt @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s -@ stub _get_FMA3_enable +@ cdecl -arch=win64 _get_FMA3_enable() MSVCRT__get_FMA3_enable @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_daylight(ptr) @ cdecl _get_doserrno(ptr)

1 0

Jacek Caban : makedep: Use -mno-cygwin for linking modules with no sources.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: a592c1ed08f7c8211cd58e0c0a0d4865ed5af256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a592c1ed08f7c8211cd58e0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 12:46:46 2020 +0100 makedep: Use -mno-cygwin for linking modules with no sources. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index a819cffca9..1d9a1b5a59 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4253,10 +4253,16 @@ static void load_sources( struct makefile *make ) add_generated_sources( make ); + if (!make->use_msvcrt && !has_object_file( make )) + { + strarray_add( &make->extradllflags, "-mno-cygwin" ); + make->use_msvcrt = 1; + } + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - if (crosstarget) make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); + make->is_cross = crosstarget && make->use_msvcrt; if (make->is_cross) {

1 0

Hans Leidekker : bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 215c1718914a3fb32332efb4e69ae98f3d6ce695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=215c1718914a3fb32332efb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 11 10:47:34 2020 +0100 bcrypt: Support BCRYPT_HASH_REUSABLE_FLAG in BCryptOpenAlgorithmProvider. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 +- dlls/bcrypt/bcrypt_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index d026dab729..5cc2c249da 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -154,7 +154,7 @@ struct algorithm struct object hdr; enum alg_id id; enum mode_id mode; - BOOL hmac; + ULONG flags; }; #if defined(HAVE_GNUTLS_CIPHER_INIT) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2ac36d3db0..298bfb4007 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -216,7 +216,7 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags ) { - const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG; + const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG | BCRYPT_HASH_REUSABLE_FLAG; struct algorithm *alg; enum alg_id alg_id; ULONG i; @@ -254,7 +254,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; alg->mode = MODE_ID_CBC; - alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; + alg->flags = flags; *handle = alg; return STATUS_SUCCESS; @@ -692,8 +692,9 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL if (!(hash = heap_alloc_zero( sizeof(*hash) ))) return STATUS_NO_MEMORY; hash->hdr.magic = MAGIC_HASH; hash->alg_id = alg->id; - if (alg->hmac) hash->flags = HASH_FLAG_HMAC; - if (flags & BCRYPT_HASH_REUSABLE_FLAG) hash->flags |= HASH_FLAG_REUSABLE; + if (alg->flags & BCRYPT_ALG_HANDLE_HMAC_FLAG) hash->flags = HASH_FLAG_HMAC; + if ((alg->flags & BCRYPT_HASH_REUSABLE_FLAG) || (flags & BCRYPT_HASH_REUSABLE_FLAG)) + hash->flags |= HASH_FLAG_REUSABLE; if (secretlen && !(hash->secret = heap_alloc( secretlen ))) {

1 0

Nikolay Sivov : crypt32: Fix CryptBinaryToStringW() to return required length properly.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 3d69d71e9e7d1cebf285b581674999768284e780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d69d71e9e7d1cebf285b581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:25:40 2020 +0300 crypt32: Fix CryptBinaryToStringW() to return required length properly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 11 +++++++---- dlls/crypt32/tests/base64.c | 5 +---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 221b452d7e..73619421ab 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -490,16 +490,19 @@ static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, D needed = 2; needed += nbin * 2 + 1; + + if (!str) + { + *nstr = needed; + return TRUE; + } + if (needed > *nstr) { SetLastError(ERROR_MORE_DATA); return FALSE; } - *nstr = needed; - if (!str) - return TRUE; - while (nbin--) { *str++ = hex[(*bin >> 4) & 0xf]; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 874f8e432d..7b9f4c1077 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -366,10 +366,8 @@ static void test_CryptBinaryToString(void) /* Systems that don't support HEXRAW format convert to BASE64 instead - 3 bytes in -> 4 chars + crlf + 1 null out. */ strLen = 0; ret = CryptBinaryToStringW(input, 3, CRYPT_STRING_HEXRAW, NULL, &strLen); -todo_wine { ok(ret, "Failed to get string length.\n"); ok(strLen == 9 || broken(strLen == 7), "Unexpected string length %d.\n", strLen); -} if (strLen == 7) { win_skip("CryptBinaryToString(HEXRAW) not supported\n"); @@ -383,10 +381,9 @@ todo_wine { { strLen = 0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); -todo_wine { ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen > 0, "Unexpected string length.\n"); -} + strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen);

1 0

Nikolay Sivov : crypt32/tests: Detect missing HEXRAW support by output.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: eb00dbd9134783242d0e3c21be8f5fafd4519d70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb00dbd9134783242d0e3c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:25:39 2020 +0300 crypt32/tests: Detect missing HEXRAW support by output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/base64.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index ac41d5c86d..874f8e432d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -363,11 +363,16 @@ static void test_CryptBinaryToString(void) heap_free(encodedW); } - /* winxp and win2k3 are documented as not handling HEXRAW but do not return failure */ - GetVersionExA(&ver); - if (ver.dwMajorVersion <= 5) + /* Systems that don't support HEXRAW format convert to BASE64 instead - 3 bytes in -> 4 chars + crlf + 1 null out. */ + strLen = 0; + ret = CryptBinaryToStringW(input, 3, CRYPT_STRING_HEXRAW, NULL, &strLen); +todo_wine { + ok(ret, "Failed to get string length.\n"); + ok(strLen == 9 || broken(strLen == 7), "Unexpected string length %d.\n", strLen); +} + if (strLen == 7) { - win_skip("CryptBinaryToString(HEX) not supported\n"); + win_skip("CryptBinaryToString(HEXRAW) not supported\n"); return; } @@ -376,6 +381,12 @@ static void test_CryptBinaryToString(void) for (i = 0; i < ARRAY_SIZE(flags); i++) { + strLen = 0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); +todo_wine { + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen > 0, "Unexpected string length.\n"); +} strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen);

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 6ee109c5aab14ef7382b69a92862cd740ffd0ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ee109c5aab14ef7382b69a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:24:59 2020 +0300 dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 16 ++++++++++++++-- dlls/dwrite/tests/font.c | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 353282bbd4..bd969a8fa6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -6493,9 +6493,21 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) { - FIXME("%p, %p.\n", iface, fontface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + IDWriteFontFace3 *fontface3; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontface); + + /* FIXME: created instance should likely respect given axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, + &fontface3))) + { + hr = IDWriteFontFace3_QueryInterface(fontface3, &IID_IDWriteFontFace5, (void **)fontface); + IDWriteFontFace3_Release(fontface3); + } + + return hr; } static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d21326f7c9..38a7b4f3f8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9633,6 +9633,10 @@ static void test_font_resource(void) ok(hr == S_OK, "Failed to get axis values, hr %#x.\n", hr); ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected axis tag.\n"); + hr = IDWriteFontFaceReference1_CreateFontFace(reference, &fontface5); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + IDWriteFontFace5_Release(fontface5); + IDWriteFontFaceReference1_Release(reference); IDWriteFontFile_Release(fontfile);

1 0

Derek Lesho : mfplat: Implement IMFByteStream::GetLength() for file streams.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e756c28b0b47323e1ad131504452eefdd30a4203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e756c28b0b47323e1ad13150… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 11 12:19:10 2020 +0300 mfplat: Implement IMFByteStream::GetLength() for file streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 27 +++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e96a972909..1ebd443131 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3278,13 +3278,6 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - FIXME("%p, %p.\n", iface, length); - - return E_NOTIMPL; -} - static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); @@ -3312,6 +3305,24 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } +static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER li; + + TRACE("%p, %p.\n", iface, length); + + if (!length) + return E_INVALIDARG; + + if (GetFileSizeEx(stream->hfile, &li)) + *length = li.QuadPart; + else + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3440,7 +3451,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_AddRef, bytestream_Release, bytestream_GetCapabilities, - mfbytestream_GetLength, + bytestream_file_GetLength, mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 56aa23c68c..7ec0b01982 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1342,6 +1342,7 @@ static void test_file_stream(void) IMFByteStream *bytestream, *bytestream2; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; + QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; @@ -1405,6 +1406,15 @@ static void test_file_stream(void) IMFAttributes_Release(attributes); + /* Length. */ + hr = IMFByteStream_GetLength(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + bytestream_length = 0; + hr = IMFByteStream_GetLength(bytestream, &bytestream_length); + ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); + ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : mfplat: Add MFAllocateSerialWorkQueue() export.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 19519f025e1e0a8fd14d8c18202e90759420bf5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19519f025e1e0a8fd14d8c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:09 2020 +0300 mfplat: Add MFAllocateSerialWorkQueue() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 2 +- include/mfapi.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index ba835b694a..85e28792c6 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -16,6 +16,7 @@ @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool @ stdcall MFAddPeriodicCallback(ptr ptr ptr) rtworkq.RtwqAddPeriodicCallback +@ stdcall MFAllocateSerialWorkQueue(long ptr) rtworkq.RtwqAllocateSerialWorkQueue @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) rtworkq.RtwqAllocateWorkQueue @ stub MFAppendCollection diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d0e05650c2..56aa23c68c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2251,7 +2251,7 @@ static void test_serial_queue(void) if (!pMFAllocateSerialWorkQueue) { - skip("Serial queues are not supported.\n"); + win_skip("Serial queues are not supported.\n"); return; } diff --git a/include/mfapi.h b/include/mfapi.h index 7c9e713ac2..910b45e68f 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -389,6 +389,7 @@ typedef enum #define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); +HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags,

1 0

Nikolay Sivov : rtworkq: Add support for serial work queues.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 5737cdc97d13e2a16e33fc283728d7b07db38cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5737cdc97d13e2a16e33fc28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:08 2020 +0300 rtworkq: Add support for serial work queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 327 +++++++++++++++++++++++++++++++++++++++------- dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 280 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5737cdc97d13e2a16e33…

1 0

Nikolay Sivov : rtworkq: Initialize queue with specific set of functionality.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 9b1fac2dfd3fd9d5cfc339beed943d23c60b228d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1fac2dfd3fd9d5cfc339be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:07 2020 +0300 rtworkq: Initialize queue with specific set of functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 162 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 108 insertions(+), 54 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 38d376342d..e5026b6298 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #define COBJMACROS #define NONAMELESSUNION @@ -136,13 +138,25 @@ static const TP_CALLBACK_PRIORITY priorities[] = TP_CALLBACK_PRIORITY_LOW, }; +struct queue; +struct queue_desc; + +struct queue_ops +{ + HRESULT (*init)(const struct queue_desc *desc, struct queue *queue); + BOOL (*shutdown)(struct queue *queue); + void (*submit)(struct queue *queue, struct work_item *item); +}; + struct queue_desc { RTWQ_WORKQUEUE_TYPE queue_type; + const struct queue_ops *ops; }; struct queue { + const struct queue_ops *ops; TP_POOL *pool; TP_CALLBACK_ENVIRON_V3 envs[ARRAY_SIZE(priorities)]; CRITICAL_SECTION cs; @@ -171,6 +185,88 @@ static void CALLBACK standard_queue_cleanup_callback(void *object_data, void *gr { } +static HRESULT pool_queue_init(const struct queue_desc *desc, struct queue *queue) +{ + TP_CALLBACK_ENVIRON_V3 env; + unsigned int max_thread, i; + + queue->pool = CreateThreadpool(NULL); + + memset(&env, 0, sizeof(env)); + env.Version = 3; + env.Size = sizeof(env); + env.Pool = queue->pool; + env.CleanupGroup = CreateThreadpoolCleanupGroup(); + env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + { + queue->envs[i] = env; + queue->envs[i].CallbackPriority = priorities[i]; + } + list_init(&queue->pending_items); + InitializeCriticalSection(&queue->cs); + + max_thread = (desc->queue_type == RTWQ_STANDARD_WORKQUEUE || desc->queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; + + SetThreadpoolThreadMinimum(queue->pool, 1); + SetThreadpoolThreadMaximum(queue->pool, max_thread); + + if (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) + FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); + + return S_OK; +} + +static BOOL pool_queue_shutdown(struct queue *queue) +{ + if (!queue->pool) + return FALSE; + + CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); + CloseThreadpool(queue->pool); + queue->pool = NULL; + + return TRUE; +} + +static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) +{ + struct work_item *item = context; + RTWQASYNCRESULT *result = (RTWQASYNCRESULT *)item->result; + + TRACE("result object %p.\n", result); + + IRtwqAsyncCallback_Invoke(result->pCallback, item->result); + + IUnknown_Release(&item->IUnknown_iface); +} + +static void pool_queue_submit(struct queue *queue, struct work_item *item) +{ + TP_CALLBACK_PRIORITY callback_priority; + TP_WORK *work_object; + + if (item->priority == 0) + callback_priority = TP_CALLBACK_PRIORITY_NORMAL; + else if (item->priority < 0) + callback_priority = TP_CALLBACK_PRIORITY_LOW; + else + callback_priority = TP_CALLBACK_PRIORITY_HIGH; + work_object = CreateThreadpoolWork(standard_queue_worker, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); + SubmitThreadpoolWork(work_object); + + TRACE("dispatched %p.\n", item->result); +} + +static const struct queue_ops pool_queue_ops = +{ + pool_queue_init, + pool_queue_shutdown, + pool_queue_submit, +}; + static HRESULT WINAPI work_item_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -235,33 +331,14 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR static void init_work_queue(const struct queue_desc *desc, struct queue *queue) { - TP_CALLBACK_ENVIRON_V3 env; - unsigned int max_thread, i; - - queue->pool = CreateThreadpool(NULL); + assert(desc->ops != NULL); - memset(&env, 0, sizeof(env)); - env.Version = 3; - env.Size = sizeof(env); - env.Pool = queue->pool; - env.CleanupGroup = CreateThreadpoolCleanupGroup(); - env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; - env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; - for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + queue->ops = desc->ops; + if (SUCCEEDED(queue->ops->init(desc, queue))) { - queue->envs[i] = env; - queue->envs[i].CallbackPriority = priorities[i]; + list_init(&queue->pending_items); + InitializeCriticalSection(&queue->cs); } - list_init(&queue->pending_items); - InitializeCriticalSection(&queue->cs); - - max_thread = (desc->queue_type == RTWQ_STANDARD_WORKQUEUE || desc->queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; - - SetThreadpoolThreadMinimum(queue->pool, 1); - SetThreadpoolThreadMaximum(queue->pool, max_thread); - - if (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) - FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); } static HRESULT grab_queue(DWORD queue_id, struct queue **ret) @@ -297,6 +374,7 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) } desc.queue_type = queue_type; + desc.ops = &pool_queue_ops; init_work_queue(&desc, queue); LeaveCriticalSection(&queues_section); *ret = queue; @@ -333,13 +411,9 @@ static void shutdown_queue(struct queue *queue) { struct work_item *item, *item2; - if (!queue->pool) + if (!queue->ops || !queue->ops->shutdown(queue)) return; - CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); - CloseThreadpool(queue->pool); - queue->pool = NULL; - EnterCriticalSection(&queue->cs); LIST_FOR_EACH_ENTRY_SAFE(item, item2, &queue->pending_items, struct work_item, entry) { @@ -349,6 +423,8 @@ static void shutdown_queue(struct queue *queue) LeaveCriticalSection(&queue->cs); DeleteCriticalSection(&queue->cs); + + memset(queue, 0, sizeof(*queue)); } static HRESULT unlock_user_queue(DWORD queue) @@ -376,38 +452,14 @@ static HRESULT unlock_user_queue(DWORD queue) return hr; } -static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) -{ - struct work_item *item = context; - RTWQASYNCRESULT *result = (RTWQASYNCRESULT *)item->result; - - TRACE("result object %p.\n", result); - - IRtwqAsyncCallback_Invoke(result->pCallback, item->result); - - IUnknown_Release(&item->IUnknown_iface); -} - static HRESULT queue_submit_item(struct queue *queue, LONG priority, IRtwqAsyncResult *result) { - TP_CALLBACK_PRIORITY callback_priority; struct work_item *item; - TP_WORK *work_object; if (!(item = alloc_work_item(queue, priority, result))) return E_OUTOFMEMORY; - if (priority == 0) - callback_priority = TP_CALLBACK_PRIORITY_NORMAL; - else if (priority < 0) - callback_priority = TP_CALLBACK_PRIORITY_LOW; - else - callback_priority = TP_CALLBACK_PRIORITY_HIGH; - work_object = CreateThreadpoolWork(standard_queue_worker, item, - (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); - SubmitThreadpoolWork(work_object); - - TRACE("dispatched %p.\n", result); + queue->ops->submit(queue, item); return S_OK; } @@ -862,6 +914,7 @@ static void init_system_queues(void) } desc.queue_type = RTWQ_STANDARD_WORKQUEUE; + desc.ops = &pool_queue_ops; init_work_queue(&desc, &system_queues[SYS_QUEUE_STANDARD]); LeaveCriticalSection(&queues_section); @@ -1114,6 +1167,7 @@ HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queu TRACE("%d, %p.\n", queue_type, queue); desc.queue_type = queue_type; + desc.ops = &pool_queue_ops; return alloc_user_queue(&desc, queue); }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020