June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : system.drv: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: b00a45cc203f9d7eacf90557d35abf125c3c3efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00a45cc203f9d7eacf90557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:50:45 2019 +0200 system.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/system.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in index 553e633..192c465 100644 --- a/dlls/system.drv16/Makefile.in +++ b/dlls/system.drv16/Makefile.in @@ -1,4 +1,4 @@ MODULE = system.drv16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = system.c

1 0

Huw Davies : user32: Don' t access a potentially uninitialized padded_border.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 3f9c5d7682b1085fc79a9607e9ccb1df1088e267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f9c5d7682b1085fc79a9607… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 21 10:07:18 2019 +0100 user32: Don't access a potentially uninitialized padded_border. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5bf82c6..9a5c3cf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1753,8 +1753,11 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - lpnm->iBorderWidth += padded_border; - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + if (ret) + { + lpnm->iBorderWidth += padded_border; + if (lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; + } normalize_nonclientmetrics( lpnm ); break; }

1 0

Alexandre Julliard : sspicli: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: bb12daf2b09c668b79eabee803746c7609379791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb12daf2b09c668b79eabee8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:56 2019 +0200 sspicli: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/Makefile.in | 2 ++ dlls/sspicli/main.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/sspicli/Makefile.in b/dlls/sspicli/Makefile.in index ceef844..7e0493f 100644 --- a/dlls/sspicli/Makefile.in +++ b/dlls/sspicli/Makefile.in @@ -1,4 +1,6 @@ MODULE = sspicli.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index dfcc1cc..186a6ac 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -25,7 +25,6 @@ #include "wincred.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(sspicli); @@ -45,9 +44,9 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( if (!username && !domainname && !creds) return SEC_E_INVALID_TOKEN; - if (username) len_username = strlenW( username ); - if (domainname) len_domainname = strlenW( domainname ); - if (creds) len_password = strlenW( creds ); + if (username) len_username = lstrlenW( username ); + if (domainname) len_domainname = lstrlenW( domainname ); + if (creds) len_password = lstrlenW( creds ); size = sizeof(*id); if (username) size += (len_username + 1) * sizeof(WCHAR); @@ -101,8 +100,8 @@ static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) - strcpyW( dst, src ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) + lstrcpyW( dst, src ); return dst; }

1 0

Alexandre Julliard : stress: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 84d0d51aa6d0b65b5e4479ae962744284fab5ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d0d51aa6d0b65b5e4479ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:49:39 2019 +0200 stress: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stress.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in index 0c93384..3bd34da 100644 --- a/dlls/stress.dll16/Makefile.in +++ b/dlls/stress.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = stress.dll16 -EXTRADLLFLAGS = -m16 +EXTRADLLFLAGS = -m16 -mno-cygwin C_SRCS = stress.c

1 0

Alexandre Julliard : slc: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: ad59dfb481763efc2eb8b17d691f0cf6e8ed8490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad59dfb481763efc2eb8b17d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:15 2019 +0200 slc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/slc/Makefile.in b/dlls/slc/Makefile.in index 7e79ffc..fac1c25 100644 --- a/dlls/slc/Makefile.in +++ b/dlls/slc/Makefile.in @@ -2,5 +2,7 @@ EXTRADEFS = -D_SLC_ MODULE = slc.dll IMPORTLIB = slc +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ slc.c

1 0

Zebediah Figura : strmbase/transform: Store the pins inline in the TransformFilter structure.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 2d5c9d0666e7b007af4535e34c72040e161a5d22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d5c9d0666e7b007af4535e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:17 2019 -0500 strmbase/transform: Store the pins inline in the TransformFilter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 13 +-- dlls/quartz/avidec.c | 11 +-- dlls/strmbase/transform.c | 172 ++++++++++++++------------------------- dlls/winegstreamer/gsttffilter.c | 4 +- dlls/wineqtdecoder/qtvdecoder.c | 4 +- include/wine/strmbase.h | 17 ++-- 6 files changed, 78 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d5c9d0666e7b007af45…

1 0

Zebediah Figura : quartz/systemclock: Create the advise thread after the events it depends on.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 2adc44df2ef9a489c48186f7da5aa6df3c16a36d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adc44df2ef9a489c48186f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:16 2019 -0500 quartz/systemclock: Create the advise thread after the events it depends on. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 6bb1f47..2b75c8d 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -103,9 +103,9 @@ static void notify_thread(struct system_clock *clock) { if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { - clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); clock->stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); + clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } SetEvent(clock->notify_event); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_arb_vs_local_constants().
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: f1918742cf7b19d3afbf9121ffacf27f1e625436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1918742cf7b19d3afbf9121… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 21 03:07:59 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_arb_vs_local_constants(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 050d12f..50f49fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -604,14 +604,14 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g /* Context activation is done by the caller. */ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *gl_shader, - const struct wined3d_context *context, const struct wined3d_state *state) + const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; float position_fixup[4]; unsigned char i; /* Upload the position fixup */ - shader_get_position_fixup(context, state, 1, position_fixup); + shader_get_position_fixup(&context_gl->c, state, 1, position_fixup); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, position_fixup)); if (!gl_shader->num_int_consts) return; @@ -694,7 +694,7 @@ static void shader_arb_load_constants_internal(struct shader_arb_priv *priv, /* Load DirectX 9 float constants for vertex shader */ priv->highest_dirty_vs_const = shader_arb_load_constants_f(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, priv->highest_dirty_vs_const, state->vs_consts_f, priv->vshader_const_dirty); - shader_arb_vs_local_constants(gl_shader, context, state); + shader_arb_vs_local_constants(gl_shader, context_gl, state); } if (usePixelShader) @@ -4661,7 +4661,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context gl_info->gl_ops.gl.p_glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", priv->current_vprogram_id); - shader_arb_vs_local_constants(compiled, context, state); + shader_arb_vs_local_constants(compiled, context_gl, state); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { priv->last_vs_color_unclamp = compiled->need_color_unclamp;

1 0

Zebediah Figura : strmbase/renderer: Store the sink pin inline in the BaseRenderer structure.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: b583452af37158db2c343c78bfaa73113dee24b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b583452af37158db2c343c78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:19 2019 -0500 strmbase/renderer: Store the sink pin inline in the BaseRenderer structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 28 ++++----- dlls/quartz/videorenderer.c | 15 ++--- dlls/quartz/vmr9.c | 18 +++--- dlls/strmbase/renderer.c | 144 +++++++++++++++++++++----------------------- include/wine/strmbase.h | 2 +- 5 files changed, 98 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b583452af37158db2c34…

1 0

Zebediah Figura : strmbase/renderer: Remove some duplicated locks.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 2dafbe079e069e45abf94de3632e344aa1921983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dafbe079e069e45abf94de3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:18 2019 -0500 strmbase/renderer: Remove some duplicated locks. The pin and filter locks are always equal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 2 -- dlls/strmbase/renderer.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e4b50e2..21e56b4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -363,13 +363,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); - LeaveCriticalSection(iface->pInputPin->pin.pCritSec); LeaveCriticalSection(&iface->filter.csFilter); LeaveCriticalSection(&iface->csRenderLock); WaitForSingleObject(This->hEvent, INFINITE); EnterCriticalSection(&iface->csRenderLock); EnterCriticalSection(&iface->filter.csFilter); - EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) { ResetEvent(This->hEvent); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b216166..38e1b6c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -97,7 +97,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_EndOfStream(iface); - EnterCriticalSection(This->pin.pCritSec); if (SUCCEEDED(hr)) { if (pFilter->pFuncsTable->pfnEndOfStream) @@ -105,7 +104,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) else hr = BaseRendererImpl_EndOfStream(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -121,7 +119,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) { @@ -130,7 +127,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) else hr = BaseRendererImpl_BeginFlush(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -146,7 +142,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { @@ -155,7 +150,6 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) else hr = BaseRendererImpl_EndFlush(pFilter); } - LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr;

1 0