November 2021 - Wine-commits

Zebediah Figura : strmbase: Remove the no longer used output queue helper.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 883325ccf75098dc499ff4f5274127fb35ad2be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883325ccf75098dc499ff4f5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:30:35 2021 -0600 strmbase: Remove the no longer used output queue helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 36 ------ libs/strmbase/Makefile.in | 1 - libs/strmbase/outputqueue.c | 275 -------------------------------------------- 3 files changed, 312 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=883325ccf75098dc499f…

1 0

Zebediah Figura : include: Do not include wine/list.h in wine/strmbase.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 507853c7b83656c5c52479d4a779f22fbfce86ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=507853c7b83656c5c52479d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 18:30:36 2021 -0600 include: Do not include wine/list.h in wine/strmbase.h. Nothing in strmbase.h uses list.h anymore. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 1 + dlls/amstream/ddrawstream.c | 1 + include/wine/strmbase.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 91ca0630199..bb86cfdaf69 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 5e88e096991..b1b79756ff9 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "amstream_private.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a9233ef7820..1c8696ed620 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -20,7 +20,6 @@ */ #include "dshow.h" -#include "wine/list.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType);

1 0

Zebediah Figura : configure: Fix the makefile path for libxml2 and libxslt.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: eeae3554fd45754dc40e887d3336290a0c6c7ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeae3554fd45754dc40e887d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:05 2021 -0600 configure: Fix the makefile path for libxml2 and libxslt. They were not correctly being disabled if an external library was specified, which was causing msxml3 to link to the bundled version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 ++++++++++++-------------- configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/configure b/configure index a0df1a68c3d..3378aef22f0 100755 --- a/configure +++ b/configure @@ -2764,15 +2764,13 @@ Some influential environment variables: TIFF_PE_LIBS Linker flags for the PE tiff, overriding the bundled version XML2_PE_CFLAGS - C compiler flags for the PE libxml2, overriding the bundled - version + C compiler flags for the PE xml2, overriding the bundled version XML2_PE_LIBS - Linker flags for the PE libxml2, overriding the bundled version + Linker flags for the PE xml2, overriding the bundled version XSLT_PE_CFLAGS - C compiler flags for the PE libxslt, overriding the bundled - version + C compiler flags for the PE xslt, overriding the bundled version XSLT_PE_LIBS - Linker flags for the PE libxslt, overriding the bundled version + Linker flags for the PE xslt, overriding the bundled version ZLIB_PE_CFLAGS C compiler flags for the PE zlib, overriding the bundled version ZLIB_PE_LIBS @@ -12422,31 +12420,31 @@ if ${XML2_PE_CFLAGS:+false} : then : XML2_PE_CFLAGS="-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC" else $as_nop - enable_libxml2=no + enable_xml2=no fi if ${XML2_PE_LIBS:+false} : then : XML2_PE_LIBS=xml2 else $as_nop - enable_libxml2=no + enable_xml2=no fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 cflags: $XML2_PE_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxml2 libs: $XML2_PE_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 cflags: $XML2_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 libs: $XML2_PE_LIBS" >&5 if ${XSLT_PE_CFLAGS:+false} : then : XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop - enable_libxslt=no + enable_xslt=no fi if ${XSLT_PE_LIBS:+false} : then : XSLT_PE_LIBS=xslt else $as_nop - enable_libxslt=no + enable_xslt=no fi -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt cflags: $XSLT_PE_CFLAGS" >&5 -printf "%s\n" "$as_me:${as_lineno-$LINENO}: libxslt libs: $XSLT_PE_LIBS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt cflags: $XSLT_PE_CFLAGS" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt libs: $XSLT_PE_LIBS" >&5 if ${ZLIB_PE_CFLAGS:+false} : then : diff --git a/configure.ac b/configure.ac index 1e779508828..aa5396e8d06 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,8 +1041,8 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") -WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread ****

1 0

Zebediah Figura : makedep: Check for external libraries instead of include paths when determining whether to allow external includes.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: e454c62f36c7330fbdb59815771966a8d4b90c4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e454c62f36c7330fbdb59815… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:06 2021 -0600 makedep: Check for external libraries instead of include paths when determining whether to allow external includes. The include path may be empty, e.g. if the relevant headers are to be found directly in the MinGW sysroot. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index ac3e6d969e2..2301ecf191e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1286,6 +1286,22 @@ static struct makefile *find_importlib_module( const char *name ) } +/******************************************************************* + * has_external_import + */ +static int has_external_import( const struct makefile *make ) +{ + unsigned int i; + + for (i = 0; i < make->imports.count; i++) + { + if (!strncmp( make->imports.str[i], "-l", 2 )) + return 1; + } + return 0; +} + + /******************************************************************* * open_include_file */ @@ -1404,7 +1420,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ { if (!strcmp( pFile->name, "stdarg.h" )) return NULL; if (!strcmp( pFile->name, "x86intrin.h" )) return NULL; - if (make->include_paths.count) return NULL; + if (has_external_import( make )) return NULL; fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", pFile->included_by->file->name, pFile->included_line, pFile->name ); exit(1);

1 0

Zebediah Figura : configure: Don't use a bundled include path if external linker flags are specified.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: f10b176bfa813ca7d0ca36e72a6107859682546e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10b176bfa813ca7d0ca36e7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 16:43:07 2021 -0600 configure: Don't use a bundled include path if external linker flags are specified. The external include path might be empty e.g. if the relevant headers are to be found directly in the MinGW sysroot, but we still don't want to use the bundled library's include path in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 6 +++-- configure | 88 +++++++++++++++++++++++++++++++------------------------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a261105d44d..07a0359a3f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -133,8 +133,10 @@ AC_DEFUN([WINE_EXTLIB_FLAGS], AS_VAR_PUSHDEF([ac_libs],[[$1]_PE_LIBS])dnl AC_ARG_VAR(ac_cflags, [C compiler flags for the PE $2, overriding the bundled version])dnl AC_ARG_VAR(ac_libs, [Linker flags for the PE $2, overriding the bundled version])dnl -AS_VAR_IF([ac_cflags],[],[ac_cflags=$4],[enable_$2=no]) -AS_VAR_IF([ac_libs],[],[ac_libs=$3],[enable_$2=no]) +AS_VAR_IF([ac_libs],[], + [ac_libs=$3 + AS_VAR_IF([ac_cflags],[],[ac_cflags=$4],[enable_$2=no])], + [enable_$2=no]) AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 cflags: $ac_cflags"]) >&AS_MESSAGE_LOG_FD AS_ECHO(["$as_me:${as_lineno-$LINENO}: $2 libs: $ac_libs"]) >&AS_MESSAGE_LOG_FD AS_VAR_POPDEF([ac_libs])dnl diff --git a/configure b/configure index 3378aef22f0..aec64ea0232 100755 --- a/configure +++ b/configure @@ -12296,165 +12296,165 @@ esac fi -if ${FAUDIO_PE_CFLAGS:+false} : +if ${FAUDIO_PE_LIBS:+false} : +then : + FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" + if ${FAUDIO_PE_CFLAGS:+false} : then : FAUDIO_PE_CFLAGS="-I\$(top_srcdir)/libs/faudio/include" else $as_nop enable_faudio=no fi -if ${FAUDIO_PE_LIBS:+false} : -then : - FAUDIO_PE_LIBS="faudio mfplat mfreadwrite mfuuid propsys" else $as_nop enable_faudio=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_PE_LIBS" >&5 -if ${GSM_PE_CFLAGS:+false} : +if ${GSM_PE_LIBS:+false} : +then : + GSM_PE_LIBS=gsm + if ${GSM_PE_CFLAGS:+false} : then : GSM_PE_CFLAGS="-I\$(top_srcdir)/libs/gsm/inc" else $as_nop enable_gsm=no fi -if ${GSM_PE_LIBS:+false} : -then : - GSM_PE_LIBS=gsm else $as_nop enable_gsm=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsm cflags: $GSM_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsm libs: $GSM_PE_LIBS" >&5 -if ${JPEG_PE_CFLAGS:+false} : +if ${JPEG_PE_LIBS:+false} : +then : + JPEG_PE_LIBS=jpeg + if ${JPEG_PE_CFLAGS:+false} : then : JPEG_PE_CFLAGS="-I\$(top_srcdir)/libs/jpeg" else $as_nop enable_jpeg=no fi -if ${JPEG_PE_LIBS:+false} : -then : - JPEG_PE_LIBS=jpeg else $as_nop enable_jpeg=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: jpeg cflags: $JPEG_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: jpeg libs: $JPEG_PE_LIBS" >&5 -if ${JXR_PE_CFLAGS:+false} : +if ${JXR_PE_LIBS:+false} : +then : + JXR_PE_LIBS=jxr + if ${JXR_PE_CFLAGS:+false} : then : JXR_PE_CFLAGS="-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_srcdir)/libs/jxr/image/sys" else $as_nop enable_jxr=no fi -if ${JXR_PE_LIBS:+false} : -then : - JXR_PE_LIBS=jxr else $as_nop enable_jxr=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr cflags: $JXR_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: jxr libs: $JXR_PE_LIBS" >&5 -if ${LCMS2_PE_CFLAGS:+false} : +if ${LCMS2_PE_LIBS:+false} : +then : + LCMS2_PE_LIBS=lcms2 + if ${LCMS2_PE_CFLAGS:+false} : then : LCMS2_PE_CFLAGS="-I\$(top_srcdir)/libs/lcms2/include" else $as_nop enable_lcms2=no fi -if ${LCMS2_PE_LIBS:+false} : -then : - LCMS2_PE_LIBS=lcms2 else $as_nop enable_lcms2=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: lcms2 cflags: $LCMS2_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: lcms2 libs: $LCMS2_PE_LIBS" >&5 -if ${MPG123_PE_CFLAGS:+false} : +if ${MPG123_PE_LIBS:+false} : +then : + MPG123_PE_LIBS=mpg123 + if ${MPG123_PE_CFLAGS:+false} : then : MPG123_PE_CFLAGS="-I\$(top_srcdir)/libs/mpg123/src/libmpg123" else $as_nop enable_mpg123=no fi -if ${MPG123_PE_LIBS:+false} : -then : - MPG123_PE_LIBS=mpg123 else $as_nop enable_mpg123=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: mpg123 cflags: $MPG123_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: mpg123 libs: $MPG123_PE_LIBS" >&5 -if ${PNG_PE_CFLAGS:+false} : +if ${PNG_PE_LIBS:+false} : +then : + PNG_PE_LIBS="png \$(ZLIB_PE_LIBS)" + if ${PNG_PE_CFLAGS:+false} : then : PNG_PE_CFLAGS="-I\$(top_srcdir)/libs/png" else $as_nop enable_png=no fi -if ${PNG_PE_LIBS:+false} : -then : - PNG_PE_LIBS="png \$(ZLIB_PE_LIBS)" else $as_nop enable_png=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: png cflags: $PNG_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 -if ${TIFF_PE_CFLAGS:+false} : +if ${TIFF_PE_LIBS:+false} : +then : + TIFF_PE_LIBS=tiff + if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" else $as_nop enable_tiff=no fi -if ${TIFF_PE_LIBS:+false} : -then : - TIFF_PE_LIBS=tiff else $as_nop enable_tiff=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: tiff cflags: $TIFF_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: tiff libs: $TIFF_PE_LIBS" >&5 -if ${XML2_PE_CFLAGS:+false} : +if ${XML2_PE_LIBS:+false} : +then : + XML2_PE_LIBS=xml2 + if ${XML2_PE_CFLAGS:+false} : then : XML2_PE_CFLAGS="-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC" else $as_nop enable_xml2=no fi -if ${XML2_PE_LIBS:+false} : -then : - XML2_PE_LIBS=xml2 else $as_nop enable_xml2=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 cflags: $XML2_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: xml2 libs: $XML2_PE_LIBS" >&5 -if ${XSLT_PE_CFLAGS:+false} : +if ${XSLT_PE_LIBS:+false} : +then : + XSLT_PE_LIBS=xslt + if ${XSLT_PE_CFLAGS:+false} : then : XSLT_PE_CFLAGS="-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC" else $as_nop enable_xslt=no fi -if ${XSLT_PE_LIBS:+false} : -then : - XSLT_PE_LIBS=xslt else $as_nop enable_xslt=no fi printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt cflags: $XSLT_PE_CFLAGS" >&5 printf "%s\n" "$as_me:${as_lineno-$LINENO}: xslt libs: $XSLT_PE_LIBS" >&5 -if ${ZLIB_PE_CFLAGS:+false} : +if ${ZLIB_PE_LIBS:+false} : +then : + ZLIB_PE_LIBS=z + if ${ZLIB_PE_CFLAGS:+false} : then : ZLIB_PE_CFLAGS="-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO" else $as_nop enable_zlib=no fi -if ${ZLIB_PE_LIBS:+false} : -then : - ZLIB_PE_LIBS=z else $as_nop enable_zlib=no fi

1 0

Paul Gofman : include: Define ISpeechSynthesizer interface.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 850083d088b831b5ce59393d06c9d2f6fc5200a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850083d088b831b5ce59393d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 30 15:55:23 2021 +0300 include: Define ISpeechSynthesizer interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.idl | 9 +++++ include/windows.media.idl | 43 +++++++++++++++++++++ include/windows.media.speechsynthesis.idl | 63 +++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index acb55b37f6c..a869ae4bc73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -777,6 +777,7 @@ SOURCES = \ windows.globalization.idl \ windows.h \ windows.media.devices.idl \ + windows.media.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ windows.system.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index fe09dc66edd..292522f2c49 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -119,6 +119,15 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } } } diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..fe81c768361 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..29dca510dee 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,10 +36,27 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } + namespace Storage { + namespace Streams { + interface IRandomAccessStreamWithContentType; + interface IRandomAccessStream; + interface IInputStream; + interface IOutputStream; + interface IContentTypeProvider; + } + } +} + +namespace Windows { + namespace Media { + interface IMediaMarker; + } } namespace Windows { @@ -48,6 +66,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +84,34 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] + interface ISpeechSynthesisStream : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStreamWithContentType, + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +146,20 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + interface Windows.Storage.Streams.IRandomAccessStreamWithContentType; + interface Windows.Storage.Streams.IContentTypeProvider; + interface Windows.Storage.Streams.IRandomAccessStream; + interface Windows.Storage.Streams.IOutputStream; + interface Windows.Foundation.IClosable; + interface Windows.Storage.Streams.IInputStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),

1 0

Paul Gofman : windows.media.speech: Add stub SpeechSynthesizer class.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: a3ef7a13c8df294c2158ef7105f2de98d4bef690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ef7a13c8df294c2158ef71… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 30 15:55:24 2021 +0300 windows.media.speech: Add stub SpeechSynthesizer class. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 244 ++++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 73 ++++++++- 2 files changed, 311 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3ef7a13c8df294c2158…

1 0

Alexandre Julliard : ntdll: Export some Unicode string functions for use in other Unix libraries.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 035f8ad8ada77297acae0c04316da9ee402559d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=035f8ad8ada77297acae0c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:53:43 2021 +0100 ntdll: Export some Unicode string functions for use in other Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 35 +++++++++++++-- dlls/ntdll/unix/unix_private.h | 97 ------------------------------------------ dlls/win32u/win32u_private.h | 34 --------------- include/wine/unixlib.h | 83 ++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=035f8ad8ada77297acae…

1 0

Alexandre Julliard : bcrypt: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 39336fd02d90b8d7d1d24d5eb31f9b0172b60a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39336fd02d90b8d7d1d24d5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:53:50 2021 +0100 bcrypt: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 400f0ddaddf..c94577f8acd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -47,7 +47,6 @@ #include "bcrypt_internal.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1423,12 +1422,12 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) { - if (!strcmpW( alg_id, BCRYPT_SHA1_ALGORITHM )) return GNUTLS_DIG_SHA1; - if (!strcmpW( alg_id, BCRYPT_SHA256_ALGORITHM )) return GNUTLS_DIG_SHA256; - if (!strcmpW( alg_id, BCRYPT_SHA384_ALGORITHM )) return GNUTLS_DIG_SHA384; - if (!strcmpW( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; - if (!strcmpW( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; - if (!strcmpW( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; + if (!wcscmp( alg_id, BCRYPT_SHA1_ALGORITHM )) return GNUTLS_DIG_SHA1; + if (!wcscmp( alg_id, BCRYPT_SHA256_ALGORITHM )) return GNUTLS_DIG_SHA256; + if (!wcscmp( alg_id, BCRYPT_SHA384_ALGORITHM )) return GNUTLS_DIG_SHA384; + if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; + if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; + if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; return -1; }

1 0

Alexandre Julliard : mountmgr: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard 30 Nov '21

30 Nov '21

Module: wine Branch: master Commit: 5554c847e1442ce41838c02a994cd06bda21e2d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5554c847e1442ce41838c02a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:53:56 2021 +0100 mountmgr: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/cred.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/cred.c b/dlls/mountmgr.sys/cred.c index 071cb53236d..9fb9e433881 100644 --- a/dlls/mountmgr.sys/cred.c +++ b/dlls/mountmgr.sys/cred.c @@ -40,7 +40,6 @@ #include "mountmgr.h" #include "unixlib.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -167,7 +166,7 @@ static SecKeychainItemRef find_credential( const WCHAR *name ) CFRelease( search ); return NULL; } - if (strcmpiW( itemname, name )) + if (wcsicmp( itemname, name )) { CFRelease( item ); free( itemname ); @@ -466,9 +465,9 @@ static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter ) TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) ); - p = strchrW( filter, '*' ); - if (*p && !p[1]) ret = !strncmpiW( filter, targetname, p - filter ); - else ret = !strcmpiW( filter, targetname ); + p = wcschr( filter, '*' ); + if (*p && !p[1]) ret = !wcsnicmp( filter, targetname, p - filter ); + else ret = !wcsicmp( filter, targetname ); free( targetname ); return ret; }

1 0