wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zebediah Figura : winegstreamer: Add a basic implementation of IWMSyncReader::OpenStream().
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: c76418fbfd72e496c800aec28c5a1d713389287f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c76418fbfd72e496c800aec2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 25 18:52:11 2021 -0500 winegstreamer: Add a basic implementation of IWMSyncReader::OpenStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 6 ++++++ dlls/winegstreamer/wm_asyncreader.c | 2 ++ dlls/winegstreamer/wm_reader.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 18 ++++++++++++------ dlls/wmvcore/tests/wmvcore.c | 10 +++++----- 5 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c757dfbefd8..a07195a4a1e 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -122,6 +122,9 @@ struct wm_reader IWMReaderPlaylistBurn IWMReaderPlaylistBurn_iface; IWMReaderTimecode IWMReaderTimecode_iface; LONG refcount; + CRITICAL_SECTION cs; + + IStream *source_stream; const struct wm_reader_ops *ops; }; @@ -132,6 +135,9 @@ struct wm_reader_ops void (*destroy)(struct wm_reader *reader); }; +void wm_reader_cleanup(struct wm_reader *reader); +HRESULT wm_reader_close(struct wm_reader *reader); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); +HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); #endif /* __GST_PRIVATE_INCLUDED__ */ diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 12b96245707..4fec89a2100 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -1255,6 +1255,8 @@ static void async_reader_destroy(struct wm_reader *iface) TRACE("reader %p.\n", reader); + wm_reader_close(&reader->reader); + wm_reader_cleanup(&reader->reader); free(reader); } diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 963d33afe0f..e5c2d2a9789 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -759,6 +759,34 @@ static const IWMReaderTimecodeVtbl timecode_vtbl = timecode_GetTimecodeRangeBounds, }; +HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) +{ + EnterCriticalSection(&reader->cs); + + IStream_AddRef(reader->source_stream = stream); + + LeaveCriticalSection(&reader->cs); + + return S_OK; +} + +HRESULT wm_reader_close(struct wm_reader *reader) +{ + EnterCriticalSection(&reader->cs); + + if (!reader->source_stream) + { + LeaveCriticalSection(&reader->cs); + return NS_E_INVALID_REQUEST; + } + + IStream_Release(reader->source_stream); + reader->source_stream = NULL; + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; @@ -769,4 +797,13 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) reader->IWMReaderTimecode_iface.lpVtbl = &timecode_vtbl; reader->refcount = 1; reader->ops = ops; + + InitializeCriticalSection(&reader->cs); + reader->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wm_reader.cs"); +} + +void wm_reader_cleanup(struct wm_reader *reader) +{ + reader->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&reader->cs); } diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 0113ced1730..bb98a60ad48 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -55,9 +55,11 @@ static ULONG WINAPI WMSyncReader_Release(IWMSyncReader2 *iface) static HRESULT WINAPI WMSyncReader_Close(IWMSyncReader2 *iface) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p.\n", reader); + + return wm_reader_close(&reader->reader); } static HRESULT WINAPI WMSyncReader_GetMaxOutputSampleSize(IWMSyncReader2 *iface, DWORD output, DWORD *max) @@ -157,9 +159,11 @@ static HRESULT WINAPI WMSyncReader_Open(IWMSyncReader2 *iface, const WCHAR *file static HRESULT WINAPI WMSyncReader_OpenStream(IWMSyncReader2 *iface, IStream *stream) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%p): stub!\n", This, stream); - return S_OK; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, stream %p.\n", reader, stream); + + return wm_reader_open_stream(&reader->reader, stream); } static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps *output) @@ -309,6 +313,8 @@ static void sync_reader_destroy(struct wm_reader *iface) TRACE("reader %p.\n", reader); + wm_reader_close(&reader->reader); + wm_reader_cleanup(&reader->reader); free(reader); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4cb905662a0..61c3504e69c 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -451,7 +451,7 @@ static void test_sync_reader_streaming(void) hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); hr = IWMProfile_GetStreamCount(profile, NULL); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); @@ -603,17 +603,17 @@ static void test_sync_reader_streaming(void) todo_wine ok(hr == NS_E_NO_MORE_SAMPLES, "Got hr %#x.\n", hr); hr = IWMSyncReader_Close(reader); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IWMSyncReader_Close(reader); - todo_wine ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_REQUEST, "Got hr %#x.\n", hr); ok(stream.refcount == 1, "Got outstanding refcount %d.\n", stream.refcount); SetFilePointer(stream.file, 0, NULL, FILE_BEGIN); hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); IWMProfile_Release(profile); ref = IWMSyncReader_Release(reader); @@ -692,7 +692,7 @@ static void test_sync_reader_types(void) hr = IWMSyncReader_OpenStream(reader, &stream.IStream_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); + ok(stream.refcount > 1, "Got refcount %d.\n", stream.refcount); for (i = 0; i < 2; ++i) {

1 0

Zebediah Figura : wmvcore/tests: Add tests for synchronous reader media types.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: master Commit: b51bfccd89b806a3bab78e16419aac66827ba95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51bfccd89b806a3bab78e16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 25 18:52:10 2021 -0500 wmvcore/tests: Add tests for synchronous reader media types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 267 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 266 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b51bfccd89b806a3bab7…

1 0

Alexandre Julliard : Wine release 6.0.2
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: website Branch: master Commit: ce7e591894cec84053bc99e2210855acf0b0706d URL: https://source.winehq.org/git/website.git/?a=commit;h=ce7e591894cec84053bc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 16:40:38 2021 +0200 Wine release 6.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021102601.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2021102601.xml b/news/en/2021102601.xml new file mode 100644 index 00000000..5e6cbba3 --- /dev/null +++ b/news/en/2021102601.xml @@ -0,0 +1,15 @@ +<news> +<date>October 26, 2021</date> +<title>Wine 6.0.2 Released</title> +<body> + The Wine maintenance release 6.0.2 is now available. + <a href="{$root}/announce/6.0.2">What's new</a> in this release: +<ul> + <li>Compilation fixes (freetype, gcc 11)</li> + <li>Default to building with GnuTLS support on macOS, if present</li> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.0.2 : Alexandre Julliard : Release 6.0.2
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: refs/tags/wine-6.0.2 Tag: dbe4b125d9e200e06db3d3bd8ed1908ec9685f92 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dbe4b125d9e200e06db3d3bd8ed… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 26 16:38:44 2021 +0200 Release 6.0.2

1 0

Michael Stefaniuc : Release 6.0.2.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 3c9afe8f878aa5281e7ed94c79e50ab1f5ed758a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c9afe8f878aa5281e7ed94c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 6 20:03:40 2021 +0200 Release 6.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 447 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +-- 4 files changed, 234 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c9afe8f878aa5281e7e…

1 0

Alexandre Julliard : gdiplus/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4f158c1ca69ad2c4b42b4e84dced0877e6a10f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f158c1ca69ad2c4b42b4e84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:44:03 2021 +0100 gdiplus/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0ec38429f35ba3fdc3510f46550ea384b423fdef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/tests/wine_testfont0.sfd | 2 +- dlls/gdiplus/tests/wine_testfont0.ttf | Bin 1688 -> 1656 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/wine_testfont0.sfd b/dlls/gdiplus/tests/wine_testfont0.sfd index ba99b9f99b4..c71f717c4a6 100644 --- a/dlls/gdiplus/tests/wine_testfont0.sfd +++ b/dlls/gdiplus/tests/wine_testfont0.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: winegdiptestfont0 FullName: Wine GDI+ Test Font 0 FamilyName: winegdiptestfont diff --git a/dlls/gdiplus/tests/wine_testfont0.ttf b/dlls/gdiplus/tests/wine_testfont0.ttf index 227c2251432..fb899cb342f 100644 Binary files a/dlls/gdiplus/tests/wine_testfont0.ttf and b/dlls/gdiplus/tests/wine_testfont0.ttf differ

1 0

Alexandre Julliard : gdi32/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1c9679a35f0622fed68bef2856089605c7482b0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9679a35f0622fed68bef28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:43:55 2021 +0100 gdi32/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d373a67e179ecfb4dfa86be17bc7236ac1c690d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/vertical.ttf | Bin 3560 -> 3560 bytes dlls/gdi32/tests/wine_langnames.sfd | 2 +- dlls/gdi32/tests/wine_langnames.ttf | Bin 2792 -> 2760 bytes dlls/gdi32/tests/wine_langnames2.sfd | 2 +- dlls/gdi32/tests/wine_langnames2.ttf | Bin 2016 -> 1984 bytes dlls/gdi32/tests/wine_langnames3.sfd | 2 +- dlls/gdi32/tests/wine_langnames3.ttf | Bin 2076 -> 2044 bytes dlls/gdi32/tests/wine_nul.sfd | 2 +- dlls/gdi32/tests/wine_nul.ttf | Bin 1600 -> 1604 bytes dlls/gdi32/tests/wine_ttfnames.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames.ttf | Bin 2232 -> 2200 bytes dlls/gdi32/tests/wine_ttfnames_bold.sfd | 2 +- dlls/gdi32/tests/wine_ttfnames_bold.ttf | Bin 2272 -> 2240 bytes 13 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/vertical.ttf b/dlls/gdi32/tests/vertical.ttf index 0fc07796047..d82cbb106cb 100644 Binary files a/dlls/gdi32/tests/vertical.ttf and b/dlls/gdi32/tests/vertical.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames.sfd b/dlls/gdi32/tests/wine_langnames.sfd index 4ce1e70baca..14b422f48da 100644 --- a/dlls/gdi32/tests/wine_langnames.sfd +++ b/dlls/gdi32/tests/wine_langnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames.ttf b/dlls/gdi32/tests/wine_langnames.ttf index 674fd1bc7e4..ff3fb6b7a10 100644 Binary files a/dlls/gdi32/tests/wine_langnames.ttf and b/dlls/gdi32/tests/wine_langnames.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames2.sfd b/dlls/gdi32/tests/wine_langnames2.sfd index 50199af9adf..8ed0a302ce9 100644 --- a/dlls/gdi32/tests/wine_langnames2.sfd +++ b/dlls/gdi32/tests/wine_langnames2.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames2.ttf b/dlls/gdi32/tests/wine_langnames2.ttf index 47082dbd67e..8a61f0d5dd5 100644 Binary files a/dlls/gdi32/tests/wine_langnames2.ttf and b/dlls/gdi32/tests/wine_langnames2.ttf differ diff --git a/dlls/gdi32/tests/wine_langnames3.sfd b/dlls/gdi32/tests/wine_langnames3.sfd index 55536fa58c1..914105d50b6 100644 --- a/dlls/gdi32/tests/wine_langnames3.sfd +++ b/dlls/gdi32/tests/wine_langnames3.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: WineLangNamesRegular FullName: Wine_Lang_Names_Regular FamilyName: Wine_Lang_Names diff --git a/dlls/gdi32/tests/wine_langnames3.ttf b/dlls/gdi32/tests/wine_langnames3.ttf index 408d127fb1e..64317e81dc4 100644 Binary files a/dlls/gdi32/tests/wine_langnames3.ttf and b/dlls/gdi32/tests/wine_langnames3.ttf differ diff --git a/dlls/gdi32/tests/wine_nul.sfd b/dlls/gdi32/tests/wine_nul.sfd index c82180f1007..f28616bcb02 100644 --- a/dlls/gdi32/tests/wine_nul.sfd +++ b/dlls/gdi32/tests/wine_nul.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: wine_nul FullName: wine_nul FamilyName: wine_nul diff --git a/dlls/gdi32/tests/wine_nul.ttf b/dlls/gdi32/tests/wine_nul.ttf index 89e5648fd92..17a68419377 100644 Binary files a/dlls/gdi32/tests/wine_nul.ttf and b/dlls/gdi32/tests/wine_nul.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames.sfd b/dlls/gdi32/tests/wine_ttfnames.sfd index 566749d19a7..bef10463d6c 100644 --- a/dlls/gdi32/tests/wine_ttfnames.sfd +++ b/dlls/gdi32/tests/wine_ttfnames.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames.ttf b/dlls/gdi32/tests/wine_ttfnames.ttf index 2eb2ad1f95e..6e5ce78fb7a 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames.ttf and b/dlls/gdi32/tests/wine_ttfnames.ttf differ diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.sfd b/dlls/gdi32/tests/wine_ttfnames_bold.sfd index b3bf4ddfe90..40c94e7e7c1 100644 --- a/dlls/gdi32/tests/wine_ttfnames_bold.sfd +++ b/dlls/gdi32/tests/wine_ttfnames_bold.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: Wine_TTF_Names_Long_Family1_Cond_Regular FamilyName: Wine_TTF_Names_Long_Family1_Cond Weight: Regular diff --git a/dlls/gdi32/tests/wine_ttfnames_bold.ttf b/dlls/gdi32/tests/wine_ttfnames_bold.ttf index 919a5ea1310..a9293d7d7ca 100644 Binary files a/dlls/gdi32/tests/wine_ttfnames_bold.ttf and b/dlls/gdi32/tests/wine_ttfnames_bold.ttf differ

1 0

Gijs Vermeulen : secur32: Default to building with GnuTLS support on macOS, if present.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4a0a4d150d460550e7ad17f681f11dcfc37f7757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a0a4d150d460550e7ad17f6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 22:46:29 2021 +0200 secur32: Default to building with GnuTLS support on macOS, if present. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4940d2ada276a5c6e9f855177ef54ce23490d36e) Conflicts: dlls/secur32/schannel_gnutls.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 784c1ffe6e8..21e6ac7eae3 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -42,7 +42,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +#if defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1098,4 +1098,4 @@ void schan_imp_deinit(void) libgnutls_handle = NULL; } -#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */ +#endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d725c9d22c2..ba589274b62 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -39,7 +39,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -#ifdef HAVE_SECURITY_SECURITY_H +#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -1242,4 +1242,4 @@ void schan_imp_deinit(void) TRACE("()\n"); } -#endif /* HAVE_SECURITY_SECURITY_H */ +#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */

1 0

Gijs Vermeulen : winecfg: Disable virtual desktop when using macdrv.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: e2e053ea57e8aef9411d38fc99c83419a4c40b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e053ea57e8aef9411d38fc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 18 14:06:35 2021 +0200 winecfg: Disable virtual desktop when using macdrv. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2db7ef7f47b667962f533691aa1ef0246264076) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/x11drvdlg.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..34b194d04a6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -111,17 +111,44 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = FALSE; } +static BOOL can_enable_desktop(void) +{ + char *value; + UINT guid_atom; + BOOL ret = FALSE; + char key[sizeof("System\\CurrentControlSet\\Control\\Video\\{}\\0000") + 40]; + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), "__wine_display_device_guid")); + strcpy( key, "System\\CurrentControlSet\\Control\\Video\\{" ); + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) return ret; + strcat( key, "}\\0000" ); + if ((value = get_reg_key(HKEY_LOCAL_MACHINE, key, "GraphicsDriver", NULL))) + { + if(strcmp(value, "winemac.drv")) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + } + return ret; +} + static void init_dialog(HWND dialog) { char* buf; + BOOL enable_desktop; convert_x11_desktop_key(); - update_gui_for_desktop_mode(dialog); + if ((enable_desktop = can_enable_desktop())) + update_gui_for_desktop_mode(dialog); + else + disable(IDC_ENABLE_DESKTOP); updating_ui = TRUE; - SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); - SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + if (enable_desktop) + { + SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); + SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + } buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf))

1 0

Alexandre Julliard : explorer: Store the graphics driver basename instead of the full path.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 4f9701317bd116fe2160664db2e378630cb541d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f9701317bd116fe2160664d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 16:00:58 2021 +0200 explorer: Store the graphics driver basename instead of the full path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d47be63faec9670454b137fa8d8de5f732e76202) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/desktop.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index f525c23d819..94d178880a8 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -857,11 +857,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) name = next; } - if (module) - { - GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } + TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(libname) ); swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], @@ -872,7 +868,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) { if (module || null_driver) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); + (BYTE *)libname, (lstrlenW(libname) + 1) * sizeof(WCHAR) ); else RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); RegCloseKey( hkey );

1 0

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 October 2021