February 2021 - Wine-commits

Alexandre Julliard : resutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 170c5526ca0aae0f788e9100e5628aab8908a2c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=170c5526ca0aae0f788e9100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:50:16 2021 +0100 resutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/resutils/Makefile.in | 5 +---- dlls/resutils/resutils.c | 48 ----------------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in index f5c43f88d1f..1d6c0777d01 100644 --- a/dlls/resutils/Makefile.in +++ b/dlls/resutils/Makefile.in @@ -1,7 +1,4 @@ MODULE = resutils.dll IMPORTLIB = resutils -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - resutils.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/resutils/resutils.c b/dlls/resutils/resutils.c deleted file mode 100644 index b9e3c66fa1a..00000000000 --- a/dlls/resutils/resutils.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * resutils main - * - * Copyright 2006 Benjamin Arai (Google) - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(resutils); - -/*********************************************************************** - * DllMain (RESUTILS.@) - * - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : rtutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 5d4148e80b0c5ef743d82686d63865d6ac9a6eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4148e80b0c5ef743d82686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:22 2021 +0100 rtutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtutils/Makefile.in | 3 +-- dlls/rtutils/main.c | 47 ----------------------------------------------- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index d778852c9d4..f34937337af 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,8 +1,7 @@ MODULE = rtutils.dll IMPORTLIB = rtutils -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ - main.c \ tracing.c diff --git a/dlls/rtutils/main.c b/dlls/rtutils/main.c deleted file mode 100644 index 009101a5517..00000000000 --- a/dlls/rtutils/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * rtutils main - * - * Copyright 2009 Alexander Scott-Johns - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rtutils); - -/*********************************************************************** - * DllMain (RTUTILS.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : samlib: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 597db385cadca1c6ad690648ae21074419bc793a URL: https://source.winehq.org/git/wine.git/?a=commit;h=597db385cadca1c6ad690648… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:35 2021 +0100 samlib: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/samlib/Makefile.in | 5 +---- dlls/samlib/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/samlib/Makefile.in b/dlls/samlib/Makefile.in index 1ca2a4a6604..6b4a15f25e4 100644 --- a/dlls/samlib/Makefile.in +++ b/dlls/samlib/Makefile.in @@ -1,6 +1,3 @@ MODULE = samlib.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/samlib/main.c b/dlls/samlib/main.c deleted file mode 100644 index a1af3c986fd..00000000000 --- a/dlls/samlib/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010 Louis Lenders - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(samlib); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : sas: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 9d7a681d9bcb216809b4a0af09faee0a57cb21b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7a681d9bcb216809b4a0af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:48 2021 +0100 sas: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sas/Makefile.in | 5 +---- dlls/sas/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/sas/Makefile.in b/dlls/sas/Makefile.in index 9a3a8de5030..a21e053b6c4 100644 --- a/dlls/sas/Makefile.in +++ b/dlls/sas/Makefile.in @@ -1,6 +1,3 @@ MODULE = sas.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sas/main.c b/dlls/sas/main.c deleted file mode 100644 index a7e9b8b8476..00000000000 --- a/dlls/sas/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 Louis Lenders - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sas); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : scarddlg: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 2f206a4388ec8141be4a3a1c22ca40501d808bf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f206a4388ec8141be4a3a1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:52:03 2021 +0100 scarddlg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scarddlg/Makefile.in | 5 +---- dlls/scarddlg/main.c | 48 ----------------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in index 5b69e5d4074..0a5f1dd9b16 100644 --- a/dlls/scarddlg/Makefile.in +++ b/dlls/scarddlg/Makefile.in @@ -1,6 +1,3 @@ MODULE = scarddlg.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c deleted file mode 100644 index c39782e0fed..00000000000 --- a/dlls/scarddlg/main.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Implementation of the SCardDlg Interface - * - * Copyright 2011 Stefan Leichter - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wfext.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scarddlg); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : sfc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: f9ca7b59a41b096da2b3a6a3d11419a0f2adf424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ca7b59a41b096da2b3a6a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:07 2021 +0100 sfc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/Makefile.in | 4 +--- dlls/sfc/sfc_main.c | 54 ---------------------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 942d801f3ed..3a557a4b6f2 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -2,6 +2,4 @@ MODULE = sfc.dll IMPORTLIB = sfc IMPORTS = sfc_os -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = sfc_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sfc/sfc_main.c b/dlls/sfc/sfc_main.c deleted file mode 100644 index 58957c89371..00000000000 --- a/dlls/sfc/sfc_main.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Implementation of the System File Checker (Windows File Protection) - * - * Copyright 2006 Detlef Riekenberg - * - * This file contains only stubs to get the localspl.dll up and running - * - * 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 - */ - -/* - * Moved to sfc_os.dll since XP - * - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sfc); - -/****************************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : srclient: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d428965cf27b0ed9bb04d0382e15835e328562af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d428965cf27b0ed9bb04d038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:24 2021 +0100 srclient: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srclient/Makefile.in | 5 +---- dlls/srclient/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in index 48aab4dd67c..1d2391bf582 100644 --- a/dlls/srclient/Makefile.in +++ b/dlls/srclient/Makefile.in @@ -1,6 +1,3 @@ MODULE = srclient.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c deleted file mode 100644 index 98832a97585..00000000000 --- a/dlls/srclient/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 Louis Lenders - * - * 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 <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(srclient); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Zebediah Figura : winegstreamer: Manually track read offsets in the media source.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 38330678a0e92db67ccf8ba4329e4449c2fa0681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38330678a0e92db67ccf8ba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:23 2021 -0600 winegstreamer: Manually track read offsets in the media source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a9a85cf4d4b..ffbf8041ed8 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -111,6 +111,8 @@ struct media_source SOURCE_SHUTDOWN, } state; HANDLE no_more_pads_event; + + uint64_t file_size, next_pull_offset; }; static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -449,11 +451,12 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); - if (ofs != GST_BUFFER_OFFSET_NONE) - { - if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) - return GST_FLOW_ERROR; - } + if (ofs == GST_BUFFER_OFFSET_NONE) + ofs = source->next_pull_offset; + source->next_pull_offset = ofs + len; + + if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) + return GST_FLOW_ERROR; if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) return GST_FLOW_ERROR; @@ -1244,6 +1247,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object; gint64 total_pres_time = 0; DWORD bytestream_caps; + uint64_t file_size; unsigned int i; HRESULT hr; int ret; @@ -1257,6 +1261,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return MF_E_BYTESTREAM_NOT_SEEKABLE; } + if (FAILED(hr = IMFByteStream_GetLength(bytestream, &file_size))) + { + FIXME("Failed to get byte stream length, hr %#x.\n", hr); + return hr; + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -1266,6 +1276,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ object->byte_stream = bytestream; IMFByteStream_AddRef(bytestream); object->no_more_pads_event = CreateEventA(NULL, FALSE, FALSE, NULL); + object->file_size = file_size; if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) goto fail;

1 0

Zebediah Figura : winegstreamer: Manage our own thread for read requests in the media source.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: b44d3a3908b949332487635b65ab24a98370484a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44d3a3908b949332487635b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:24 2021 -0600 winegstreamer: Manage our own thread for read requests in the media source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 139 +++++++++++++++++++++++++++++++++----- 1 file changed, 121 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ffbf8041ed8..6fb2c7f6f48 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -113,6 +113,21 @@ struct media_source HANDLE no_more_pads_event; uint64_t file_size, next_pull_offset; + + HANDLE read_thread; + bool read_thread_shutdown; + + pthread_mutex_t mutex; + pthread_cond_t read_cond, read_done_cond; + struct + { + void *data; + uint64_t offset; + uint32_t size; + bool done; + bool ret; + } read_request; + bool shutdown; }; static inline struct media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -442,42 +457,109 @@ GstFlowReturn bytestream_wrapper_pull(GstPad *pad, GstObject *parent, guint64 of GstBuffer **buf) { struct media_source *source = gst_pad_get_element_private(pad); - IMFByteStream *byte_stream = source->byte_stream; GstBuffer *new_buffer = NULL; - ULONG bytes_read; GstMapInfo info; - BOOL is_eof; - HRESULT hr; + bool ret; TRACE("requesting %u bytes at %s from source %p into buffer %p\n", len, wine_dbgstr_longlong(ofs), source, *buf); if (ofs == GST_BUFFER_OFFSET_NONE) ofs = source->next_pull_offset; source->next_pull_offset = ofs + len; - - if (FAILED(IMFByteStream_SetCurrentPosition(byte_stream, ofs))) - return GST_FLOW_ERROR; - - if (FAILED(IMFByteStream_IsEndOfStream(byte_stream, &is_eof))) - return GST_FLOW_ERROR; - if (is_eof) + if (ofs >= source->file_size) return GST_FLOW_EOS; + if (ofs + len >= source->file_size) + len = source->file_size - ofs; if (!(*buf)) *buf = new_buffer = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); - hr = IMFByteStream_Read(byte_stream, info.data, len, &bytes_read); + + pthread_mutex_lock(&source->mutex); + + assert(!source->read_request.data); + source->read_request.data = info.data; + source->read_request.offset = ofs; + source->read_request.size = len; + source->read_request.done = false; + pthread_cond_signal(&source->read_cond); + + /* Note that we don't unblock this wait on GST_EVENT_FLUSH_START. We expect + * the upstream pin to flush if necessary. We should never be blocked on + * read_thread() not running. */ + + while (!source->read_request.done) + pthread_cond_wait(&source->read_done_cond, &source->mutex); + + ret = source->read_request.ret; + + pthread_mutex_unlock(&source->mutex); + gst_buffer_unmap(*buf, &info); - gst_buffer_set_size(*buf, bytes_read); + if (!ret && new_buffer) + gst_buffer_unref(new_buffer); + return ret ? GST_FLOW_OK : GST_FLOW_ERROR; +} + +static bool get_read_request(struct media_source *source, void **data, uint64_t *offset, uint32_t *size) +{ + pthread_mutex_lock(&source->mutex); + + while (!source->shutdown && !source->read_request.data) + pthread_cond_wait(&source->read_cond, &source->mutex); + + if (source->shutdown) + { + pthread_mutex_unlock(&source->mutex); + return false; + } + + *data = source->read_request.data; + *offset = source->read_request.offset; + *size = source->read_request.size; + + pthread_mutex_unlock(&source->mutex); + return true; +} + +static void complete_read_request(struct media_source *source, bool ret) +{ + pthread_mutex_lock(&source->mutex); + source->read_request.done = true; + source->read_request.ret = ret; + source->read_request.data = NULL; + pthread_mutex_unlock(&source->mutex); + pthread_cond_signal(&source->read_done_cond); +} - if (FAILED(hr)) +static DWORD CALLBACK read_thread(void *arg) +{ + struct media_source *source = arg; + IMFByteStream *byte_stream = source->byte_stream; + + TRACE("Starting read thread for media source %p.\n", source); + + while (!source->read_thread_shutdown) { - if (new_buffer) - gst_buffer_unref(new_buffer); - return GST_FLOW_ERROR; + uint64_t offset; + ULONG ret_size; + uint32_t size; + HRESULT hr; + void *data; + + if (!get_read_request(source, &data, &offset, &size)) + continue; + + if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset))) + hr = IMFByteStream_Read(byte_stream, data, size, &ret_size); + if (SUCCEEDED(hr) && ret_size != size) + ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size); + complete_read_request(source, SUCCEEDED(hr)); } - return GST_FLOW_OK; + + TRACE("Media source is shutting down; exiting.\n"); + return 0; } static gboolean bytestream_query(GstPad *pad, GstObject *parent, GstQuery *query) @@ -1164,6 +1246,21 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) IMFMediaStream_Release(&stream->IMFMediaStream_iface); } + if (source->read_thread) + { + source->read_thread_shutdown = true; + pthread_mutex_lock(&source->mutex); + source->shutdown = true; + pthread_mutex_unlock(&source->mutex); + pthread_cond_signal(&source->read_cond); + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); + } + + pthread_mutex_destroy(&source->mutex); + pthread_cond_destroy(&source->read_cond); + pthread_cond_destroy(&source->read_done_cond); + if (source->stream_count) heap_free(source->streams); @@ -1284,6 +1381,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = MFAllocateWorkQueue(&object->async_commands_queue))) goto fail; + pthread_mutex_init(&object->mutex, NULL); + pthread_cond_init(&object->read_cond, NULL); + pthread_cond_init(&object->read_done_cond, NULL); + + object->read_thread = CreateThread(NULL, 0, read_thread, object, 0, NULL); + object->container = gst_bin_new(NULL); object->bus = gst_bus_new(); gst_bus_set_sync_handler(object->bus, mf_src_bus_watch_wrapper, object, NULL);

1 0

Zebediah Figura : winegstreamer: Explicitly translate the channel mask.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 8697c6c0dbc1b6878a6f070b7d6d851d4972e22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8697c6c0dbc1b6878a6f070b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:25 2021 -0600 winegstreamer: Explicitly translate the channel mask. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 35 +++++++------ dlls/winegstreamer/wg_parser.c | 109 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 129 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 75025fdf7d5..128546a0265 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -128,6 +128,7 @@ struct wg_format } format; uint32_t channels; + uint32_t channel_mask; /* In WinMM format. */ uint32_t rate; } audio; } u; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d85bb02160e..75b1cece095 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -102,20 +102,6 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); -static DWORD channel_mask_from_count(uint32_t count) -{ - switch (count) - { - case 1: return KSAUDIO_SPEAKER_MONO; - case 2: return KSAUDIO_SPEAKER_STEREO; - case 4: return KSAUDIO_SPEAKER_SURROUND; - case 5: return KSAUDIO_SPEAKER_5POINT1 & ~SPEAKER_LOW_FREQUENCY; - case 6: return KSAUDIO_SPEAKER_5POINT1; - case 8: return KSAUDIO_SPEAKER_7POINT1; - default: return 0; - } -} - static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format) { mt->majortype = MEDIATYPE_Audio; @@ -220,7 +206,7 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format * wave_format->Format.wBitsPerSample = depth; wave_format->Format.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); wave_format->Samples.wValidBitsPerSample = depth; - wave_format->dwChannelMask = channel_mask_from_count(format->u.audio.channels); + wave_format->dwChannelMask = format->u.audio.channel_mask; wave_format->SubFormat = is_float ? KSDATAFORMAT_SUBTYPE_IEEE_FLOAT : KSDATAFORMAT_SUBTYPE_PCM; mt->lSampleSize = wave_format->Format.nBlockAlign; } @@ -423,6 +409,25 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo format->u.audio.channels = audio_format->nChannels; format->u.audio.rate = audio_format->nSamplesPerSec; + if (audio_format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + const WAVEFORMATEXTENSIBLE *ext_format = (const WAVEFORMATEXTENSIBLE *)mt->pbFormat; + + format->u.audio.channel_mask = ext_format->dwChannelMask; + } + else + { + if (audio_format->nChannels == 1) + format->u.audio.channel_mask = KSAUDIO_SPEAKER_MONO; + else if (audio_format->nChannels == 2) + format->u.audio.channel_mask = KSAUDIO_SPEAKER_STEREO; + else + { + ERR("Unexpected channel count %u.\n", audio_format->nChannels); + return false; + } + } + for (i = 0; i < ARRAY_SIZE(format_map); ++i) { if (IsEqualGUID(&mt->subtype, format_map[i].subtype) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 272029217a9..2540ecd80df 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -109,11 +109,70 @@ static enum wg_audio_format wg_audio_format_from_gst(GstAudioFormat format) } } +static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) +{ + static const uint32_t position_map[] = + { + SPEAKER_FRONT_LEFT, + SPEAKER_FRONT_RIGHT, + SPEAKER_FRONT_CENTER, + SPEAKER_LOW_FREQUENCY, + SPEAKER_BACK_LEFT, + SPEAKER_BACK_RIGHT, + SPEAKER_FRONT_LEFT_OF_CENTER, + SPEAKER_FRONT_RIGHT_OF_CENTER, + SPEAKER_BACK_CENTER, + 0, + SPEAKER_SIDE_LEFT, + SPEAKER_SIDE_RIGHT, + SPEAKER_TOP_FRONT_LEFT, + SPEAKER_TOP_FRONT_RIGHT, + SPEAKER_TOP_FRONT_CENTER, + SPEAKER_TOP_CENTER, + SPEAKER_TOP_BACK_LEFT, + SPEAKER_TOP_BACK_RIGHT, + 0, + 0, + SPEAKER_TOP_BACK_CENTER, + }; + + if (position < ARRAY_SIZE(position_map)) + return position_map[position]; + return 0; +} + +static uint32_t wg_channel_mask_from_gst(const GstAudioInfo *info) +{ + uint32_t mask = 0, position; + unsigned int i; + + for (i = 0; i < GST_AUDIO_INFO_CHANNELS(info); ++i) + { + if (!(position = wg_channel_position_from_gst(GST_AUDIO_INFO_POSITION(info, i)))) + { + GST_WARNING("Unsupported channel %#x.", GST_AUDIO_INFO_POSITION(info, i)); + return 0; + } + /* Make sure it's also in WinMM order. WinMM mandates that channels be + * ordered, as it were, from least to most significant SPEAKER_* bit. + * Hence we fail if the current channel was already specified, or if any + * higher bit was already specified. */ + if (mask & ~(position - 1)) + { + GST_WARNING("Unsupported channel order."); + return 0; + } + mask |= position; + } + return mask; +} + static void wg_format_from_audio_info(struct wg_format *format, const GstAudioInfo *info) { format->major_type = WG_MAJOR_TYPE_AUDIO; format->u.audio.format = wg_audio_format_from_gst(GST_AUDIO_INFO_FORMAT(info)); format->u.audio.channels = GST_AUDIO_INFO_CHANNELS(info); + format->u.audio.channel_mask = wg_channel_mask_from_gst(info); format->u.audio.rate = GST_AUDIO_INFO_RATE(info); } @@ -273,15 +332,63 @@ static GstAudioFormat wg_audio_format_to_gst(enum wg_audio_format format) } } +static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t mask, uint32_t channel_count) +{ + const uint32_t orig_mask = mask; + unsigned int i; + DWORD bit; + + static const GstAudioChannelPosition position_map[] = + { + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_LFE1, + GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, + GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, + GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, + GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, + GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + GST_AUDIO_CHANNEL_POSITION_TOP_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_LEFT, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_FRONT_RIGHT, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_LEFT, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_CENTER, + GST_AUDIO_CHANNEL_POSITION_TOP_REAR_RIGHT, + }; + + for (i = 0; i < channel_count; ++i) + { + positions[i] = GST_AUDIO_CHANNEL_POSITION_NONE; + if (BitScanForward(&bit, mask)) + { + if (bit < ARRAY_SIZE(position_map)) + positions[i] = position_map[bit]; + else + GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + mask &= ~(1 << bit); + } + else + { + GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + } + } +} + static GstCaps *wg_format_to_caps_audio(const struct wg_format *format) { + GstAudioChannelPosition positions[32]; GstAudioFormat audio_format; GstAudioInfo info; if ((audio_format = wg_audio_format_to_gst(format->u.audio.format)) == GST_AUDIO_FORMAT_UNKNOWN) return NULL; - gst_audio_info_set_format(&info, audio_format, format->u.audio.rate, format->u.audio.channels, NULL); + wg_channel_mask_to_gst(positions, format->u.audio.channel_mask, format->u.audio.channels); + gst_audio_info_set_format(&info, audio_format, format->u.audio.rate, format->u.audio.channels, positions); return gst_audio_info_to_caps(&info); }

1 0