November 2021 - Wine-Commits

Jacek Caban : win32u: Introduce UpdateDisplayDevice user driver entry point.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: f8817ce2d588b37414de503bae5f58d39a7070b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8817ce2d588b37414de503b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:24:28 2021 +0100 win32u: Introduce UpdateDisplayDevice user driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 ++++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index a1a64f42b6f..9ff676aca22 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -347,6 +347,7 @@ static struct user_driver_funcs lazy_load_driver = loaderdrv_EnumDisplayMonitors, loaderdrv_EnumDisplaySettingsEx, loaderdrv_GetMonitorInfo, + NULL, /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 9f682fa8eea..93c2ff1da4c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -832,6 +832,11 @@ static BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return FALSE; } +static void CDECL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, + BOOL force, void *param ) +{ +} + static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) { return TRUE; @@ -1044,6 +1049,12 @@ static void CDECL loaderdrv_UpdateClipboard(void) load_driver()->pUpdateClipboard(); } +static void CDECL loaderdrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, + BOOL force, void *param ) +{ + load_driver()->pUpdateDisplayDevices( manager, force, param ); +} + static const struct user_driver_funcs lazy_load_driver = { .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, @@ -1053,6 +1064,7 @@ static const struct user_driver_funcs lazy_load_driver = .pToUnicodeEx = loaderdrv_ToUnicodeEx, .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, + .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, .pUpdateClipboard = loaderdrv_UpdateClipboard, .pScrollDC = nulldrv_ScrollDC, }; @@ -1093,6 +1105,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(EnumDisplayMonitors); SET_USER_FUNC(EnumDisplaySettingsEx); SET_USER_FUNC(GetMonitorInfo); + SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); SET_USER_FUNC(DestroyWindow); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1074a2ad797..871c2a50e43 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -336,7 +336,40 @@ static BOOL read_monitor_settings( struct adapter *adapter, DWORD index, struct return TRUE; } -static BOOL update_display_cache(void) +struct device_manager_ctx +{ + unsigned int gpu_count; +}; + +static void add_gpu( const struct gdi_gpu *gpu, void *param ) +{ + struct device_manager_ctx *ctx = param; + FIXME( "\n" ); + ctx->gpu_count++; +} + +static void add_adapter( const struct gdi_adapter *adapter, void *param ) +{ + FIXME( "\n" ); +} + +static void add_monitor( const struct gdi_monitor *monitor, void *param ) +{ + FIXME( "\n" ); +} + +static const struct gdi_device_manager device_manager = +{ + add_gpu, + add_adapter, + add_monitor, +}; + +static void release_display_manager_ctx( struct device_manager_ctx *ctx ) +{ +} + +static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, size; KEY_FULL_INFORMATION key; @@ -409,6 +442,46 @@ static BOOL update_display_cache(void) return ret; } +static BOOL update_display_cache(void) +{ + struct device_manager_ctx ctx = { 0 }; + + user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); + release_display_manager_ctx( &ctx ); + + if (update_display_cache_from_registry()) return TRUE; + if (ctx.gpu_count) + { + ERR( "driver reported devices, but we failed to read them\n" ); + return FALSE; + } + + user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx ); + if (!ctx.gpu_count) + { + static const struct gdi_monitor default_monitor = + { + .rc_work.right = 1024, + .rc_work.bottom = 768, + .rc_monitor.right = 1024, + .rc_monitor.bottom = 768, + .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, + }; + + TRACE( "adding default fake monitor\n "); + add_monitor( &default_monitor, &ctx ); + } + release_display_manager_ctx( &ctx ); + + if (!update_display_cache_from_registry()) + { + ERR( "failed to read display config\n" ); + return FALSE; + } + + return TRUE; +} + static BOOL lock_display_devices(void) { if (!update_display_cache()) return FALSE; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 994b082d5b4..b8e088282e5 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -167,7 +167,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 70 +#define WINE_GDI_DRIVER_VERSION 71 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -229,6 +229,42 @@ static inline ULONG window_surface_release( struct window_surface *surface ) return ret; } +/* display manager interface, used to initialize display device registry data */ + +struct gdi_gpu +{ + ULONG_PTR id; + WCHAR name[128]; /* name */ + UINT vendor_id; /* PCI ID */ + UINT device_id; + UINT subsys_id; + UINT revision_id; + GUID vulkan_uuid; /* Vulkan device UUID */ +}; + +struct gdi_adapter +{ + ULONG_PTR id; + DWORD state_flags; +}; + +struct gdi_monitor +{ + WCHAR name[128]; /* name */ + RECT rc_monitor; /* RcMonitor in MONITORINFO struct */ + RECT rc_work; /* RcWork in MONITORINFO struct */ + DWORD state_flags; /* StateFlags in DISPLAY_DEVICE struct */ + unsigned char *edid; /* Extended Device Identification Data */ + UINT edid_len; +}; + +struct gdi_device_manager +{ + void (*add_gpu)( const struct gdi_gpu *gpu, void *param ); + void (*add_adapter)( const struct gdi_adapter *adapter, void *param ); + void (*add_monitor)( const struct gdi_monitor *monitor, void *param ); +}; + struct tagUPDATELAYEREDWINDOWINFO; struct user_driver_funcs @@ -258,6 +294,7 @@ struct user_driver_funcs BOOL (CDECL *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); BOOL (CDECL *pEnumDisplaySettingsEx)(LPCWSTR,DWORD,LPDEVMODEW,DWORD); BOOL (CDECL *pGetMonitorInfo)(HMONITOR,MONITORINFO*); + void (CDECL *pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (CDECL *pCreateDesktopWindow)(HWND); BOOL (CDECL *pCreateWindow)(HWND);

1 0

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

Nov. 30, 2021

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 : configure: Fix the makefile path for libxml2 and libxslt.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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 Nov. 30, 2021

Nov. 30, 2021

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

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

Nov. 30, 2021

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

Jacek Caban : win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: cf7111e86ae58ad45b98d880c279926598623da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7111e86ae58ad45b98d880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:24:18 2021 +0100 win32u: Implement NtUserGetDisplayConfigBufferSizes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf7111e86ae58ad45b98…

1 0

Alexandre Julliard : winspool: Use the ntdll Unicode string functions instead of wine/unicode.h.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: e2033fcf54b4742b25852fd2225696698041a3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2033fcf54b4742b25852fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:54:08 2021 +0100 winspool: Use the ntdll Unicode string functions instead of wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/cups.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 830f0c91332..766f5c9bb09 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -109,7 +109,6 @@ #include "winspool.h" #include "ddk/winsplp.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "wspool.h" @@ -205,7 +204,7 @@ static char *get_unix_file_name( LPCWSTR path ) char *buffer; nt_name.Buffer = (WCHAR *)path; - nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); + nt_name.MaximumLength = nt_name.Length = wcslen( path ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { @@ -372,8 +371,8 @@ static NTSTATUS enum_printers( void *args ) location = cups_get_optionW( "printer-location", dests[i].num_options, dests[i].options ); name_len = strlen( dests[i].name ) + 1; - comment_len = comment ? strlenW( comment ) + 1 : 0; - location_len = location ? strlenW( location ) + 1 : 0; + comment_len = comment ? wcslen( comment ) + 1 : 0; + location_len = location ? wcslen( location ) + 1 : 0; needed += (name_len + comment_len + location_len) * sizeof(WCHAR); if (needed <= *params->size) @@ -427,7 +426,7 @@ static NTSTATUS get_ppd( void *args ) char *printer_name; int len; - len = strlenW( params->printer ); + len = wcslen( params->printer ); printer_name = malloc( len * 3 + 1 ); ntdll_wcstoumbs( params->printer, len + 1, printer_name, len * 3 + 1, FALSE ); @@ -502,7 +501,7 @@ static BOOL schedule_pipe( const WCHAR *cmd, const WCHAR *filename ) if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( cmd ); + len = wcslen( cmd ); cmdA = malloc( len * 3 + 1); ntdll_wcstoumbs( cmd, len + 1, cmdA, len * 3 + 1, FALSE ); @@ -580,7 +579,7 @@ static BOOL schedule_unixfile( const WCHAR *output, const WCHAR *filename ) if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( output ); + len = wcslen( output ); outputA = malloc( len * 3 + 1); ntdll_wcstoumbs( output, len + 1, outputA, len * 3 + 1, FALSE ); @@ -598,7 +597,7 @@ static BOOL schedule_lpr( const WCHAR *printer_name, const WCHAR *filename ) { static const WCHAR lpr[] = { 'l','p','r',' ','-','P','\'' }; static const WCHAR quote[] = { '\'',0 }; - int printer_len = strlenW( printer_name ); + int printer_len = wcslen( printer_name ); WCHAR *cmd; BOOL ret; @@ -628,11 +627,11 @@ static BOOL schedule_cups( const WCHAR *printer_name, const WCHAR *filename, con BOOL ret; if (!(unixname = get_unix_file_name( filename ))) return FALSE; - len = strlenW( printer_name ); + len = wcslen( printer_name ); queue = malloc( len * 3 + 1); ntdll_wcstoumbs( printer_name, len + 1, queue, len * 3 + 1, FALSE ); - len = strlenW( document_title ); + len = wcslen( document_title ); unix_doc_title = malloc( len * 3 + 1 ); ntdll_wcstoumbs( document_title, len + 1, unix_doc_title, len + 3 + 1, FALSE ); @@ -671,10 +670,10 @@ static NTSTATUS schedule_job( void *args ) if (params->wine_port[0]) return schedule_unixfile( params->wine_port, params->filename ); - if (!strncmpW( params->port, LPR_Port, ARRAY_SIZE(LPR_Port) - 1 )) + if (!wcsncmp( params->port, LPR_Port, ARRAY_SIZE(LPR_Port) - 1 )) return schedule_lpr( params->port + ARRAY_SIZE(LPR_Port) - 1, params->filename ); - if (!strncmpW( params->port, CUPS_Port, ARRAY_SIZE(CUPS_Port) - 1 )) + if (!wcsncmp( params->port, CUPS_Port, ARRAY_SIZE(CUPS_Port) - 1 )) return schedule_cups( params->port + ARRAY_SIZE(CUPS_Port) - 1, params->filename, params->document_title ); return FALSE;

1 0

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

Nov. 30, 2021

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

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

Nov. 30, 2021

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

Paul Gofman : include: Define ISpeechSynthesizer interface.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

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