wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Set the Unix current directory also in the exec process case.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 6ff0bb786c43ac3348dec6a977feb36af8bc4bcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ff0bb786c43ac3348dec6a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 11:44:09 2020 +0200 ntdll: Set the Unix current directory also in the exec process case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49425 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 974ef6b127..804985da4d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -589,7 +589,7 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST { pe_image_info_t pe_info; BOOL is_child_64bit; - int socketfd[2]; + int unixdir, socketfd[2]; char **argv; HANDLE handle; @@ -615,6 +615,8 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST return status; } + unixdir = get_unix_curdir( NtCurrentTeb()->Peb->ProcessParameters ); + if (socketpair( PF_UNIX, SOCK_STREAM, 0, socketfd ) == -1) return STATUS_TOO_MANY_OPENED_FILES; #ifdef SO_PASSCRED else @@ -637,6 +639,7 @@ NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTST if (!status) { if (!(argv = build_argv( cmdline, 2 ))) return STATUS_NO_MEMORY; + fchdir( unixdir ); do { status = exec_wineloader( argv, socketfd[0], is_child_64bit,

1 0

Alexandre Julliard : ntdll: Use unix_to_nt_file_name() to convert Unix paths in RtlGetFullPathName_U().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: c468a36903aea9ddac12b25c93cc5b65f293d6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c468a36903aea9ddac12b25c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 14:36:18 2020 +0200 ntdll: Use unix_to_nt_file_name() to convert Unix paths in RtlGetFullPathName_U(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 129 ------------------------------------------------ dlls/ntdll/ntdll_misc.h | 9 ---- dlls/ntdll/path.c | 129 +++++++----------------------------------------- 3 files changed, 19 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c468a36903aea9ddac12…

1 0

Zebediah Figura : quartz/vmr9: Allow connecting with YUV formats.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 339dbc586a75e24f5015333a16c44c8f1c1d3355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339dbc586a75e24f5015333a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:17 2020 -0500 quartz/vmr9: Allow connecting with YUV formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2641b7a04b..fae824b827 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -696,7 +696,7 @@ static void test_media_types(void) VIDEOINFOHEADER vih = { {0}, {0}, 0, 0, 0, - {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, BI_RGB} + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 0, 0xdeadbeef} }; IEnumMediaTypes *enummt; unsigned int i; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3636d47702..b49b2b67db 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -338,8 +338,6 @@ static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) return S_FALSE; - if (get_bitmap_header(mt)->biCompression != BI_RGB) - return S_FALSE; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Avoid leaking the surface array on connection failure.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 4eb58312d6056a21c54b0cb987439c63c796bf9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb58312d6056a21c54b0cb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:16 2020 -0500 quartz/vmr9: Avoid leaking the surface array on connection failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d4331d321d..3636d47702 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -428,11 +428,14 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE case 32: info.Format = D3DFMT_X8R8G8B8; break; default: FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount); + free(filter->surfaces); return E_INVALIDARG; } info.dwFlags = VMR9AllocFlag_TextureSurface; - return initialize_device(filter, &info, count); + if (FAILED(hr = initialize_device(filter, &info, count))) + free(filter->surfaces); + return hr; } for (i = 0; i < ARRAY_SIZE(formats); ++i) @@ -457,6 +460,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE } } + free(filter->surfaces); return hr; }

1 0

Zebediah Figura : quartz/vmr9: Invert only RGB video.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: c4f92087af906e869253f1d184f414691155d3ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f92087af906e869253f1d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:15 2020 -0500 quartz/vmr9: Invert only RGB video. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bee5a10718..d4331d321d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -279,7 +279,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return hr; } - if (height > 0) + if (height > 0 && bitmap_header->biCompression == BI_RGB) { BYTE *dst = (BYTE *)locked_rect.pBits + (height * locked_rect.Pitch); const BYTE *src = data; @@ -298,6 +298,8 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi BYTE *dst = locked_rect.pBits; const BYTE *src = data; + height = abs(height); + TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", src_pitch, locked_rect.Pitch);

1 0

Zebediah Figura : quartz/vmr9: The source pitch is the width of the Y plane for planar 4:2:0 formats.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 46a6dd0824091ac060b81f346ac7cf0944738c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a6dd0824091ac060b81f34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:14 2020 -0500 quartz/vmr9: The source pitch is the width of the Y plane for planar 4:2:0 formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5c2cf33820..bee5a10718 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -261,7 +261,11 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi width = bitmap_header->biWidth; height = bitmap_header->biHeight; depth = bitmap_header->biBitCount; - src_pitch = ((width * depth / 8) + 3) & ~3; + if (bitmap_header->biCompression == mmioFOURCC('N','V','1','2') + || bitmap_header->biCompression == mmioFOURCC('Y','V','1','2')) + src_pitch = width; + else /* packed YUV (UYVY or YUY2) or RGB */ + src_pitch = ((width * depth / 8) + 3) & ~3; info.rtStart = start_time; info.rtEnd = end_time;

1 0

Zebediah Figura : quartz/vmr9: Align the source pitch to a multiple of 4.
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: d4178020151b9c70affebc31fe354354585dbb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4178020151b9c70affebc31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:13 2020 -0500 quartz/vmr9: Align the source pitch to a multiple of 4. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f81d806705..5c2cf33820 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -211,8 +211,8 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; - unsigned int data_size, width, depth; REFERENCE_TIME start_time, end_time; VMR9PresentationInfo info = {}; D3DLOCKED_RECT locked_rect; @@ -261,6 +261,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi width = bitmap_header->biWidth; height = bitmap_header->biHeight; depth = bitmap_header->biBitCount; + src_pitch = ((width * depth / 8) + 3) & ~3; info.rtStart = start_time; info.rtEnd = end_time; @@ -285,21 +286,21 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { dst -= locked_rect.Pitch; memcpy(dst, src, width * depth / 8); - src += width * depth / 8; + src += src_pitch; } } - else if (locked_rect.Pitch != width * depth / 8) + else if (locked_rect.Pitch != src_pitch) { BYTE *dst = locked_rect.pBits; const BYTE *src = data; TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", - width * depth / 8, locked_rect.Pitch); + src_pitch, locked_rect.Pitch); while (height--) { memcpy(dst, src, width * depth / 8); - src += width * depth / 8; + src += src_pitch; dst += locked_rect.Pitch; } }

1 0

Zebediah Figura : quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 717784efc949da34709a44f46157cbb5b620991a URL: https://source.winehq.org/git/wine.git/?a=commit;h=717784efc949da34709a44f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:12 2020 -0500 quartz/vmr9: Merge VMR9_SendSampleData() into VMR9_DoRenderSample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 155 ++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6b653e5609..f81d806705 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -207,89 +207,41 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); } -static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *info, LPBYTE data, - DWORD size) +static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { - const BITMAPINFOHEADER *bmiHeader = get_bitmap_header(&This->renderer.sink.pin.mt); - HRESULT hr = S_OK; - int width; - int height; - D3DLOCKED_RECT lock; - - TRACE("%p %p %d\n", This, data, size); - - width = bmiHeader->biWidth; - height = bmiHeader->biHeight; - - hr = IDirect3DSurface9_LockRect(info->lpSurf, &lock, NULL, D3DLOCK_DISCARD); - if (FAILED(hr)) - { - ERR("IDirect3DSurface9_LockRect failed (%x)\n",hr); - return hr; - } - - if (height > 0) { - /* Bottom up image needs inverting */ - lock.pBits = (char *)lock.pBits + (height * lock.Pitch); - while (height--) - { - lock.pBits = (char *)lock.pBits - lock.Pitch; - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - } - } - else if (lock.Pitch != width * bmiHeader->biBitCount / 8) - { - WARN("Slow path! %u/%u\n", lock.Pitch, width * bmiHeader->biBitCount/8); - - while (height--) - { - memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); - data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits + lock.Pitch; - } - } - else memcpy(lock.pBits, data, size); - - IDirect3DSurface9_UnlockRect(info->lpSurf); - - hr = IVMRImagePresenter9_PresentImage(This->presenter, This->cookie, info); - return hr; -} - -static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) -{ - struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); - const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; + struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + const BITMAPINFOHEADER *bitmap_header; + unsigned int data_size, width, depth; + REFERENCE_TIME start_time, end_time; VMR9PresentationInfo info = {}; - LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; - REFERENCE_TIME tStart, tStop; + D3DLOCKED_RECT locked_rect; + BYTE *data = NULL; HRESULT hr; + int height; - TRACE("%p %p\n", iface, pSample); + TRACE("filter %p, sample %p.\n", filter, sample); /* It is possible that there is no device at this point */ - if (!This->allocator || !This->presenter) + if (!filter->allocator || !filter->presenter) { ERR("NO PRESENTER!!\n"); return S_FALSE; } - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) - info.dwFlags = VMR9Sample_SrcDstRectsValid; - else - info.dwFlags = VMR9Sample_SrcDstRectsValid | VMR9Sample_TimeValid; + info.dwFlags = VMR9Sample_SrcDstRectsValid; - if (IMediaSample_IsDiscontinuity(pSample) == S_OK) + if (SUCCEEDED(hr = IMediaSample_GetTime(sample, &start_time, &end_time))) + info.dwFlags |= VMR9Sample_TimeValid; + + if (IMediaSample_IsDiscontinuity(sample) == S_OK) info.dwFlags |= VMR9Sample_Discontinuity; - if (IMediaSample_IsPreroll(pSample) == S_OK) + if (IMediaSample_IsPreroll(sample) == S_OK) info.dwFlags |= VMR9Sample_Preroll; - if (IMediaSample_IsSyncPoint(pSample) == S_OK) + if (IMediaSample_IsSyncPoint(sample) == S_OK) info.dwFlags |= VMR9Sample_SyncPoint; /* If we render ourselves, and this is a preroll sample, discard it */ @@ -298,28 +250,73 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return S_OK; } - hr = IMediaSample_GetPointer(pSample, &pbSrcStream); - if (FAILED(hr)) + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) { - ERR("Cannot get pointer to sample data (%x)\n", hr); + ERR("Failed to get pointer to sample data, hr %#x.\n", hr); return hr; } + data_size = IMediaSample_GetActualDataLength(sample); - cbSrcStream = IMediaSample_GetActualDataLength(pSample); + bitmap_header = get_bitmap_header(&filter->renderer.sink.pin.mt); + width = bitmap_header->biWidth; + height = bitmap_header->biHeight; + depth = bitmap_header->biBitCount; - info.rtStart = tStart; - info.rtEnd = tStop; - info.szAspectRatio.cx = This->bmiheader.biWidth; - info.szAspectRatio.cy = This->bmiheader.biHeight; - info.lpSurf = This->surfaces[(++This->cur_surface) % This->num_surfaces]; + info.rtStart = start_time; + info.rtEnd = end_time; + info.szAspectRatio.cx = width; + info.szAspectRatio.cy = height; + info.lpSurf = filter->surfaces[(++filter->cur_surface) % filter->num_surfaces]; - VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); + if (FAILED(hr = IDirect3DSurface9_LockRect(info.lpSurf, &locked_rect, NULL, D3DLOCK_DISCARD))) + { + ERR("Failed to lock surface, hr %#x.\n", hr); + return hr; + } - if (This->renderer.filter.state == State_Paused) + if (height > 0) + { + BYTE *dst = (BYTE *)locked_rect.pBits + (height * locked_rect.Pitch); + const BYTE *src = data; + + TRACE("Inverting image.\n"); + + while (height--) + { + dst -= locked_rect.Pitch; + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + } + } + else if (locked_rect.Pitch != width * depth / 8) { - LeaveCriticalSection(&This->renderer.csRenderLock); + BYTE *dst = locked_rect.pBits; + const BYTE *src = data; + + TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", + width * depth / 8, locked_rect.Pitch); + + while (height--) + { + memcpy(dst, src, width * depth / 8); + src += width * depth / 8; + dst += locked_rect.Pitch; + } + } + else + { + memcpy(locked_rect.pBits, data, data_size); + } + + IDirect3DSurface9_UnlockRect(info.lpSurf); + + hr = IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); + + if (filter->renderer.filter.state == State_Paused) + { + LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); - EnterCriticalSection(&This->renderer.csRenderLock); + EnterCriticalSection(&filter->renderer.csRenderLock); } return hr;

1 0

Alexandre Julliard : Wine release 5.11
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: website Branch: master Commit: 435b3c26ceef83603d381127e47ad6514ce39e5a URL: https://source.winehq.org/git/website.git/?a=commit;h=435b3c26ceef83603d381… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 21:49:11 2020 +0200 Wine release 5.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020061901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020061901.xml b/news/en/2020061901.xml new file mode 100644 index 00000000..20d603bd --- /dev/null +++ b/news/en/2020061901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 19, 2020</date> +<title>Wine 5.11 Released</title> +<body> + The Wine development release 5.11 is now available. + <a href="{$root}/announce/5.11">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.0, with WpfGfx library support.</li> + <li>More work on the separate Unix library for NTDLL.</li> + <li>Beginnings of a NetIO kernel driver implementation.</li> + <li>Initial support for the Print Ticket API.</li> + <li>Removal of the obsolete 32-bit PowerPC architecture.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.11 : Alexandre Julliard : Release 5.11
by Alexandre Julliard 19 Jun '20

19 Jun '20

Module: wine Branch: refs/tags/wine-5.11 Tag: c976e691dc828ab39410f70458662bbebc112f98 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c976e691dc828ab39410f704586… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 21:47:21 2020 +0200 Release 5.11

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020