July 2019 - Wine-devel - list.winehq.org

[PATCH 1/3] ntdll: Fix sysfs path for the product name.
by Hans Leidekker 02 Jul '19

02 Jul '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0dc06f971b..2a2bd4fd60 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2093,7 +2093,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); -- 2.11.0

2 1

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban 02 Jul '19

02 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban 02 Jul '19

02 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

2 1

Broken WoW builds
by Francois Gouget 02 Jul '19

02 Jul '19

So as far as I can tell the following patch broke the WoW builds: commit a1cdcc5290618c00d73e7a71aaa38897ec501138 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:28:35 2019 +0200 ntoskrnl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> That is, after this patch, I get a crash in mountmgr.sys when creating the wineprefix (see attached backtrace). Maybe I'm missing something. Anyway, this is why the TestBot has been failing all patches for a while: all patches are tested against wow32 and wow64 builds but those were unable to run the tests. So for now I have disabled testing on the wow builds. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH 1/3] kernel32/tests: Add more debugger tests.
by Jacek Caban 02 Jul '19

02 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 270 ++++++++++++++++++++++++++++++--- 1 file changed, 248 insertions(+), 22 deletions(-)

2 1

[PATCH] msvcrt: Add '-norelay' flag for _vsnprintf().
by Dmitry Timoshkov 02 Jul '19

02 Jul '19

Otherwise for instance +relay,+msi log has msi: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcrt/msvcrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3dddf8a473..ed1e72c5e1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1062,7 +1062,7 @@ @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l -- 2.20.1

2 1

[PATCH] kernelbase: Only subtract 2 when strings arent equal.
by Alistair Leslie-Hughes 02 Jul '19

02 Jul '19

Restores code remove from commit 2a455ce049d65eeab95895b6b6d52f6e5047537b. Always subtracting 2 means two strings could never be equal, returning 0. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernelbase/string.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7bea47942e..edc68ed01e 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -67,34 +67,50 @@ static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) int WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 ) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiA(LPCSTR str1, LPCSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } LPSTR WINAPI KERNELBASE_lstrcpynA( LPSTR dst, LPCSTR src, INT n ) -- 2.17.1

3 3

[PATCH] dwrite: Remove unused functions.
by Nikolay Sivov 02 Jul '19

02 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 8 -------- dlls/dwrite/font.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 679e1ed0ff..8e58e615e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1394,14 +1394,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } -static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) -{ - FLOAT advance = 0.0f; - for (; start < end; start++) - advance += advances[start]; - return advance; -} - static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, unsigned int start, unsigned int end, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, DWRITE_SHAPING_GLYPH_PROPERTIES const *glyph_props, float *modified_advances, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4abc7ee6..3f11b1d3ad 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5123,11 +5123,6 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return S_OK; } -static inline int get_dib_stride( int width, int bpp ) -{ - return ((width * bpp + 31) >> 3) & ~3; -} - static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const RECT *runbounds, const RECT *bounds) { if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) -- 2.20.1

2 1

[PATCH] strmbase: Remove unused function.
by Nikolay Sivov 02 Jul '19

02 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/strmbase/pin.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ebc7a1c16b..4478855ed7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -347,11 +347,6 @@ static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); -- 2.20.1

1 0

[PATCH 1/5] strmbase: Remove unused "ThreadSignal" event.
by Zebediah Figura 02 Jul '19

02 Jul '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/renderer.c | 7 ------- include/wine/strmbase.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e295e32f669..ee0473478ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -737,7 +737,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) ResetEvent(This->blocked); ResetEvent(This->renderer.RenderEvent); } - ResetEvent(This->renderer.ThreadSignal); LeaveCriticalSection(&This->renderer.csRenderLock); return hr; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b35011ec641..fa4f0f3c93f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -281,7 +281,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); filter->pMediaSample = NULL; @@ -306,7 +305,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->evComplete); - CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); @@ -418,7 +416,6 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); - SetEvent(This->ThreadSignal); SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -438,7 +435,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); - ResetEvent(This->ThreadSignal); if (This->sink.pin.pConnectedTo) { @@ -496,7 +492,6 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) This->filter.state = State_Paused; } } - ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -559,7 +554,6 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->ThreadSignal); SetEvent(iface->RenderEvent); return S_OK; } @@ -569,7 +563,6 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d3df095fde7..5892efcf197 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -541,7 +541,6 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; - HANDLE ThreadSignal; HANDLE RenderEvent; IMediaSample *pMediaSample; -- 2.22.0

2 9