June 2020 - Wine-commits - list.winehq.org

Zebediah Figura : kernel32: Simplify GetPrivateProfileStringW().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: e4b2482e53e3dbce83be1dd1dd9679960184b68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b2482e53e3dbce83be1dd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 21 19:24:10 2020 -0500 kernel32: Simplify GetPrivateProfileStringW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 116 +++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 80 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index f7d64f16a5..02c6fa5efb 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -949,64 +949,6 @@ static INT PROFILE_GetSectionNames( LPWSTR buffer, UINT len ) return buf-buffer; } - -/*********************************************************************** - * PROFILE_GetString - * - * Get a profile string. - * - * Tests with GetPrivateProfileString16, W95a, - * with filled buffer ("****...") and section "set1" and key_name "1" valid: - * section key_name def_val res buffer - * "set1" "1" "x" 43 [data] - * "set1" "1 " "x" 43 [data] (!) - * "set1" " 1 "' "x" 43 [data] (!) - * "set1" "" "x" 1 "x" - * "set1" "" "x " 1 "x" (!) - * "set1" "" " x " 3 " x" (!) - * "set1" NULL "x" 6 "1\02\03\0\0" - * "set1" "" "x" 1 "x" - * NULL "1" "x" 0 "" (!) - * "" "1" "x" 1 "x" - * NULL NULL "" 0 "" - * - * - */ -static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, - LPCWSTR def_val, LPWSTR buffer, UINT len ) -{ - PROFILEKEY *key = NULL; - static const WCHAR empty_strW[] = { 0 }; - - if(!buffer || !len) return 0; - - if (!def_val) def_val = empty_strW; - if (key_name) - { - key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, - len, TRUE ); - TRACE("(%s,%s,%s): returning %s\n", - debugstr_w(section), debugstr_w(key_name), - debugstr_w(def_val), debugstr_w(buffer) ); - return strlenW( buffer ); - } - /* no "else" here ! */ - if (section) - { - INT ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, FALSE); - if (!buffer[0]) /* no luck -> def_val */ - { - PROFILE_CopyEntry(buffer, def_val, len, TRUE); - ret = strlenW(buffer); - } - return ret; - } - buffer[0] = '\0'; - return 0; -} - - /*********************************************************************** * PROFILE_SetString * @@ -1087,45 +1029,59 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, UINT len, LPCWSTR filename ) { + static const WCHAR emptyW[] = {0}; int ret; LPWSTR defval_tmp = NULL; + const WCHAR *p; TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); + if (!buffer || !len) return 0; + if (!def_val) def_val = emptyW; + if (!section) return GetPrivateProfileSectionNamesW( buffer, len, filename ); + /* strip any trailing ' ' of def_val. */ - if (def_val) - { - LPCWSTR p = def_val + strlenW(def_val) - 1; + p = def_val + strlenW(def_val) - 1; - while (p > def_val && *p == ' ') - p--; + while (p > def_val && *p == ' ') p--; - if (p >= def_val) - { - int vlen = (int)(p - def_val) + 1; + if (p >= def_val) + { + int vlen = (int)(p - def_val) + 1; - defval_tmp = HeapAlloc(GetProcessHeap(), 0, (vlen + 1) * sizeof(WCHAR)); - memcpy(defval_tmp, def_val, vlen * sizeof(WCHAR)); - defval_tmp[vlen] = '\0'; - def_val = defval_tmp; - } + defval_tmp = HeapAlloc(GetProcessHeap(), 0, (vlen + 1) * sizeof(WCHAR)); + memcpy(defval_tmp, def_val, vlen * sizeof(WCHAR)); + defval_tmp[vlen] = '\0'; + def_val = defval_tmp; } RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) { - if (section == NULL) - ret = PROFILE_GetSectionNames(buffer, len); - else - /* PROFILE_GetString can handle the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, def_val, buffer, len ); - } else if (buffer && def_val) { + if (PROFILE_Open( filename, FALSE )) + { + if (entry) + { + PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); + TRACE("-> %s\n", debugstr_w( buffer )); + ret = strlenW( buffer ); + } + else + { + ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE ); + if (!buffer[0]) + { + PROFILE_CopyEntry( buffer, def_val, len, TRUE ); + ret = strlenW( buffer ); + } + } + } + else + { lstrcpynW( buffer, def_val, len ); ret = strlenW( buffer ); } - else - ret = 0; RtlLeaveCriticalSection( &PROFILE_CritSect );

1 0

Zebediah Figura : kernel32: Get rid of the last parameter to PROFILE_CopyEntry().
by Alexandre Julliard 22 Jun '20

22 Jun '20

Module: wine Branch: master Commit: 60f344852d06e66e59957675ee94332d0b1e073c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f344852d06e66e59957675… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 21 19:24:11 2020 -0500 kernel32: Get rid of the last parameter to PROFILE_CopyEntry(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 02c6fa5efb..7c50fb9a61 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -101,14 +101,13 @@ static const char hex[16] = "0123456789ABCDEF"; * Copy the content of an entry into a buffer, removing quotes, and possibly * translating environment variables. */ -static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len, - BOOL strip_quote ) +static void PROFILE_CopyEntry( LPWSTR buffer, LPCWSTR value, int len ) { WCHAR quote = '\0'; if(!buffer) return; - if (strip_quote && ((*value == '\'') || (*value == '\"'))) + if (*value == '\'' || *value == '\"') { if (value[1] && (value[strlenW(value)-1] == *value)) quote = *value++; } @@ -877,14 +876,14 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, if (!*key->name && !key->value) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ - PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); + lstrcpynW( buffer, key->name, len - 1 ); len -= strlenW(buffer) + 1; buffer += strlenW(buffer) + 1; if (len < 2) break; if (return_values && key->value) { buffer[-1] = '='; - PROFILE_CopyEntry ( buffer, key->value, len - 1, 0 ); + lstrcpynW( buffer, key->value, len - 1 ); len -= strlenW(buffer) + 1; buffer += strlenW(buffer) + 1; } @@ -1063,7 +1062,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, if (entry) { PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section, entry, FALSE, FALSE ); - PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len, TRUE ); + PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, len ); TRACE("-> %s\n", debugstr_w( buffer )); ret = strlenW( buffer ); } @@ -1072,7 +1071,7 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, ret = PROFILE_GetSection( CurProfile->section, section, buffer, len, FALSE ); if (!buffer[0]) { - PROFILE_CopyEntry( buffer, def_val, len, TRUE ); + PROFILE_CopyEntry( buffer, def_val, len ); ret = strlenW( buffer ); } }

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

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: 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: 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: 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: 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

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

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