- Wine-Commits - list.winehq.org

Zebediah Figura : opengl32: Preserve the remainder of the version string when limiting the version to 4.3.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 06be26daa1cf1d158c165a55a097b385a88a0465 URL: https://gitlab.winehq.org/wine/wine/-/commit/06be26daa1cf1d158c165a55a097b3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Aug 13 17:31:13 2023 -0500 opengl32: Preserve the remainder of the version string when limiting the version to 4.3. --- dlls/opengl32/unix_wgl.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index a03f8337fbf..cf819e96df2 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -71,6 +71,7 @@ struct opengl_context GLubyte *extensions; /* extension string */ GLuint *disabled_exts; /* indices of disabled extensions */ struct wgl_context *drv_ctx; /* driver context */ + GLubyte *version_string; }; struct wgl_handle @@ -412,7 +413,7 @@ static BOOL check_extension_support( TEB *teb, const char *extension, const char return FALSE; } -static void parse_gl_version( const char *gl_version, int *major, int *minor ) +static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) { const char *ptr = gl_version; @@ -425,6 +426,9 @@ static void parse_gl_version( const char *gl_version, int *major, int *minor ) ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); *minor = atoi( ptr ); + + while (isdigit( *ptr )) ++ptr; + return ptr; } static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) @@ -469,13 +473,25 @@ static const GLubyte *wrap_glGetString( TEB *teb, GLenum name ) } else if (name == GL_VERSION && is_win64 && is_wow64()) { + struct wgl_handle *ptr = get_current_context_ptr( teb ); int major, minor; + const char *rest; - parse_gl_version( (const char *)ret, &major, &minor ); + if (ptr->u.context->version_string) + return ptr->u.context->version_string; + + rest = parse_gl_version( (const char *)ret, &major, &minor ); /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */ if (major > 4 || (major == 4 && minor >= 4)) - return (const GLubyte *)"4.3"; + { + char *str = malloc( 3 + strlen( rest ) + 1 ); + + sprintf( str, "4.3%s", rest ); + if (InterlockedCompareExchangePointer( (void **)&ptr->u.context->version_string, str, NULL )) + free( str ); + return ptr->u.context->version_string; + } } } @@ -700,6 +716,7 @@ static BOOL wrap_wglDeleteContext( TEB *teb, HGLRC hglrc ) } if (hglrc == teb->glCurrentRC) wrap_wglMakeCurrent( teb, 0, 0 ); ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); + free( ptr->u.context->version_string ); free( ptr->u.context->disabled_exts ); free( ptr->u.context->extensions ); free( ptr->u.context );

1 0

Rémi Bernon : mfplat: Use MFASYNC_CALLBACK_QUEUE_IO for byte stream async requests.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: efbf28afa57fc7eca354e1184c8c07696a5b4072 URL: https://gitlab.winehq.org/wine/wine/-/commit/efbf28afa57fc7eca354e1184c8c07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 27 17:49:08 2023 +0200 mfplat: Use MFASYNC_CALLBACK_QUEUE_IO for byte stream async requests. --- dlls/mfplat/main.c | 2 +- dlls/mfplat/tests/mfplat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aaf9f93cdc..96ec23fba9b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3811,7 +3811,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn &stream->write_callback, NULL, &request))) goto failed; - RtwqPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, 0, request); + RtwqPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, 0, request); IRtwqAsyncResult_Release(request); failed: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 9c73f71ca7e..f7ae614a109 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2501,8 +2501,8 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &test_callback->IMFAsyncCallback_iface, NULL); ok(hr == S_OK, "got %#lx\n", hr); res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result); - todo_wine ok(res == 0, "got %#lx\n", res); - if (res == 0) IMFAsyncResult_Release(result); + ok(res == 0, "got %#lx\n", res); + IMFAsyncResult_Release(result); test_stream_complete_read(stream); res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result);

1 0

Rémi Bernon : mfplat/tests: Test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 94cd65844640d7c201d6f60c343e3ccf18381b9b URL: https://gitlab.winehq.org/wine/wine/-/commit/94cd65844640d7c201d6f60c343e3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 15:49:16 2023 +0200 mfplat/tests: Test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD. --- dlls/mfplat/tests/mfplat.c | 254 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0f4ae026228..9c73f71ca7e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -488,6 +488,7 @@ struct test_callback HANDLE event; DWORD param; IMFMediaEvent *media_event; + IMFAsyncResult *result; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -535,6 +536,37 @@ static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD return E_NOTIMPL; } +static HRESULT WINAPI test_async_callback_result_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + + callback->result = result; + IMFAsyncResult_AddRef(callback->result); + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_async_callback_result_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_async_callback_result_Invoke, +}; + +static DWORD wait_async_callback_result(IMFAsyncCallback *iface, DWORD timeout, IMFAsyncResult **result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + DWORD res = WaitForSingleObject(callback->event, timeout); + + *result = callback->result; + callback->result = NULL; + + return res; +} + static BOOL check_clsid(CLSID *clsids, UINT32 count) { int i; @@ -2129,15 +2161,191 @@ static void test_attributes(void) IMFAttributes_Release(attributes1); } +struct test_stream +{ + IStream IStream_iface; + LONG refcount; + + HANDLE read_event; + HANDLE done_event; +}; + +static struct test_stream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct test_stream, IStream_iface); +} + +static HRESULT WINAPI test_stream_QueryInterface(IStream *iface, REFIID iid, void **out) +{ + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IStream)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_stream_AddRef(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + return InterlockedIncrement(&stream->refcount); +} + +static ULONG WINAPI test_stream_Release(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&stream->refcount); + + if (!ref) + { + CloseHandle(stream->read_event); + CloseHandle(stream->done_event); + free(stream); + } + + return ref; +} + +static HRESULT WINAPI test_stream_Read(IStream *iface, void *data, ULONG size, ULONG *ret_size) +{ + struct test_stream *stream = impl_from_IStream(iface); + DWORD res; + + SetEvent(stream->read_event); + res = WaitForSingleObject(stream->done_event, 1000); + ok(res == 0, "got %#lx\n", res); + + *ret_size = size; + return S_OK; +} + +static HRESULT WINAPI test_stream_Write(IStream *iface, const void *data, ULONG size, ULONG *ret_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD method, ULARGE_INTEGER *ret_offset) +{ + return S_OK; +} + +static HRESULT WINAPI test_stream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *read_size, ULARGE_INTEGER *write_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Commit(IStream *iface, DWORD flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Revert(IStream *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Stat(IStream *iface, STATSTG *stat, DWORD flags) +{ + memset(stat, 0, sizeof(STATSTG)); + stat->pwcsName = NULL; + stat->type = STGTY_STREAM; + stat->cbSize.QuadPart = 16; + return S_OK; +} + +static HRESULT WINAPI test_stream_Clone(IStream *iface, IStream **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl test_stream_vtbl = +{ + test_stream_QueryInterface, + test_stream_AddRef, + test_stream_Release, + test_stream_Read, + test_stream_Write, + test_stream_Seek, + test_stream_SetSize, + test_stream_CopyTo, + test_stream_Commit, + test_stream_Revert, + test_stream_LockRegion, + test_stream_UnlockRegion, + test_stream_Stat, + test_stream_Clone, +}; + +static HRESULT test_stream_create(IStream **out) +{ + struct test_stream *stream; + + if (!(stream = calloc(1, sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->IStream_iface.lpVtbl = &test_stream_vtbl; + stream->refcount = 1; + + stream->read_event = CreateEventW(NULL, FALSE, FALSE, NULL); + stream->done_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + *out = &stream->IStream_iface; + return S_OK; +} + +static DWORD test_stream_wait_read(IStream *iface, DWORD timeout) +{ + struct test_stream *stream = impl_from_IStream(iface); + return WaitForSingleObject(stream->read_event, timeout); +} + +static void test_stream_complete_read(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + SetEvent(stream->done_event); +} + static void test_MFCreateMFByteStreamOnStream(void) { + struct test_callback *read_callback, *test_callback; IMFByteStream *bytestream; IMFByteStream *bytestream2; IStream *stream; IMFAttributes *attributes = NULL; + IMFAsyncResult *result; DWORD caps, written; IUnknown *unknown; + BYTE buffer[16]; ULONG ref, size; + DWORD res, len; HRESULT hr; UINT count; QWORD to; @@ -2266,6 +2474,52 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); IStream_Release(stream); + + + /* test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD */ + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + read_callback = create_test_callback(&test_async_callback_result_vtbl); + test_callback = create_test_callback(&test_async_callback_result_vtbl); + + hr = test_stream_create(&stream); + ok(hr == S_OK, "got %#lx\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IMFByteStream_BeginRead(bytestream, buffer, 1, &read_callback->IMFAsyncCallback_iface, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + res = test_stream_wait_read(stream, 1000); + ok(res == 0, "got %#lx\n", res); + res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 10, &result); + ok(res == WAIT_TIMEOUT, "got %#lx\n", res); + + /* MFASYNC_CALLBACK_QUEUE_STANDARD is not blocked */ + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &test_callback->IMFAsyncCallback_iface, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result); + todo_wine ok(res == 0, "got %#lx\n", res); + if (res == 0) IMFAsyncResult_Release(result); + + test_stream_complete_read(stream); + res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result); + ok(res == 0, "got %#lx\n", res); + hr = IMFByteStream_EndRead(bytestream, result, &len); + ok(hr == S_OK, "got %#lx\n", hr); + ok(len == 1, "got %#lx\n", len); + IMFAsyncResult_Release(result); + + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + IMFAsyncCallback_Release(&read_callback->IMFAsyncCallback_iface); + IMFAsyncCallback_Release(&test_callback->IMFAsyncCallback_iface); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } static void test_file_stream(void)

1 0

Rémi Bernon : mfplat/tests: Create the test_callback event in the constructor.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 848fe4a741ba194c50cc4517f23dc950104f62f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/848fe4a741ba194c50cc4517f23dc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 15:42:20 2023 +0200 mfplat/tests: Create the test_callback event in the constructor. --- dlls/mfplat/tests/mfplat.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39fdb665bbf..0f4ae026228 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -521,7 +521,10 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) ULONG refcount = InterlockedDecrement(&callback->refcount); if (!refcount) + { + CloseHandle(callback->event); free(callback); + } return refcount; } @@ -804,6 +807,7 @@ static struct test_callback * create_test_callback(const IMFAsyncCallbackVtbl *v callback->IMFAsyncCallback_iface.lpVtbl = vtbl ? vtbl : &testcallbackvtbl; callback->refcount = 1; + callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); return callback; } @@ -816,7 +820,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected HRESULT hr; callback = create_test_callback(&events_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); for (;;) { @@ -847,7 +850,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected } } - CloseHandle(callback->event); if (callback->media_event) IMFMediaEvent_Release(callback->media_event); IMFAsyncCallback_Release(&callback->IMFAsyncCallback_iface); @@ -937,7 +939,6 @@ static void test_source_resolver(void) IMFByteStream_Release(stream); /* Create from URL. */ - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = IMFSourceResolver_CreateObjectFromURL(resolver, L"nonexisting.mp4", MF_RESOLUTION_BYTESTREAM, NULL, &obj_type, (IUnknown **)&stream); @@ -1234,7 +1235,6 @@ static void test_source_resolver(void) (void **)&scheme_handler); ok(hr == S_OK, "Failed to create handler object, hr %#lx.\n", hr); - callback2->event = callback->event; cancel_cookie = NULL; hr = IMFSchemeHandler_BeginCreateObject(scheme_handler, pathW, MF_RESOLUTION_MEDIASOURCE, NULL, &cancel_cookie, &callback2->IMFAsyncCallback_iface, (IUnknown *)scheme_handler); @@ -1249,8 +1249,6 @@ static void test_source_resolver(void) if (do_uninit) CoUninitialize(); - CloseHandle(callback->event); - IMFSourceResolver_Release(resolver); hr = MFShutdown(); @@ -3524,16 +3522,12 @@ static void test_event_queue(void) hr = IMFMediaEventQueue_BeginGetEvent(queue, &callback2->IMFAsyncCallback_iface, (IUnknown *)&callback->IMFAsyncCallback_iface); ok(hr == MF_E_MULTIPLE_SUBSCRIBERS, "Unexpected hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEventQueue_QueueEvent(queue, event); ok(hr == S_OK, "Failed to queue event, hr %#lx.\n", hr); ret = WaitForSingleObject(callback->event, 500); ok(ret == WAIT_OBJECT_0, "Unexpected return value %#lx.\n", ret); - CloseHandle(callback->event); - IMFMediaEvent_Release(event); hr = MFCreateAsyncResult(NULL, &callback->IMFAsyncCallback_iface, NULL, &result); @@ -4957,8 +4951,6 @@ static void test_async_create_file(void) hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Fail to start up, hr %#lx.\n", hr); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); - GetTempPathW(ARRAY_SIZE(pathW), pathW); GetTempFileNameW(pathW, NULL, 0, fileW); @@ -4971,8 +4963,6 @@ static void test_async_create_file(void) IUnknown_Release(cancel_cookie); - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); @@ -5856,7 +5846,6 @@ static void test_queue_com_state(const char *name) HRESULT hr; callback = create_test_callback(&test_queue_com_state_callback_vtbl); - callback->event = CreateEventA(NULL, FALSE, FALSE, NULL); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#lx.\n", hr); @@ -5888,8 +5877,6 @@ static void test_queue_com_state(const char *name) } } - CloseHandle(callback->event); - hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr);

1 0

Zebediah Figura : configure: Fail if --enable-archs is used and any cross-compiler is missing.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: cda2886fd3018c9e8c12791238db481b528f6a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda2886fd3018c9e8c12791238db48… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 12 17:43:08 2023 -0500 configure: Fail if --enable-archs is used and any cross-compiler is missing. For example, currently, if --enable-archs=i386,x86_64 is used, and there is an x86_64 cross compiler present but no i386 cross compiler, Wine will silently remove i386 from the list of cross-compiled architechtures, and only compile PE code for x86_64. This seems quite undesirable. I am not aware of any practical reason for this to happen. Debian does ship i686 and x86_64 MinGW compilers in separate packages, though, so it is possible in theory. --- configure | 33 ++++++++++++++++----------------- configure.ac | 18 ++++++++++-------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/configure b/configure index d5e699ca7d9..829741a5c0e 100755 --- a/configure +++ b/configure @@ -10512,11 +10512,6 @@ test -n "$x86_64_CC" || x86_64_CC="false" esac fi - if eval test \"x\$"${wine_arch}_CC"\" = x"false" -then : - continue -fi - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -10531,7 +10526,11 @@ fi target="" as_wine_cv_crosscc=`printf "%s\n" "ac_cv_${wine_arch}_crosscc" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 + if eval test \"x\$"${wine_arch}_CC"\" = x"false" +then : + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC works" >&5 printf %s "checking whether $CC works... " >&6; } if eval test \${$as_wine_cv_crosscc+y} then : @@ -10559,6 +10558,7 @@ fi eval ac_res=\$$as_wine_cv_crosscc { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 printf "%s\n" "$ac_res" >&6; } +fi if eval test \"x\$"$as_wine_cv_crosscc"\" = x"yes" then : set x $CC @@ -10627,6 +10627,11 @@ fi if test -z "$target" then + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -10676,6 +10681,11 @@ printf "%s\n" "unsupported" >&6; } CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + if test ${enable_archs+y} +then : + as_fn_error $? "MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested." "$LINENO" 5 +fi continue ;; x*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $res" >&5 @@ -11648,17 +11658,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 DLLEXT="" -else - if test "x$PE_ARCHS" = "x" -then : - case "x$with_mingw" in - x) as_fn_append wine_notices "|MinGW compiler not found, cross-compiling PE files won't be supported." ;; - xno) ;; - *) as_fn_error $? "MinGW compiler not found, cross-compiling PE files won't be supported. -This is an error since --with-mingw was requested." "$LINENO" 5 ;; -esac - -fi fi diff --git a/configure.ac b/configure.ac index 0a683212866..90f4fd3809d 100644 --- a/configure.ac +++ b/configure.ac @@ -849,8 +849,6 @@ do ;; esac]) - AS_VAR_IF([${wine_arch}_CC],[false],[continue]) - saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS @@ -864,9 +862,10 @@ do target="" AS_VAR_PUSHDEF([wine_cv_crosscc],[ac_cv_${wine_arch}_crosscc]) - AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])]) + AS_VAR_IF([${wine_arch}_CC],[false],[], + [AC_CACHE_CHECK([whether $CC works],[wine_cv_crosscc], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [AS_VAR_SET([wine_cv_crosscc],[yes])],[AS_VAR_SET([wine_cv_crosscc],[no])])])]) AS_VAR_IF([wine_cv_crosscc],[yes], [set x $CC shift @@ -903,6 +902,9 @@ do if test -z "$target" then + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler not found. +This is an error since --enable-archs=$wine_arch was requested.])]) CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS @@ -930,6 +932,9 @@ do CC=$saved_CC CFLAGS=$saved_CFLAGS LDFLAGS=$saved_LDFLAGS + AS_VAR_SET_IF([enable_archs], + [AC_MSG_ERROR([MinGW $wine_arch compiler supporting C99 not found. +This is an error since --enable-archs=$wine_arch was requested.])]) continue ;; x*) AC_MSG_RESULT([$res]) @@ -1009,9 +1014,6 @@ if test $HOST_ARCH = aarch64 then test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) DLLEXT="" -else - WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"], - [MinGW compiler not found, cross-compiling PE files won't be supported.]) fi dnl **** External libraries ****

1 0

Santino Mazza : evr: Remove process input handling from streaming thread.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: f8cf88dcf4e23e23b087e95eda746348aff24ad5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8cf88dcf4e23e23b087e95eda7463… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Aug 3 12:23:17 2023 -0300 evr: Remove process input handling from streaming thread. --- dlls/evr/presenter.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 3ae9b24ad4a..2dc01608caf 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -55,7 +55,6 @@ enum streaming_thread_message { EVRM_STOP = WM_USER, EVRM_PRESENT = WM_USER + 1, - EVRM_PROCESS_INPUT = WM_USER + 2, }; struct sample_queue @@ -706,11 +705,6 @@ static DWORD CALLBACK video_presenter_streaming_thread(void *arg) } break; - case EVRM_PROCESS_INPUT: - EnterCriticalSection(&presenter->cs); - video_presenter_process_input(presenter); - LeaveCriticalSection(&presenter->cs); - break; default: ; } @@ -1811,9 +1805,9 @@ static HRESULT WINAPI video_presenter_allocator_cb_NotifyRelease(IMFVideoSampleA { struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); - /* Release notification is executed under allocator lock, instead of processing samples here - notify streaming thread. */ - PostThreadMessageW(presenter->thread.tid, EVRM_PROCESS_INPUT, 0, 0); + EnterCriticalSection(&presenter->cs); + video_presenter_process_input(presenter); + LeaveCriticalSection(&presenter->cs); return S_OK; }

1 0

Torge Matthies : server: Don't consider non-pending poll requests when reselecting socket.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 91f8926023572378bc056afebb7ca845a6c9ccfc URL: https://gitlab.winehq.org/wine/wine/-/commit/91f8926023572378bc056afebb7ca8… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Sat Aug 12 10:59:52 2023 +0200 server: Don't consider non-pending poll requests when reselecting socket. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index ce95b7f2998..7e8192f82a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1470,6 +1470,8 @@ static int sock_get_poll_events( struct fd *fd ) { unsigned int i; + if (req->iosb->status != STATUS_PENDING) continue; + for (i = 0; i < req->count; ++i) { if (req->sockets[i].sock != sock) continue;

1 0

David McFarland : configure: Fix caching of PCSCLITE_LIBS on mac.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: d405a688ba6b5042775d733f57d00ba6318e1d0f URL: https://gitlab.winehq.org/wine/wine/-/commit/d405a688ba6b5042775d733f57d00b… Author: David McFarland <corngood(a)gmail.com> Date: Sun Aug 13 22:43:50 2023 -0300 configure: Fix caching of PCSCLITE_LIBS on mac. ac_cv_lib_pcsclite_SCardEstablishContext=yes would be cached, causing AC_CHECK_LIB to use -lpcsclite on the second run. Fixes: f74c4af257e0856e6607d2823e4f03109111a4b6 --- configure | 10 ++++++---- configure.ac | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 97f92d0bc72..d5e699ca7d9 100755 --- a/configure +++ b/configure @@ -15853,12 +15853,14 @@ fi if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" then - PCSCLITE_LIBS="-framework PCSC" - - ac_cv_lib_pcsclite_SCardEstablishContext=yes + case $host_os in + darwin*|macosx*) + PCSCLITE_LIBS="-framework PCSC" + ;; + esac fi fi -if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes +if test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes" then : case "x$with_pcsclite" in x) as_fn_append wine_notices "|libpcsclite not found, smart cards won't be supported." ;; diff --git a/configure.ac b/configure.ac index 38e61526a06..0a683212866 100644 --- a/configure.ac +++ b/configure.ac @@ -1396,11 +1396,13 @@ then AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" then - AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") - ac_cv_lib_pcsclite_SCardEstablishContext=yes + case $host_os in + darwin*|macosx*) + AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; + esac fi fi -WINE_NOTICE_WITH(pcsclite,[test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes], +WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"], [libpcsclite not found, smart cards won't be supported.], [enable_winscard])

1 0

Shaun Ren : sapi/tests: Increase timeout in tts test_spvoice.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: cff2e87e03ff045fbe1a3718a81574fe077ab189 URL: https://gitlab.winehq.org/wine/wine/-/commit/cff2e87e03ff045fbe1a3718a81574… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:57:55 2023 -0400 sapi/tests: Increase timeout in tts test_spvoice. --- dlls/sapi/tests/tts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index eb0258bbef3..6912dc08e0d 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -630,7 +630,7 @@ static void test_spvoice(void) ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); ok(stream_num == 1, "got %lu.\n", stream_num); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); check_apttype(); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); @@ -658,7 +658,7 @@ static void test_spvoice(void) hr = ISpVoice_WaitUntilDone(voice, INFINITE); duration = GetTickCount() - start; ok(hr == S_OK, "got %#lx.\n", hr); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); ok(test_engine.speak_called, "ISpTTSEngine::Speak was not called.\n"); ok(test_engine.flags == SPF_NLP_SPEAK_PUNC, "got %#lx.\n", test_engine.flags);

1 0

Santino Mazza : evr: Create critical section for sample queue.
by Alexandre Julliard Aug. 14, 2023

Aug. 14, 2023

Module: wine Branch: master Commit: 7c0731e1849ea2c007783145d7335f7b4fce7081 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0731e1849ea2c007783145d7335f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Jul 31 11:44:35 2023 -0300 evr: Create critical section for sample queue. --- dlls/evr/presenter.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 97080717288..645a2461e4c 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct sample_queue unsigned int front; unsigned int back; IMFSample *last_presented; + CRITICAL_SECTION cs; }; struct streaming_thread @@ -425,6 +426,7 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; + InitializeCriticalSection(&queue->cs); return S_OK; } @@ -435,7 +437,7 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, struct sample_queue *queue = &presenter->thread.queue; unsigned int idx; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used != queue->size) { if (at_front) @@ -446,14 +448,14 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, queue->used++; IMFSample_AddRef(sample); } - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); } static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, IMFSample **sample) { struct sample_queue *queue = &presenter->thread.queue; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used) { *sample = queue->samples[queue->front]; @@ -462,7 +464,7 @@ static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, } else *sample = NULL; - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); return *sample != NULL; } @@ -477,6 +479,7 @@ static void video_presenter_sample_queue_free(struct video_presenter *presenter) IMFSample_Release(sample); free(queue->samples); + DeleteCriticalSection(&queue->cs); } static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) @@ -502,6 +505,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM { IDirect3DSurface9 *surface, *backbuffer; IDirect3DDevice9 *device; + struct sample_queue *queue = &presenter->thread.queue; HRESULT hr; if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) @@ -527,12 +531,12 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&presenter->cs); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); - presenter->thread.queue.last_presented = sample; - IMFSample_AddRef(presenter->thread.queue.last_presented); - LeaveCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); + if (queue->last_presented) + IMFSample_Release(queue->last_presented); + queue->last_presented = sample; + IMFSample_AddRef(queue->last_presented); + LeaveCriticalSection(&queue->cs); IDirect3DSurface9_Release(surface); }

1 0