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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_arb_pshader().
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 17d159e3ca5be865252d48a9d634c9d03e4d10b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d159e3ca5be865252d48a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 21 03:08:01 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_arb_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 82ef119..273c4f3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4227,11 +4227,11 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } /* Context activation is done by the caller. */ -static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context *context, +static struct arb_ps_compiled_shader *find_arb_pshader(struct wined3d_context_gl *context_gl, struct wined3d_shader *shader, const struct arb_ps_compile_args *args) { - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_device *device = shader->device; UINT i; DWORD new_size; @@ -4565,7 +4565,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context TRACE("Using pixel shader %p.\n", ps); find_arb_ps_compile_args(state, context, ps, &compile_args); - compiled = find_arb_pshader(context, ps, &compile_args); + compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;

1 0

Henri Verbeet : wined3d: Merge the wined3d_texture_gl texture ops implementations.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 3595c42a620ec44364f5d8f56641fe5c77477b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3595c42a620ec44364f5d8f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 21 03:08:02 2019 +0430 wined3d: Merge the wined3d_texture_gl texture ops implementations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 97 ++++++-------------------------------------------- 1 file changed, 11 insertions(+), 86 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4b64785..ae3e179 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2630,9 +2630,9 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g return TRUE; } -/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) +/* Context activation is done by the caller. */ +static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); @@ -2640,6 +2640,9 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + switch (location) { case WINED3D_LOCATION_USER_MEMORY: @@ -2660,7 +2663,8 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); default: - ERR("Don't know how to handle location %#x.\n", location); + FIXME("Unhandled %s load from %s.\n", wined3d_debug_location(location), + wined3d_debug_location(texture->sub_resources[sub_resource_idx].locations)); return FALSE; } } @@ -2757,9 +2761,9 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); } -static const struct wined3d_texture_ops texture2d_ops = +static const struct wined3d_texture_ops texture_gl_ops = { - texture2d_load_location, + wined3d_texture_gl_load_location, wined3d_texture_gl_upload_data, wined3d_texture_gl_download_data, }; @@ -3040,45 +3044,6 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_sub_resource_unmap, }; -/* Context activation is done by the caller. */ -static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", - texture, sub_resource_idx, context, wined3d_debug_location(location)); - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - switch (location) - { - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); - - default: - FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } -} - -static const struct wined3d_texture_ops texture1d_ops = -{ - texture1d_load_location, - wined3d_texture_gl_upload_data, - wined3d_texture_gl_download_data, -}; - static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources, @@ -3351,42 +3316,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } -/* Context activation is done by the caller. */ -static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, DWORD location) -{ - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - switch (location) - { - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return wined3d_texture_gl_load_texture(texture_gl, sub_resource_idx, - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); - - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); - - default: - FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location), - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } -} - -static const struct wined3d_texture_ops texture3d_ops = -{ - texture3d_load_location, - wined3d_texture_gl_upload_data, - wined3d_texture_gl_download_data, -}; - HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) @@ -3648,7 +3577,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st DWORD flags, void *parent, const struct wined3d_parent_ops *parent_ops, void *sub_resources) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_texture_ops *texture_ops; HRESULT hr; TRACE("texture_gl %p, device %p, desc %p, layer_count %u, level_count %u, " @@ -3666,7 +3594,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_1D: - texture_ops = &texture1d_ops; if (layer_count > 1) texture_gl->target = GL_TEXTURE_1D_ARRAY; else @@ -3674,7 +3601,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st break; case WINED3D_RTYPE_TEXTURE_2D: - texture_ops = &texture2d_ops; if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) { texture_gl->target = GL_TEXTURE_CUBE_MAP_ARB; @@ -3701,7 +3627,6 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st WARN("OpenGL implementation does not support 3D textures.\n"); return WINED3DERR_INVALIDCALL; } - texture_ops = &texture3d_ops; texture_gl->target = GL_TEXTURE_3D; break; @@ -3713,7 +3638,7 @@ static HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, st list_init(&texture_gl->renderbuffers); if (FAILED(hr = wined3d_texture_init(&texture_gl->t, desc, layer_count, level_count, - flags, device, parent, parent_ops, sub_resources, texture_ops))) + flags, device, parent, parent_ops, sub_resources, &texture_gl_ops))) return hr; if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT)

1 0

Zebediah Figura : quartz/systemclock: Create the advise thread after the events it depends on.
by Alexandre Julliard 21 Jun '19

21 Jun '19

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

Zebediah Figura : strmbase/transform: Store the pins inline in the TransformFilter structure.
by Alexandre Julliard 21 Jun '19

21 Jun '19

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 : strmbase/renderer: Remove some duplicated locks.
by Alexandre Julliard 21 Jun '19

21 Jun '19

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

Zebediah Figura : strmbase/renderer: Store the sink pin inline in the BaseRenderer structure.
by Alexandre Julliard 21 Jun '19

21 Jun '19

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 : quartz/filtergraph: Add tests for asynchronous state change.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 6beabb2317812b47beae0f4d8a8436d56c45d43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6beabb2317812b47beae0f4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 20:13:20 2019 -0500 quartz/filtergraph: Add tests for asynchronous state change. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d89c9e2..aec9392 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1163,6 +1163,8 @@ struct testfilter struct testpin *pins; unsigned int pin_count, enum_idx; + HRESULT state_hr; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; ULONG misc_flags; @@ -1344,7 +1346,7 @@ static HRESULT WINAPI testfilter_Stop(IBaseFilter *iface) check_state_transition(filter, State_Stopped); filter->state = State_Stopped; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_Pause(IBaseFilter *iface) @@ -1355,7 +1357,7 @@ static HRESULT WINAPI testfilter_Pause(IBaseFilter *iface) check_state_transition(filter, State_Paused); filter->state = State_Paused; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) @@ -1367,7 +1369,7 @@ static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start) filter->state = State_Running; filter->start_time = start; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FILTER_STATE *state) @@ -1376,7 +1378,7 @@ static HRESULT WINAPI testfilter_GetState(IBaseFilter *iface, DWORD timeout, FIL if (winetest_debug > 1) trace("%p->GetState(%u)\n", filter, timeout); *state = filter->state; - return S_OK; + return filter->state_hr; } static HRESULT WINAPI testfilter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) @@ -2954,6 +2956,7 @@ static void test_filter_state(void) IReferenceClock *clock; IMediaControl *control; IMediaFilter *filter; + OAFilterState state; HRESULT hr; ULONG ref; @@ -3094,6 +3097,34 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); + sink.state_hr = S_FALSE; + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + sink.state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_CANT_CUE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_STATE_INTERMEDIATE; + source.state_hr = VFW_S_CANT_CUE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = VFW_S_CANT_CUE; + source.state_hr = VFW_S_STATE_INTERMEDIATE; + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#x.\n", hr); + ok(state == State_Paused, "Got state %u.\n", state); + + sink.state_hr = source.state_hr = S_OK; + /* Destroying the graph while it's running stops all filters. */ hr = IMediaFilter_Run(filter, 0);

1 0

Alexandre Julliard : slbcsp: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 70d4e6dbcca9baf25ad0cc9f0ee5e869181a8299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d4e6dbcca9baf25ad0cc9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:00 2019 +0200 slbcsp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slbcsp/Makefile.in | 2 ++ dlls/slbcsp/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/slbcsp/Makefile.in b/dlls/slbcsp/Makefile.in index 91508c4..b3dd14f 100644 --- a/dlls/slbcsp/Makefile.in +++ b/dlls/slbcsp/Makefile.in @@ -1,4 +1,6 @@ MODULE = slbcsp.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/slbcsp/main.c b/dlls/slbcsp/main.c index d0e74e6..4fd23be 100644 --- a/dlls/slbcsp/main.c +++ b/dlls/slbcsp/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : slc: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

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

Jacek Caban : services: Support delayed autostart services.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: d8dec0b3f9da2daad55efd1a9f8fa99711b15635 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8dec0b3f9da2daad55efd1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 20 17:58:45 2019 +0200 services: Support delayed autostart services. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 116 ++++++++++++++++++++++++++++++++++++++++++- programs/services/services.h | 1 + 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 7ca249c..ff5c4cb 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -29,6 +29,7 @@ #include <userenv.h> #include "wine/debug.h" +#include "wine/heap.h" #include "svcctl.h" #include "services.h" @@ -42,6 +43,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 60000; static DWORD default_preshutdown_timeout = 180000; +static DWORD autostart_delay = 120000; static void *environment = NULL; static HKEY service_current_key = NULL; @@ -68,6 +70,7 @@ static const WCHAR SZ_TAG[] = {'T','a','g',0}; static const WCHAR SZ_DESCRIPTION[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR SZ_PRESHUTDOWN[] = {'P','r','e','s','h','u','t','d','o','w','n','T','i','m','e','o','u','t',0}; static const WCHAR SZ_WOW64[] = {'W','O','W','6','4',0}; +static const WCHAR SZ_DELAYED_AUTOSTART[] = {'D','e','l','a','y','e','d','A','u','t','o','S','t','a','r','t',0}; static DWORD process_create(const WCHAR *name, struct process_entry **entry) { @@ -186,6 +189,8 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) if (load_reg_dword(hKey, SZ_WOW64, &value) == 0 && value == 1) entry->is_wow64 = TRUE; + if (load_reg_dword(hKey, SZ_DELAYED_AUTOSTART, &value) == 0 && value == 1) + entry->delayed_autostart = TRUE; WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); @@ -329,11 +334,101 @@ static int __cdecl compare_tags(const void *a, const void *b) return service_a->config.dwTagId - service_b->config.dwTagId; } +static PTP_CLEANUP_GROUP delayed_autostart_cleanup; + +struct delayed_autostart_params +{ + unsigned int count; + struct service_entry **services; +}; + +static void CALLBACK delayed_autostart_cancel_callback(void *object, void *userdata) +{ + struct delayed_autostart_params *params = object; + while(params->count--) + release_service(params->services[params->count]); + heap_free(params->services); + heap_free(params); +} + +static void CALLBACK delayed_autostart_callback(TP_CALLBACK_INSTANCE *instance, void *context, + TP_WAIT *wait, TP_WAIT_RESULT result) +{ + struct delayed_autostart_params *params = context; + struct service_entry *service; + unsigned int i; + DWORD err; + + if (result == WAIT_TIMEOUT) + { + scmdatabase_lock_startup(active_database, INFINITE); + + for (i = 0; i < params->count; i++) + { + service = params->services[i]; + if (service->status.dwCurrentState == SERVICE_STOPPED) + { + TRACE("Starting deleyed auto-start service %s\n", debugstr_w(service->name)); + err = service_start(service, 0, NULL); + if (err != ERROR_SUCCESS) + FIXME("Delayed auto-start service %s failed to start: %d\n", + wine_dbgstr_w(service->name), err); + } + release_service(service); + } + + scmdatabase_unlock_startup(active_database); + } + + heap_free(params->services); + heap_free(params); + CloseThreadpoolWait(wait); +} + +static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned int count) +{ + struct delayed_autostart_params *params; + TP_CALLBACK_ENVIRON environment; + LARGE_INTEGER timestamp; + TP_WAIT *wait; + FILETIME ft; + + if (!(delayed_autostart_cleanup = CreateThreadpoolCleanupGroup())) + { + ERR("CreateThreadpoolCleanupGroup failed with error %u\n", GetLastError()); + return FALSE; + } + + if (!(params = heap_alloc(sizeof(*params)))) return FALSE; + params->count = count; + params->services = services; + + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.CleanupGroup = delayed_autostart_cleanup; + environment.CleanupGroupCancelCallback = delayed_autostart_cancel_callback; + + timestamp.QuadPart = (ULONGLONG)autostart_delay * -10000; + ft.dwLowDateTime = timestamp.u.LowPart; + ft.dwHighDateTime = timestamp.u.HighPart; + + if (!(wait = CreateThreadpoolWait(delayed_autostart_callback, params, &environment))) + { + ERR("CreateThreadpoolWait failed: %u\n", GetLastError()); + heap_free(params); + return FALSE; + } + + SetThreadpoolWait(wait, params, &ft); + return TRUE; +} + static void scmdatabase_autostart_services(struct scmdatabase *db) { struct service_entry **services_list; unsigned int i = 0; unsigned int size = 32; + unsigned int delayed_cnt = 0; struct service_entry *service; services_list = HeapAlloc(GetProcessHeap(), 0, size * sizeof(services_list[0])); @@ -370,6 +465,12 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) { DWORD err; service = services_list[i]; + if (service->delayed_autostart) + { + TRACE("delayed starting %s\n", wine_dbgstr_w(service->name)); + services_list[delayed_cnt++] = service; + continue; + } err = service_start(service, 0, NULL); if (err != ERROR_SUCCESS) WINE_FIXME("Auto-start service %s failed to start: %d\n", @@ -378,7 +479,9 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) } scmdatabase_unlock_startup(db); - HeapFree(GetProcessHeap(), 0, services_list); + + if (!delayed_cnt || !schedule_delayed_autostart(services_list, delayed_cnt)) + heap_free(services_list); } static void scmdatabase_wait_terminate(struct scmdatabase *db) @@ -1115,6 +1218,8 @@ static void load_registry_parameters(void) {'S','e','r','v','i','c','e','s','P','i','p','e','T','i','m','e','o','u','t',0}; static const WCHAR killtimeoutW[] = {'W','a','i','t','T','o','K','i','l','l','S','e','r','v','i','c','e','T','i','m','e','o','u','t',0}; + static const WCHAR autostartdelayW[] = + {'A','u','t','o','S','t','a','r','t','D','e','l','a','y',0}; HKEY key; WCHAR buffer[64]; DWORD type, count, val; @@ -1131,6 +1236,10 @@ static void load_registry_parameters(void) type == REG_SZ && (val = wcstol( buffer, NULL, 10 ))) service_kill_timeout = val; + count = sizeof(val); + if (!RegQueryValueExW( key, autostartdelayW, NULL, &type, (BYTE *)&val, &count ) && type == REG_DWORD) + autostart_delay = val; + RegCloseKey( key ); } @@ -1164,6 +1273,11 @@ int main(int argc, char *argv[]) SetEvent(started_event); WaitForSingleObject(exit_event, INFINITE); scmdatabase_wait_terminate(active_database); + if (delayed_autostart_cleanup) + { + CloseThreadpoolCleanupGroupMembers(delayed_autostart_cleanup, TRUE, NULL); + CloseThreadpoolCleanupGroup(delayed_autostart_cleanup); + } RPC_Stop(); } scmdatabase_destroy(active_database); diff --git a/programs/services/services.h b/programs/services/services.h index e1481d9..0d400e5 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -63,6 +63,7 @@ struct service_entry BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; + BOOL delayed_autostart; struct list handles; };

1 0