November 2021 - Wine-devel - list.winehq.org

Re: Alistair Leslie-Hughes : dmime: Parse Wave track stream.
by Michael Stefaniuc 04 Nov '21

04 Nov '21

The sign-off was on my own patch attached to the reply to this patch. Yes, 2am in the morning so I forgot to remove the sign-off as my patch wasn't ready either... bye michael On 11/4/21 23:04, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 854895f70afeeb3c098ff32318353ec4fe7b9bc1 > URL: https://source.winehq.org/git/wine.git/?a=commit;h=854895f70afeeb3c098ff323… > > Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Date: Mon Nov 1 17:30:54 2021 +1100 > > dmime: Parse Wave track stream. > > For Tron 2.0. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > dlls/dmime/dmime_private.h | 6 ++ > dlls/dmime/wavetrack.c | 148 ++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 152 insertions(+), 2 deletions(-) > > diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h > index c2221a15fd2..6ab47292b39 100644 > --- a/dlls/dmime/dmime_private.h > +++ b/dlls/dmime/dmime_private.h > @@ -86,6 +86,12 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { > DMUS_IO_TEMPO_ITEM item; > } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; > > +struct wave_item { > + struct list entry; > + DMUS_IO_WAVE_TRACK_HEADER header; > + IDirectMusicObject *object; > +}; > + > typedef struct _DMUS_PRIVATE_GRAPH_TOOL { > struct list entry; /* for listing elements */ > DWORD dwIndex; > diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c > index 1c6b08b5235..da7ef37d2c8 100644 > --- a/dlls/dmime/wavetrack.c > +++ b/dlls/dmime/wavetrack.c > @@ -20,6 +20,8 @@ > #include "dmime_private.h" > #include "dmobject.h" > > +#include "wine/heap.h" > + > WINE_DEFAULT_DEBUG_CHANNEL(dmime); > > /***************************************************************************** > @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { > IDirectMusicTrack8 IDirectMusicTrack8_iface; > struct dmobject dmobj; /* IPersistStream only */ > LONG ref; > + > + struct list items; > } IDirectMusicWaveTrack; > > /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ > @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr > return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); > } > > +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) > +{ > + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); > +} > + > static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, > void **ret_iface) > { > @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) > TRACE("(%p) ref=%d\n", This, ref); > > if (!ref) { > + struct list *cursor, *cursor2; > + struct wave_item *item; > + > + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { > + item = LIST_ENTRY(cursor, struct wave_item, entry); > + list_remove(cursor); > + > + if (item->object) > + IDirectMusicObject_Release(item->object); > + > + heap_free(item); > + } > + > HeapFree(GetProcessHeap(), 0, This); > DMIME_UnlockModule(); > } > @@ -280,10 +302,131 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { > wave_track_Join > }; > > +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, > + struct chunk_entry *wave, struct wave_item *item) > +{ > + HRESULT hr; > + struct chunk_entry chunk = {.parent = wave}; > + > + if (FAILED(hr = stream_next_chunk(stream, &chunk))) > + return hr; > + > + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) > + { > + struct chunk_entry child = {.parent = &chunk}; > + DMUS_IO_WAVE_ITEM_HEADER header; > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { > + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); > + return hr; > + } > + > + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); > + TRACE(" - lVolume %d\n", header.lVolume); > + TRACE(" - dwVariations %d\n", header.dwVariations); > + TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); > + TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); > + TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); > + TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); > + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); > + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); > + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); > + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); > + TRACE(" - wPitchRange %d\n", header.wPitchRange); > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) > + return hr; > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + > + return SUCCEEDED(hr) ? S_OK : hr; > +} > + > static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) > { > - FIXME(": Loading not implemented yet\n"); > - return S_OK; > + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); > + HRESULT hr; > + struct chunk_entry chunk = {0}; > + > + TRACE("%p, %p\n", This, stream); > + > + if (!stream) > + return E_POINTER; > + > + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) > + return hr; > + > + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) > + { > + struct chunk_entry chunklist = {.parent = &chunk}; > + struct wave_item *item = NULL; > + > + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&chunklist)); > + > + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) > + return hr; > + > + if (chunklist.id != DMUS_FOURCC_WAVETRACK_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); > + if (!item) > + return E_OUTOFMEMORY; > + > + list_add_tail (&This->items, &item->entry); > + > + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) > + return hr; > + > + if (chunklist.id == FOURCC_LIST && chunklist.type == DMUS_FOURCC_WAVEPART_LIST) > + { > + struct chunk_entry child = {.parent = &chunklist}; > + DMUS_IO_WAVE_PART_HEADER header; > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { > + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); > + return hr; > + } > + > + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); > + TRACE(" - lVolume %d\n", header.lVolume); > + TRACE(" - dwVariations %d\n", header.dwVariations); > + TRACE(" - dwPChannel %d\n", header.dwPChannel); > + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); > + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); > + TRACE(" - dwIndex %d\n", header.dwIndex); > + > + if (FAILED(hr = stream_next_chunk(stream, &child))) > + return hr; > + > + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) > + return DMUS_E_UNSUPPORTED_STREAM; > + > + hr = parse_wave_item(This, stream, &child, item); > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + } > + else > + hr = DMUS_E_UNSUPPORTED_STREAM; > + > + return hr; > } > > static const IPersistStreamVtbl persiststream_vtbl = { > @@ -313,6 +456,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) > dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, > (IUnknown *)&track->IDirectMusicTrack8_iface); > track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; > + list_init(&track->items); > > DMIME_LockModule(); > hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); > >

1 0

AppDB: Bug #49999 - It should be possible to submit results for all versions of the current stable branch
by Joerg Schiermeier 04 Nov '21

04 Nov '21

Hi list! According to Austins recommendation to discuss the following bug in Wine-devel I want to do exactly this: it's about: https://bugs.winehq.org/show_bug.cgi?id=49999 The original bug reporter (elk_aide(a)e-mail-address-shortened) wrotes: ---cite--- Lots of Linux Distributions and FreeBSD only ship the stable releases of wine in their repositories. They often stick to the first minor release (In Debian and FreeBSD this currently is 5.0 for example). I think it should be possible to submit tests with the distribution's own most recent wine package, as that probably is the main way wine is aquired. Therefore the AppDB list should include the "outdated" minor releases of the current stable branch for selection aswell. This is currently not the case (only 5.0.2 is available for selection currently). ---/cite--- In my point of view this is not the problem of the wine authors. The maintainer of a distro will have to maintain the (stable) wine packages he/she supervises and should always provide the latest stable version of wine. So there is no need to open this door in the AppDB formula. Consequently I recommended to flag this bug as "wont fix". Austin (English) disagrees and reopens the bug and suggest this discussion thread. So please, write, what you think about this point! (And please excuse also my bad English ...:). -- Kind regards Joerg Schiermeier Bielefeld/Germany

2 1

[PATCH 1/5] winegstreamer: Implement IWMReader::GetOutputFormat().
by Zebediah Figura 04 Nov '21

04 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 11 +++++++---- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6771b590a71..dd5b01b3e5c 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -137,11 +137,14 @@ static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD outp return E_NOTIMPL; } -static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, + DWORD index, IWMOutputMediaProps **props) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + + TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + + return wm_reader_get_output_format(&reader->reader, output, index, props); } static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 148b4f5f373..6fbc2ed6a3e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1419,21 +1419,18 @@ static void test_async_reader_types(void) * with. In particular it has to be PCM. */ hr = IWMReader_GetOutputFormat(reader, output_number, 0, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ret_size = sizeof(mt2_buffer); - hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ret_size = sizeof(mt2_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); - /* The sample size might differ. */ - mt2->lSampleSize = mt->lSampleSize; - ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); - } + /* The sample size might differ. */ + mt2->lSampleSize = mt->lSampleSize; + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); } else { @@ -1553,7 +1550,7 @@ static void test_async_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputFormat(reader, 2, 0, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMReaderAdvanced2_Release(advanced); -- 2.33.0

1 4

Re: [PATCH v2 1/3] include: Rename LDR_WINE_INTERNAL to LDR_WINE_BUILTIN.
by Zebediah Figura 04 Nov '21

04 Nov '21

On 11/4/21 4:31 AM, Alexandre Julliard wrote: > Zebediah Figura <zfigura(a)codeweavers.com> writes: > >> @@ -3394,7 +3394,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT >> >> /* these ones is Wine specific */ >> #define LDR_DONT_RESOLVE_REFS 0x40000000 >> -#define LDR_WINE_INTERNAL 0x80000000 >> +#define LDR_WINE_BUILTIN 0x80000000 > > That doesn't seem necessary. > No, it's not necessary. The idea is that LDR_WINE_INTERNAL is somewhat ambiguous, especially if we're introducing a second sense in which a module can be internally marked, and I wanted to clarify it. I suppose that it's less ambiguous to one who is familiar with the loader code, though. I'll resend the series without this patch.

2 2

[PATCH 1/2] scrrun: Use static sized buffer for drive root.
by Nikolay Sivov 04 Nov '21

04 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d537239b3a1..c42096ae1f6 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -99,7 +99,7 @@ struct drive { struct provideclassinfo classinfo; IDrive IDrive_iface; LONG ref; - BSTR root; + WCHAR root[4]; }; struct folder { @@ -835,10 +835,7 @@ static ULONG WINAPI drive_Release(IDrive *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) - { - SysFreeString(This->root); heap_free(This); - } return ref; } @@ -1134,28 +1131,21 @@ static const IDriveVtbl drivevtbl = { static HRESULT create_drive(WCHAR letter, IDrive **drive) { - struct drive *This; + struct drive *object; *drive = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - This->IDrive_iface.lpVtbl = &drivevtbl; - This->ref = 1; - This->root = SysAllocStringLen(NULL, 3); - if (!This->root) - { - heap_free(This); - return E_OUTOFMEMORY; - } - This->root[0] = letter; - This->root[1] = ':'; - This->root[2] = '\\'; - This->root[3] = 0; + object->IDrive_iface.lpVtbl = &drivevtbl; + object->ref = 1; + wcscpy(object->root, L"A:\\"); + *object->root = letter; + + init_classinfo(&CLSID_Drive, (IUnknown *)&object->IDrive_iface, &object->classinfo); + *drive = &object->IDrive_iface; - init_classinfo(&CLSID_Drive, (IUnknown *)&This->IDrive_iface, &This->classinfo); - *drive = &This->IDrive_iface; return S_OK; } -- 2.33.0

1 1

[PATCH] kerberos: Fix expiry time conversion.
by Dmitry Timoshkov 04 Nov '21

04 Nov '21

This got broken during transition to unixlib interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index a735a1c6a47..c66557efcca 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -477,6 +477,7 @@ static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) NtQuerySystemTime( &time ); RtlSystemTimeToLocalTime( &time, &time ); + time.QuadPart += expirytime; timestamp->LowPart = time.QuadPart; timestamp->HighPart = time.QuadPart >> 32; } -- 2.33.1

2 3

[PATCH v3 1/2] ntdll: Allow loading system DLLs from a path specified at configure time.
by Zebediah Figura 04 Nov '21

04 Nov '21

Many distributions provide MinGW-compiled system DLLs which are currently bundled with Wine. Unfortunately, while MinGW pkg-config can be used to detect the linking path, there is no standardized runtime path, and many distributions in fact use different paths. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Use AC_ARG_WITH instead of AC_ARG_VAR, and pass the path via the top-level makefile rather than config.h. Makefile.in | 1 + configure.ac | 3 +++ dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 10 ++++++++-- dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/unix_private.h | 1 + 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 42f161e3af9..c4b0fbda616 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ host_cpu = @host_cpu@ +system_dlldir = @system_dlldir@ SHELL = /bin/sh CC = @CC@ CXX = @CXX@ diff --git a/configure.ac b/configure.ac index 57383fb2e31..77765db0490 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(system-dlldir, AS_HELP_STRING([--with-system-dlldir=DIR],[load external PE dependencies from directory DIR])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -256,6 +257,8 @@ then TARGETFLAGS="-b $host_alias $TARGETFLAGS" fi +AC_SUBST(system_dlldir,"$with_system_dlldir") + dnl Check for flex AC_CHECK_PROGS(FLEX,flex,none) if test "$FLEX" = "none" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index fa2ac1623ea..5b15ab5108f 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -73,5 +73,6 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ + -DSYSTEMDLLDIR=\"${system_dlldir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a9578ae86bf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -95,6 +95,7 @@ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ static ULONG dll_safe_mode = 1; /* dll search mode */ static UNICODE_STRING dll_directory; /* extra path for LdrSetDllDirectory */ +static UNICODE_STRING system_dll_path; /* path to search for system dependency dlls */ static DWORD default_search_flags; /* default flags set by LdrSetDefaultDllDirectories */ static WCHAR *default_load_path; /* default dll search path */ @@ -2981,12 +2982,15 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC struct file_id id; HANDLE mapping = 0; SECTION_IMAGE_INFORMATION image_info; - NTSTATUS nts; + NTSTATUS nts = STATUS_DLL_NOT_FOUND; ULONG64 prev; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (system_dll_path.Buffer) + nts = find_dll_file( system_dll_path.Buffer, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (nts) + nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); if (*pwm) /* found already loaded module */ { @@ -3997,6 +4001,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR load_global_options(); version_init(); + get_env_var( L"WINESYSTEMDLLDIR", 0, &system_dll_path ); + wm = build_main_module(); wm->ldr.LoadCount = -1; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 43a34bf831b..1647603efa5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1296,6 +1296,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_path_var( env, pos, size, "WINEHOMEDIR", home_dir ); add_path_var( env, pos, size, "WINEBUILDDIR", build_dir ); add_path_var( env, pos, size, "WINECONFIGDIR", config_dir ); + add_path_var( env, pos, size, "WINESYSTEMDLLDIR", system_dll_path ); for (i = 0; dll_paths[i]; i++) { sprintf( str, "WINEDLLDIR%u", i ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0ca4b1ea6dd..9fdcc236fb1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -388,6 +388,7 @@ const char *data_dir = NULL; const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; +const char *system_dll_path = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; static HMODULE ntdll_module; @@ -619,6 +620,8 @@ static void init_paths( char *argv[] ) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); } + if (strlen(SYSTEMDLLDIR)) system_dll_path = SYSTEMDLLDIR; + set_dll_path(); set_home_dir(); set_config_dir(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 792cb33710d..01c7cc1c103 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -125,6 +125,7 @@ extern const char *build_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern const char *user_name DECLSPEC_HIDDEN; extern const char **dll_paths DECLSPEC_HIDDEN; +extern const char *system_dll_path DECLSPEC_HIDDEN; extern PEB *peb DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; -- 2.33.0

1 1

[PATCH 1/8] wined3d: Pass a wined3d_device_vk to wined3d_context_vk_create_bo().
by Zebediah Figura 04 Nov '21

04 Nov '21

With the goal of making the context_vk parameter optional, so that we can allocate new BOs from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 10 ++++++---- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/context_vk.c | 11 +++++------ dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 9 ++++++--- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 5 +++-- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..da1302265ca 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -936,7 +936,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if ((map_flags & WINED3D_MAP_DISCARD) && bo->command_buffer_id > context_vk->completed_command_buffer_id) { - if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) + if (wined3d_device_vk_create_bo(device_vk, context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) { bool host_synced = bo->host_synced; list_move_head(&tmp.b.users, &bo->b.users); @@ -1045,6 +1045,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; @@ -1122,7 +1123,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, if (src_bo && !(src_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) { - if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, + if (!(wined3d_device_vk_create_bo(device_vk, context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1142,7 +1143,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, if (dst_bo && (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(map_flags & WINED3D_MAP_DISCARD) && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id))) { - if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + if (!(wined3d_device_vk_create_bo(device_vk, context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) { ERR("Failed to create staging bo.\n"); @@ -1691,7 +1692,8 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, { struct wined3d_bo_vk *bo = &context_vk->vk_so_counter_bo; - if (!wined3d_context_vk_create_bo(context_vk, ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, + if (!wined3d_device_vk_create_bo(wined3d_device_vk(device), context_vk, + ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) ERR("Failed to create counter BO.\n"); for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 55dcd9e67e8..d4efecb2241 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1433,7 +1433,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf else if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + if (!(wined3d_device_vk_create_bo(wined3d_device_vk(resource->device), + context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); return FALSE; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..63de2f0f052 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -330,7 +330,7 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct return block; } -static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, +static bool wined3d_context_vk_create_slab_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); @@ -374,7 +374,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } slab->requested_memory_type = memory_type; - if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); heap_free(slab); @@ -424,10 +424,9 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return true; } -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +BOOL wined3d_device_vk_create_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, + VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkMemoryRequirements memory_requirements; struct wined3d_adapter_vk *adapter_vk; @@ -435,7 +434,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic unsigned int memory_type_idx; VkResult vr; - if (wined3d_context_vk_create_slab_bo(context_vk, size, usage, memory_type, bo)) + if (wined3d_context_vk_create_slab_bo(device_vk, context_vk, size, usage, memory_type, bo)) return TRUE; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5de58c29c9..cdea0ec42cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,7 +655,7 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; - if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, 16, usage, memory_type, &r->bo)) return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); r->buffer_info.buffer = r->bo.vk_buffer; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df42f2d766b..02a5d96346f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4647,6 +4647,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { struct wined3d_texture_vk *dst_texture_vk = wined3d_texture_vk(dst_texture); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); unsigned int dst_level, dst_row_pitch, dst_slice_pitch; struct wined3d_texture_sub_resource *sub_resource; @@ -4722,7 +4723,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, if (!(src_bo = (struct wined3d_bo_vk *)src_bo_addr->buffer_object)) { - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) { ERR("Failed to create staging bo.\n"); @@ -4833,6 +4834,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, unsigned int dst_row_pitch, unsigned int dst_slice_pitch) { struct wined3d_texture_vk *src_texture_vk = wined3d_texture_vk(src_texture); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context->device); struct wined3d_context_vk *context_vk = wined3d_context_vk(context); unsigned int src_level, src_width, src_height, src_depth; struct wined3d_texture_sub_resource *sub_resource; @@ -4919,7 +4921,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, if (!(dst_bo = (struct wined3d_bo_vk *)dst_bo_addr->buffer_object)) { - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) { ERR("Failed to create staging bo.\n"); @@ -5191,6 +5193,7 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk *texture_vk, unsigned int sub_resource_idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_texture_sub_resource *sub_resource; struct wined3d_bo_vk *bo; @@ -5199,7 +5202,7 @@ static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk * if (bo->vk_buffer) return TRUE; - if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sub_resource->size, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) return FALSE; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 374e693b17d..6a88286b861 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -2078,8 +2078,8 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view vk_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; vk_writes[1].pBufferInfo = &buffer_info; - if (!wined3d_context_vk_create_bo(context_vk, sizeof(constants), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &constants_bo)) + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sizeof(constants), + VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &constants_bo)) { ERR("Failed to create constants BO.\n"); goto out; @@ -2213,7 +2213,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { - if (!wined3d_context_vk_create_bo(context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT + if (!wined3d_device_vk_create_bo(device_vk, context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &uav_vk->counter_bo)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..b2525110adc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2642,8 +2642,6 @@ VkCommandBuffer wined3d_context_vk_apply_compute_state(struct wined3d_context_vk VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *context_vk, const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk, bool indexed) DECLSPEC_HIDDEN; void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkImageType vk_image_type, VkImageUsageFlags usage, VkFormat vk_format, unsigned int width, unsigned int height, unsigned int depth, unsigned int sample_count, unsigned int mip_levels, unsigned int layer_count, unsigned int flags, @@ -4094,6 +4092,9 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +BOOL wined3d_device_vk_create_bo(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk, + VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, + struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, -- 2.33.0

3 28

[PATCH v2 1/7] wined3d: Protect access to the Vulkan wined3d_allocator with a mutex.
by Zebediah Figura 04 Nov '21

04 Nov '21

So that it can be accessed from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 9 ++++++ dlls/wined3d/context_vk.c | 52 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 11 +++++++ 3 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..cbf7c94fd3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -521,6 +521,10 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + InitializeCriticalSection(&device_vk->allocator_cs); + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wined3d_device_vk.allocator_cs"); + *device = &device_vk->d; return WINED3D_OK; @@ -538,6 +542,11 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) wined3d_device_cleanup(&device_vk->d); wined3d_allocator_cleanup(&device_vk->allocator); + + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&device_vk->allocator_cs); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..54c5eb6bc24 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -313,27 +313,43 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct struct wined3d_allocator *allocator = &device_vk->allocator; struct wined3d_allocator_block *block; + wined3d_device_vk_allocator_lock(device_vk); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, size); + wined3d_device_vk_allocator_unlock(device_vk); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_vk->c, memory_type, size))) { + wined3d_device_vk_allocator_unlock(device_vk); *vk_memory = VK_NULL_HANDLE; return NULL; } *vk_memory = wined3d_allocator_chunk_vk(block->chunk)->vk_memory; + wined3d_device_vk_allocator_unlock(device_vk); return block; } +static void wined3d_context_vk_free_memory(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + + assert(block->chunk->allocator == &device_vk->allocator); + wined3d_device_vk_allocator_lock(device_vk); + wined3d_allocator_block_free(block); + wined3d_device_vk_allocator_unlock(device_vk); +} + static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; struct wined3d_bo_slab_vk_key key; struct wined3d_bo_slab_vk *slab; @@ -360,6 +376,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context key.usage = usage; key.size = 32 * object_size; + wined3d_device_vk_allocator_lock(device_vk); + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) { slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); @@ -369,27 +387,30 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context { if (!(slab = heap_alloc_zero(sizeof(*slab)))) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to allocate bo slab.\n"); return false; } + if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + { + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to add slab to available tree.\n"); + heap_free(slab); + return false; + } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to create slab bo.\n"); + wine_rb_remove(&context_vk->bo_slab_available, &slab->entry); heap_free(slab); return false; } slab->map = ~0u; - if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) - { - ERR("Failed to add slab to available tree.\n"); - wined3d_context_vk_destroy_bo(context_vk, &slab->bo); - heap_free(slab); - return false; - } - TRACE("Created new bo slab %p.\n", slab); } @@ -407,6 +428,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } } + wined3d_device_vk_allocator_unlock(device_vk); + *bo = slab->bo; bo->memory = NULL; bo->slab = slab; @@ -480,7 +503,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); if (bo->memory) - wined3d_allocator_block_free(bo->memory); + wined3d_context_vk_free_memory(context_vk, bo->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); @@ -574,7 +597,7 @@ BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkIm { VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); if (image->memory) - wined3d_allocator_block_free(image->memory); + wined3d_context_vk_free_memory(context_vk, image->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -688,7 +711,7 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte if (context_vk->completed_command_buffer_id > command_buffer_id) { - wined3d_allocator_block_free(block); + wined3d_context_vk_free_memory(context_vk, block); TRACE("Freed block %p.\n", block); return; } @@ -707,11 +730,14 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, SIZE_T idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + wined3d_device_vk_allocator_lock(device_vk); + if (!slab->map) { key.memory_type = slab->requested_memory_type; @@ -729,6 +755,8 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, } } slab->map |= 1u << idx; + + wined3d_device_vk_allocator_unlock(device_vk); } static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *context_vk, @@ -1000,7 +1028,7 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont case WINED3D_RETIRED_ALLOCATOR_BLOCK_VK: TRACE("Destroying block %p.\n", o->u.block); - wined3d_allocator_block_free(o->u.block); + wined3d_context_vk_free_memory(context_vk, o->u.block); break; case WINED3D_RETIRED_BO_SLAB_SLICE_VK: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..62b92ce7c34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4084,6 +4084,7 @@ struct wined3d_device_vk struct wined3d_null_resources_vk null_resources_vk; struct wined3d_null_views_vk null_views_vk; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; struct wined3d_uav_clear_state_vk uav_clear_state; @@ -4094,6 +4095,16 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +static inline void wined3d_device_vk_allocator_lock(struct wined3d_device_vk *device_vk) +{ + EnterCriticalSection(&device_vk->allocator_cs); +} + +static inline void wined3d_device_vk_allocator_unlock(struct wined3d_device_vk *device_vk) +{ + LeaveCriticalSection(&device_vk->allocator_cs); +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, -- 2.33.0

3 15

[PATCH 1/2] evr/mixer: Pass valid background color parameter to VideoProcessBlt().
by Nikolay Sivov 04 Nov '21

04 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Conversion is using coefficients from SDTV ITU-R BT.601, which matches official dxva2 samples, except for RGB values shift by 16, which I don't see in ITU paper. dlls/evr/mixer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3a2b6830782..2e03535fda3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -95,7 +95,11 @@ struct video_mixer IMFAttributes *internal_attributes; unsigned int mixing_flags; unsigned int is_streaming; - COLORREF bkgnd_color; + struct + { + COLORREF rgba; + DXVA2_AYUVSample16 ayuv; + } bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -1277,7 +1281,6 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) @@ -1329,6 +1332,9 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (SUCCEEDED(hr)) { + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + params.BackgroundColor = mixer->bkgnd_color.ayuv; + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) { @@ -1983,12 +1989,28 @@ static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor return E_POINTER; EnterCriticalSection(&mixer->cs); - *color = mixer->bkgnd_color; + *color = mixer->bkgnd_color.rgba; LeaveCriticalSection(&mixer->cs); return S_OK; } +static void video_mixer_rgb_to_ycbcr(COLORREF rgb, DXVA2_AYUVSample16 *ayuv) +{ + int y, cb, cr, r, g, b; + + r = GetRValue(rgb); g = GetGValue(rgb); b = GetBValue(rgb); + /* Coefficients according to SDTV ITU-R BT.601 */ + y = (77 * r + 150 * g + 29 * b + 128) / 256 + 16; + cb = (-44 * r - 87 * g + 131 * b + 128) / 256 + 128; + cr = (131 * r - 110 * g - 21 * b + 128) / 256 + 128; + + ayuv->Y = y * 0x100; + ayuv->Cb = cb * 0x100; + ayuv->Cr = cr * 0x100; + ayuv->Alpha = 0xffff; +} + static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); @@ -1996,7 +2018,11 @@ static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor TRACE("%p, %#x.\n", iface, color); EnterCriticalSection(&mixer->cs); - mixer->bkgnd_color = color; + if (mixer->bkgnd_color.rgba != color) + { + video_mixer_rgb_to_ycbcr(color, &mixer->bkgnd_color.ayuv); + mixer->bkgnd_color.rgba = color; + } LeaveCriticalSection(&mixer->cs); return S_OK; @@ -2528,6 +2554,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); video_mixer_update_zorder_map(object); + video_mixer_rgb_to_ycbcr(object->bkgnd_color.rgba, &object->bkgnd_color.ayuv); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) { -- 2.33.0

1 1