December 2022 - Wine-commits

Piotr Caban : winprint: Fix datatype validation in PrintDocumentOnPrintProcessor.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: c8d28f270272133cb17ade93d2fe2dba2ab7e22b URL: https://gitlab.winehq.org/wine/wine/-/commit/c8d28f270272133cb17ade93d2fe2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 18:42:59 2022 +0100 winprint: Fix datatype validation in PrintDocumentOnPrintProcessor. --- dlls/winprint/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c index 8ea3557b3bc..03275bb4afb 100644 --- a/dlls/winprint/printproc.c +++ b/dlls/winprint/printproc.c @@ -111,7 +111,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!wcscmp(open_data->pDatatype, L"RAW")) + if (wcscmp(open_data->pDatatype, L"RAW")) { SetLastError(ERROR_INVALID_DATATYPE); return NULL;

1 0

Piotr Caban : wineps: Add print processor stub.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 4dca25432422c869200b357523c40d2e35fbd8cb URL: https://gitlab.winehq.org/wine/wine/-/commit/4dca25432422c869200b357523c40d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 22 21:18:54 2022 +0200 wineps: Add print processor stub. --- dlls/wineps.drv/Makefile.in | 1 + dlls/wineps.drv/printproc.c | 66 +++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/wineps.drv.spec | 7 +++++ 3 files changed, 74 insertions(+) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index c7282d8a06e..52eb27923d9 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -55,6 +55,7 @@ C_SRCS = \ init.c \ pen.c \ ppd.c \ + printproc.c \ ps.c \ text.c \ type1.c \ diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c new file mode 100644 index 00000000000..287dac9a0cf --- /dev/null +++ b/dlls/wineps.drv/printproc.c @@ -0,0 +1,66 @@ +/* + * Print processor implementation. + * + * Copyright 2022 Piotr Caban 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 + */ + +#include <stdio.h> + +#include <windows.h> +#include <winspool.h> +#include <ddk/winsplp.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(psdrv); + +BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level, + BYTE *datatypes, DWORD size, DWORD *needed, DWORD *no) +{ + FIXME("%s, %s, %ld, %p, %ld, %p, %p\n", debugstr_w(server), debugstr_w(name), + level, datatypes, size, needed, no); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) +{ + FIXME("%s, %p\n", debugstr_w(port), open_data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE pp, WCHAR *doc_name) +{ + FIXME("%p, %s\n", pp, debugstr_w(doc_name)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI ControlPrintProcessor(HANDLE pp, DWORD cmd) +{ + FIXME("%p, %ld\n", pp, cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI ClosePrintProcessor(HANDLE pp) +{ + FIXME("%p\n", pp); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 365965c69cf..741212786e5 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -3,3 +3,10 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) @ stdcall DrvDocumentPropertySheets(ptr long) + +# Print processor exports +@ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) +@ stdcall OpenPrintProcessor(ptr ptr) +@ stdcall PrintDocumentOnPrintProcessor(ptr ptr) +@ stdcall ControlPrintProcessor(ptr long) +@ stdcall ClosePrintProcessor(ptr)

1 0

Piotr Caban : localspl: Add support for Port handles.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 6bb5bb4486c376f3730d7750b87b3b4cab8de535 URL: https://gitlab.winehq.org/wine/wine/-/commit/6bb5bb4486c376f3730d7750b87b3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 2 14:39:25 2022 +0100 localspl: Add support for Port handles. --- dlls/localspl/provider.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f3881ba7269..79a68729b3e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,6 +245,7 @@ typedef struct { HANDLE_SERVER, HANDLE_PRINTER, HANDLE_XCV, + HANDLE_PORT, HANDLE_JOB, } type; } handle_header_t; @@ -257,6 +258,12 @@ typedef struct { HANDLE hxcv; } xcv_t; +typedef struct { + handle_header_t header; + monitor_t *mon; + HANDLE hport; +} port_t; + typedef struct { handle_header_t header; HANDLE hf; @@ -1648,6 +1655,66 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * return (HANDLE)xcv; } +static HANDLE port_alloc_handle(const WCHAR *name, BOOL *stop_search) +{ + static const WCHAR portW[] = L"Port"; + + unsigned int i, name_len; + WCHAR *port_name; + port_t *port; + + *stop_search = FALSE; + for (name_len = 0; name[name_len] != ','; name_len++) + { + if (!name[name_len]) + return NULL; + } + + for (i = name_len + 1; name[i] == ' '; i++); + if (wcscmp(name + i, portW)) + return NULL; + + *stop_search = TRUE; + port_name = malloc((name_len + 1) * sizeof(WCHAR)); + if (!port_name) + return NULL; + memcpy(port_name, name, name_len * sizeof(WCHAR)); + port_name[name_len] = 0; + + port = calloc(1, sizeof(*port)); + if (!port) + { + free(port_name); + return NULL; + } + port->header.type = HANDLE_PORT; + + port->mon = monitor_load_by_port(port_name); + if (!port->mon) + { + free(port_name); + free(port); + return NULL; + } + if (!port->mon->monitor.pfnOpenPort || !port->mon->monitor.pfnWritePort + || !port->mon->monitor.pfnClosePort) + { + FIXME("port not supported: %s\n", debugstr_w(name)); + free(port_name); + fpClosePrinter((HANDLE)port); + return NULL; + } + + port->mon->monitor.pfnOpenPort(port->mon->hmon, port_name, &port->hport); + free(port_name); + if (!port->hport) + { + fpClosePrinter((HANDLE)port); + return NULL; + } + return (HANDLE)port; +} + static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) { static const WCHAR jobW[] = L"Job "; @@ -1658,7 +1725,6 @@ static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) job_t *job; *stop_search = FALSE; - name_len = 0; for (name_len = 0; name[name_len] != ','; name_len++) { if (!name[name_len]) @@ -2764,6 +2830,8 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter, *hprinter = server_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = xcv_alloc_handle(basename, def, &stop_search); + if (!*hprinter && !stop_search) + *hprinter = port_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = job_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) @@ -3553,6 +3621,16 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) monitor_unload(xcv->pm); free(xcv); } + else if (header->type == HANDLE_PORT) + { + port_t *port = (port_t *)hprinter; + + if (port->hport) + port->mon->monitor.pfnClosePort(port->hport); + if (port->mon) + monitor_unload(port->mon); + free(port); + } else if (header->type == HANDLE_JOB) { job_t *job = (job_t *)hprinter;

1 0

Piotr Caban : localspl: Support Port handles in WritePrinter.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 62e017c91b1edbe46c55bfff3af7a4e1d02962fe URL: https://gitlab.winehq.org/wine/wine/-/commit/62e017c91b1edbe46c55bfff3af7a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 2 14:47:27 2022 +0100 localspl: Support Port handles in WritePrinter. --- dlls/localspl/provider.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 79a68729b3e..7ac171892d3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3223,23 +3223,38 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD *written) { - printer_t *printer = (printer_t *)hprinter; + handle_header_t *header = (handle_header_t *)hprinter; TRACE("(%p, %p, %ld, %p)\n", hprinter, buf, size, written); - if(!printer || printer->header.type != HANDLE_PRINTER) + if (!header) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if(!printer->doc) + if (header->type == HANDLE_PORT) { - SetLastError(ERROR_SPL_NO_STARTDOC); - return FALSE; + port_t *port = (port_t *)hprinter; + + return port->mon->monitor.pfnWritePort(port->hport, buf, size, written); + } + + if (header->type == HANDLE_PRINTER) + { + printer_t *printer = (printer_t *)hprinter; + + if (!printer->doc) + { + SetLastError(ERROR_SPL_NO_STARTDOC); + return FALSE; + } + + return WriteFile(printer->doc->hf, buf, size, written, NULL); } - return WriteFile(printer->doc->hf, buf, size, written, NULL); + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; } static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id,

1 0

Piotr Caban : localspl: Partially support Port handles in StartDocPrinter.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: f079c02ff78a49580b5132e12ee5fee12fe87bcb URL: https://gitlab.winehq.org/wine/wine/-/commit/f079c02ff78a49580b5132e12ee5fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 3 19:08:22 2022 +0100 localspl: Partially support Port handles in StartDocPrinter. --- dlls/localspl/provider.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7ac171892d3..7336dbaa705 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1697,7 +1697,7 @@ static HANDLE port_alloc_handle(const WCHAR *name, BOOL *stop_search) return NULL; } if (!port->mon->monitor.pfnOpenPort || !port->mon->monitor.pfnWritePort - || !port->mon->monitor.pfnClosePort) + || !port->mon->monitor.pfnClosePort || !port->mon->monitor.pfnStartDocPort) { FIXME("port not supported: %s\n", debugstr_w(name)); free(port_name); @@ -3199,7 +3199,21 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in hprinter, level, doc_info, debugstr_w(info->pDocName), debugstr_w(info->pOutputFile), debugstr_w(info->pDatatype)); - if (!printer || printer->header.type != HANDLE_PRINTER) + if (!printer) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (printer->header.type == HANDLE_PORT) + { + port_t *port = (port_t *)hprinter; + /* TODO: pass printer name and job_id */ + return port->mon->monitor.pfnStartDocPort(port->hport, + NULL, 0, level, doc_info); + } + + if (printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0;

1 0

Alexandre Julliard : winebuild: Reinstate the __wine_spec_dll_entry() entrypoint for .so dlls.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: c20741b33a669f4a2a2d84908c17024043eb208a URL: https://gitlab.winehq.org/wine/wine/-/commit/c20741b33a669f4a2a2d84908c1702… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 3 16:12:16 2022 +0100 winebuild: Reinstate the __wine_spec_dll_entry() entrypoint for .so dlls. --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/dll_entry.c | 35 +++++++++++++++++++++++++++++++++++ tools/winebuild/main.c | 6 +++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 17da4da29c6..1faed0827ec 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ debug.c \ delay_load.c \ dll_canunload.c \ + dll_entry.c \ dll_main.c \ dll_register.c \ exception.c \ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c new file mode 100644 index 00000000000..1c7fe676c2c --- /dev/null +++ b/dlls/winecrt0/dll_entry.c @@ -0,0 +1,35 @@ +/* + * Default entry point for a .so dll + * + * Copyright 2022 Alexandre Julliard + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +/* this is actually part of a static lib linked into a .dll.so module, not a real Unix library */ +#undef WINE_UNIX_LIB + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + return DllMain( inst, reason, reserved ); +} diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 875bf45f0a1..aae223f9e57 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -340,7 +340,11 @@ static void set_exec_mode( enum exec_mode_values mode ) /* get the default entry point for a given spec file */ static const char *get_default_entry_point( const DLLSPEC *spec ) { - if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; + if (spec->characteristics & IMAGE_FILE_DLL) + { + add_spec_extra_ld_symbol("DllMain"); + return "__wine_spec_dll_entry"; + } if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) {

1 0

Alexandre Julliard : ntdll: Move the .so module initialization to winecrt0.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: bef09697227c29f53bb0ad95232399cbba5c9c6b URL: https://gitlab.winehq.org/wine/wine/-/commit/bef09697227c29f53bb0ad95232399… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 3 16:13:54 2022 +0100 ntdll: Move the .so module initialization to winecrt0. Use new ELF tag ids to avoid breaking backwards compatibility. --- configure | 6 ++ configure.ac | 2 +- dlls/ntdll/loader.c | 3 - dlls/ntdll/unix/loader.c | 85 ----------------------------- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 1 - dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/dll_entry.c | 3 + dlls/winecrt0/dll_soinit.c | 121 +++++++++++++++++++++++++++++++++++++++++ dlls/winecrt0/exe_entry.c | 2 + dlls/winecrt0/exe_wentry.c | 2 + include/config.h.in | 3 + tools/winebuild/spec32.c | 6 +- 14 files changed, 143 insertions(+), 95 deletions(-)

1 0

Alexandre Julliard : ntdll: Initialize Unix calls early during startup.
by Alexandre Julliard 05 Dec '22

05 Dec '22

Module: wine Branch: master Commit: 0538557512dd9785e9a9a92474c1e4cebc32cf25 URL: https://gitlab.winehq.org/wine/wine/-/commit/0538557512dd9785e9a9a92474c1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 4 22:01:38 2022 +0100 ntdll: Initialize Unix calls early during startup. --- dlls/ntdll/loader.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6484c0b312e..895a3f5b138 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2187,22 +2187,17 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, * * Build the module data for the initially-loaded ntdll. */ -static void build_ntdll_module(void) +static void build_ntdll_module( HMODULE module ) { - MEMORY_BASIC_INFORMATION meminfo; UNICODE_STRING nt_name; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, - &meminfo, sizeof(meminfo), NULL ); - wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); + wm = alloc_module( module, &nt_name, TRUE ); assert( wm ); wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; node_ntdll = wm->ldr.DdagNode; - if (TRACE_ON(relay)) RELAY_SetupDLL( meminfo.AllocationBase ); - NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, - &ntdll_unix_handle, sizeof(ntdll_unix_handle), NULL ); + if (TRACE_ON(relay)) RELAY_SetupDLL( module ); } @@ -4112,10 +4107,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR if (!imports_fixup_done) { + MEMORY_BASIC_INFORMATION meminfo; ANSI_STRING func_name; WINE_MODREF *kernel32; PEB *peb = NtCurrentTeb()->Peb; + NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, + &meminfo, sizeof(meminfo), NULL ); + NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, + &ntdll_unix_handle, sizeof(ntdll_unix_handle), NULL ); + peb->LdrData = &ldr; peb->FastPebLock = &peb_lock; peb->TlsBitmap = &tls_bitmap; @@ -4137,7 +4138,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR wm = build_main_module(); wm->ldr.LoadCount = -1; - build_ntdll_module(); + build_ntdll_module( meminfo.AllocationBase ); if (NtCurrentTeb()->WowTebOffset) init_wow64( context );

1 0

Paul Gofman : winegstreamer: Query stream tags and set MF_SD_LANGUAGE attribute.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 3dd56dd6064ca4dae7ee075b58574854f6c18d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dd56dd6064ca4dae7ee075b585748… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 24 16:28:12 2022 -0600 winegstreamer: Query stream tags and set MF_SD_LANGUAGE attribute. Loosely based on a patch by Derek Lesho and Rémi Bernon. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 31 ++++++++++++++++++++ dlls/winegstreamer/media_source.c | 30 +++++++++++++++++++ dlls/winegstreamer/unixlib.h | 15 ++++++++++ dlls/winegstreamer/wg_parser.c | 62 +++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/wm_reader.c | 2 ++ 6 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ee5e6dae3cf..3890db543ff 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -33,7 +33,6 @@ #define NONAMELESSUNION #include "dshow.h" #include "mfidl.h" -#include "wmsdk.h" #include "wine/debug.h" #include "wine/strmbase.h" @@ -96,6 +95,7 @@ void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, /* Returns the duration in 100-nanosecond units. */ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); +char *wg_parser_stream_get_tag(struct wg_parser_stream *stream, enum wg_parser_tag tag); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 9e54780ac4e..2675430019f 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -21,6 +21,9 @@ #define WINE_NO_NAMELESS_EXTENSION #define EXTERN_GUID DEFINE_GUID + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "initguid.h" #include "gst_private.h" #include "winternl.h" @@ -273,6 +276,34 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) return params.duration; } +char *wg_parser_stream_get_tag(struct wg_parser_stream *stream, enum wg_parser_tag tag) +{ + uint32_t size = 0; + struct wg_parser_stream_get_tag_params params = + { + .stream = stream, + .tag = tag, + .size = &size, + }; + char *buffer; + + if (WINE_UNIX_CALL(unix_wg_parser_stream_get_tag, &params) != STATUS_BUFFER_TOO_SMALL) + return NULL; + if (!(buffer = malloc(size))) + { + ERR("No memory.\n"); + return NULL; + } + params.buffer = buffer; + if (WINE_UNIX_CALL(unix_wg_parser_stream_get_tag, &params)) + { + ERR("wg_parser_stream_get_tag failed unexpectedly.\n"); + free(buffer); + return NULL; + } + return buffer; +} + void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) { diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9bb7a441a8f..59047a5ef82 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1481,7 +1481,37 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ descriptors = malloc(object->stream_count * sizeof(IMFStreamDescriptor *)); for (i = 0; i < object->stream_count; i++) { + static const struct + { + enum wg_parser_tag tag; + const GUID *mf_attr; + } + tags[] = + { + {WG_PARSER_TAG_LANGUAGE, &MF_SD_LANGUAGE}, + }; + unsigned int j; + WCHAR *strW; + DWORD len; + char *str; + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + + for (j = 0; j < ARRAY_SIZE(tags); ++j) + { + if (!(str = wg_parser_stream_get_tag(object->streams[i]->wg_stream, tags[j].tag))) + continue; + if (!(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0))) + { + free(str); + continue; + } + strW = malloc(len * sizeof(*strW)); + if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len)) + IMFStreamDescriptor_SetString(descriptors[i], tags[j].mf_attr, strW); + free(strW); + free(str); + } } if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 09aa68eb4cc..f048426b27a 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -252,6 +252,20 @@ struct wg_parser_stream_get_duration_params UINT64 duration; }; +enum wg_parser_tag +{ + WG_PARSER_TAG_LANGUAGE, + WG_PARSER_TAG_COUNT +}; + +struct wg_parser_stream_get_tag_params +{ + struct wg_parser_stream *stream; + enum wg_parser_tag tag; + char *buffer; + UINT32 *size; +}; + struct wg_parser_stream_seek_params { struct wg_parser_stream *stream; @@ -312,6 +326,7 @@ enum unix_funcs unix_wg_parser_stream_notify_qos, unix_wg_parser_stream_get_duration, + unix_wg_parser_stream_get_tag, unix_wg_parser_stream_seek, unix_wg_transform_create, diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 14970d327c8..dc98901c226 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,6 +34,8 @@ #include <gst/video/video.h> #include <gst/audio/audio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winternl.h" #include "dshow.h" @@ -107,9 +109,10 @@ struct wg_parser_stream GstBuffer *buffer; GstMapInfo map_info; - bool flushing, eos, enabled, has_caps; + bool flushing, eos, enabled, has_caps, has_tags, has_buffer; uint64_t duration; + gchar *tags[WG_PARSER_TAG_COUNT]; }; static NTSTATUS wg_parser_get_stream_count(void *args) @@ -397,6 +400,24 @@ static NTSTATUS wg_parser_stream_get_duration(void *args) return S_OK; } +static NTSTATUS wg_parser_stream_get_tag(void *args) +{ + struct wg_parser_stream_get_tag_params *params = args; + uint32_t len; + + if (params->tag >= WG_PARSER_TAG_COUNT) + return STATUS_INVALID_PARAMETER; + if (!params->stream->tags[params->tag]) + return STATUS_NOT_FOUND; + if ((len = strlen(params->stream->tags[params->tag]) + 1) > *params->size) + { + *params->size = len; + return STATUS_BUFFER_TOO_SMALL; + } + memcpy(params->buffer, params->stream->tags[params->tag], len); + return STATUS_SUCCESS; +} + static NTSTATUS wg_parser_stream_seek(void *args) { GstSeekType start_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; @@ -574,6 +595,13 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) break; } + case GST_EVENT_TAG: + pthread_mutex_lock(&parser->mutex); + stream->has_tags = true; + pthread_cond_signal(&parser->init_cond); + pthread_mutex_unlock(&parser->mutex); + break; + default: GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); } @@ -590,6 +618,12 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu pthread_mutex_lock(&parser->mutex); + if (!stream->has_buffer) + { + stream->has_buffer = true; + pthread_cond_signal(&parser->init_cond); + } + /* Allow this buffer to be flushed by GStreamer. We are effectively * implementing a queue object here. */ @@ -756,6 +790,8 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) static void free_stream(struct wg_parser_stream *stream) { + unsigned int i; + if (stream->their_src) { if (stream->post_sink) @@ -771,6 +807,11 @@ static void free_stream(struct wg_parser_stream *stream) pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond); + for (i = 0; i < ARRAY_SIZE(stream->tags); ++i) + { + if (stream->tags[i]) + g_free(stream->tags[i]); + } free(stream); } @@ -1232,6 +1273,19 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } +static void query_tags(struct wg_parser_stream *stream) +{ + GstTagList *tag_list; + GstEvent *tag_event; + + if (!(tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, 0))) + return; + + gst_event_parse_tag(tag_event, &tag_list); + gst_tag_list_get_string(tag_list, "language-code", &stream->tags[WG_PARSER_TAG_LANGUAGE]); + gst_event_unref(tag_event); +} + static NTSTATUS wg_parser_connect(void *args) { GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", @@ -1290,7 +1344,8 @@ static NTSTATUS wg_parser_connect(void *args) struct wg_parser_stream *stream = parser->streams[i]; gint64 duration; - while (!stream->has_caps && !parser->error) + /* If we receieved a buffer waiting for tags or caps does not make sense anymore. */ + while ((!stream->has_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) pthread_cond_wait(&parser->init_cond, &parser->mutex); /* GStreamer doesn't actually provide any guarantees about when duration @@ -1354,6 +1409,8 @@ static NTSTATUS wg_parser_connect(void *args) } } + query_tags(stream); + /* Now that we're fully initialized, enable the stream so that further * samples get queued instead of being discarded. We don't actually need * the samples (in particular, the frontend should seek before @@ -1676,6 +1733,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_notify_qos), X(wg_parser_stream_get_duration), + X(wg_parser_stream_get_tag), X(wg_parser_stream_seek), X(wg_transform_create), diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 804af4a9aed..0e9e7927549 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -17,6 +17,8 @@ */ #include "gst_private.h" +#include "initguid.h" +#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);

1 0

Paul Gofman : winegstreamer: Extract stream name from QT demuxer private data.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 05c99cd6da97d9cb12932df917237b8954d076f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/05c99cd6da97d9cb12932df917237b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 24 18:38:35 2022 -0600 winegstreamer: Extract stream name from QT demuxer private data. --- dlls/winegstreamer/media_source.c | 1 + dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_parser.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 59047a5ef82..542189b28f5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1489,6 +1489,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ tags[] = { {WG_PARSER_TAG_LANGUAGE, &MF_SD_LANGUAGE}, + {WG_PARSER_TAG_NAME, &MF_SD_STREAM_NAME}, }; unsigned int j; WCHAR *strW; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index f048426b27a..2b5b8af37d5 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -255,6 +255,7 @@ struct wg_parser_stream_get_duration_params enum wg_parser_tag { WG_PARSER_TAG_LANGUAGE, + WG_PARSER_TAG_NAME, WG_PARSER_TAG_COUNT }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index dc98901c226..d2db1f039e4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1275,14 +1275,47 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static void query_tags(struct wg_parser_stream *stream) { + const gchar *struct_name; GstTagList *tag_list; GstEvent *tag_event; + guint i, tag_count; + const GValue *val; + GstSample *sample; + GstBuffer *buf; + gsize size; if (!(tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, 0))) return; gst_event_parse_tag(tag_event, &tag_list); gst_tag_list_get_string(tag_list, "language-code", &stream->tags[WG_PARSER_TAG_LANGUAGE]); + + /* Extract stream name from Quick Time demuxer private tag where it puts unrecognized chunks. */ + tag_count = gst_tag_list_get_tag_size(tag_list, "private-qt-tag"); + for (i = 0; i < tag_count; ++i) + { + if (!(val = gst_tag_list_get_value_index(tag_list, "private-qt-tag", i))) + continue; + if (!GST_VALUE_HOLDS_SAMPLE(val) || !(sample = gst_value_get_sample(val))) + continue; + struct_name = gst_structure_get_name(gst_sample_get_info(sample)); + if (!struct_name || strcmp(struct_name, "application/x-gst-qt-name-tag")) + continue; + if (!(buf = gst_sample_get_buffer(sample))) + continue; + if ((size = gst_buffer_get_size(buf)) < 8) + continue; + size -= 8; + if (!(stream->tags[WG_PARSER_TAG_NAME] = g_malloc(size + 1))) + continue; + if (gst_buffer_extract(buf, 8, stream->tags[WG_PARSER_TAG_NAME], size) != size) + { + g_free(stream->tags[WG_PARSER_TAG_NAME]); + stream->tags[WG_PARSER_TAG_NAME] = NULL; + continue; + } + stream->tags[WG_PARSER_TAG_NAME][size] = 0; + } gst_event_unref(tag_event); }

1 0