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

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Hans Leidekker

On Tue, 2019-07-02 at 17:02 +0800, Dmitry Timoshkov wrote: > Where do you see this? Note that this code is inside an #ifdef SONAME_LIBGSSAPI_KRB5 > > block and configure should disable gssapi when it can't detect krb5. This means that > > SONAME_LIBGSSAPI_KRB5 should not be set when SONAME_LIBKRB5 isn't. > > I can confirm that on my system configure undefs SONAME_LIBGSSAPI_KRB5. > > Unfortunately that's not on one of my machines. According to the reporter, > configure fails to find libkrb55.so but successfully locates libgssapi.so, > and configure log confirms that. Sounds like a broken install. To fix this I think it would be better to improve our configure check than to add more (nested) ifdefs. AcquireCredentialsHandle won't be very useful without these krb5 functions.

July 2, 2019

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Tue, 2019-07-02 at 11:05 +0800, Dmitry Timoshkov wrote: > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > > --- > > dlls/kerberos/krb5_ap.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c > > index 3827e5ccbc..0a6463c5f3 100644 > > --- a/dlls/kerberos/krb5_ap.c > > +++ b/dlls/kerberos/krb5_ap.c > > @@ -842,6 +842,8 @@ static int get_buffer_index( SecBufferDesc *desc, DWORD type ) > > return -1; > > } > > > > +#ifdef SONAME_LIBKRB5 > > Where do you see this? Note that this code is inside an #ifdef SONAME_LIBGSSAPI_KRB5 > block and configure should disable gssapi when it can't detect krb5. This means that > SONAME_LIBGSSAPI_KRB5 should not be set when SONAME_LIBKRB5 isn't. I can confirm that on my system configure undefs SONAME_LIBGSSAPI_KRB5. Unfortunately that's not on one of my machines. According to the reporter, configure fails to find libkrb55.so but successfully locates libgssapi.so, and configure log confirms that. -- Dmitry.

July 2, 2019

Re: [PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.

by Hans Leidekker

On Tue, 2019-07-02 at 11:05 +0800, Dmitry Timoshkov wrote: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/kerberos/krb5_ap.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c > index 3827e5ccbc..0a6463c5f3 100644 > --- a/dlls/kerberos/krb5_ap.c > +++ b/dlls/kerberos/krb5_ap.c > @@ -842,6 +842,8 @@ static int get_buffer_index( SecBufferDesc *desc, DWORD type ) > return -1; > } > > +#ifdef SONAME_LIBKRB5 Where do you see this? Note that this code is inside an #ifdef SONAME_LIBGSSAPI_KRB5 block and configure should disable gssapi when it can't detect krb5. This means that SONAME_LIBGSSAPI_KRB5 should not be set when SONAME_LIBKRB5 isn't.

July 2, 2019

Re: [PATCH] msvcrt: Add '-norelay' flag for _vsnprintf().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54345 Your paranoid android. === debian9 (build log) === Task: WineTest did not produce the wow32 report

July 2, 2019

[PATCH] msvcrt: Add '-norelay' flag for _vsnprintf().

by Dmitry Timoshkov

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

July 2, 2019

Re: [PATCH] kernelbase: Only subtract 2 when strings arent equal.

by Alistair Leslie-Hughes

Hi Alexandre, > CompareString() only returns 0 on error. Where do you see such an error? I cant at the moment, so just ignore it. Regards Alistair.

July 2, 2019

Re: [PATCH] dwrite: Remove unused functions.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54340 Your paranoid android. === debian9 (build log) === Task: WineTest did not produce the wow32 report

July 2, 2019

[PATCH] dwrite: Remove unused functions.

by Nikolay Sivov

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

July 2, 2019

[PATCH] strmbase: Remove unused function.

by Nikolay Sivov

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

July 2, 2019

Re: [PATCH] kernelbase: Only subtract 2 when strings arent equal.

by Alexandre Julliard

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Restores code remove from commit 2a455ce049d65eeab95895b6b6d52f6e5047537b. > > Always subtracting 2 means two strings could never be equal, returning 0. CompareString() only returns 0 on error. Where do you see such an error? -- Alexandre Julliard julliard(a)winehq.org

July 2, 2019