March 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : services: Pass a process argument to send_start_message function.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 7e2176459da316347dd1a62b4bab974258513f52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2176459da316347dd1a62b4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:32:08 2016 +0100 services: Pass a process argument to send_start_message function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1119b25..325e7f3 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -799,19 +799,18 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL } /****************************************************************************** - * service_send_start_message + * process_send_start_message */ -static BOOL service_send_start_message(struct service_entry *service, HANDLE process_handle, +static BOOL process_send_start_message(struct process_entry *process, const WCHAR *name, LPCWSTR *argv, DWORD argc) { - struct process_entry *process = service->process; OVERLAPPED overlapped; DWORD i, len, result; service_start_info *ssi; LPWSTR p; BOOL r; - WINE_TRACE("%s %p %d\n", wine_dbgstr_w(service->name), argv, argc); + WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); overlapped.hEvent = process->overlapped_event; if (!ConnectNamedPipe(process->control_pipe, &overlapped)) @@ -820,12 +819,12 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro { HANDLE handles[2]; handles[0] = process->overlapped_event; - handles[1] = process_handle; + handles[1] = process->process; if (WaitForMultipleObjects( 2, handles, FALSE, service_pipe_timeout ) != WAIT_OBJECT_0) CancelIo(process->control_pipe); if (!HasOverlappedIoCompleted( &overlapped )) { - WINE_ERR( "service %s failed to start\n", wine_dbgstr_w( service->name )); + WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); return FALSE; } } @@ -837,7 +836,7 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro } /* calculate how much space do we need to send the startup info */ - len = strlenW(service->name) + 1; + len = strlenW(name) + 1; for (i=0; i<argc; i++) len += strlenW(argv[i])+1; len++; @@ -846,8 +845,8 @@ static BOOL service_send_start_message(struct service_entry *service, HANDLE pro ssi->cmd = WINESERV_STARTINFO; ssi->control = 0; ssi->total_size = FIELD_OFFSET(service_start_info, data[len]); - ssi->name_size = strlenW(service->name) + 1; - strcpyW( ssi->data, service->name ); + ssi->name_size = strlenW(name) + 1; + strcpyW(ssi->data, name); /* copy service args into a single buffer*/ p = &ssi->data[ssi->name_size]; @@ -911,7 +910,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * err = service_start_process(service, &process_handle); if (err == ERROR_SUCCESS) { - if (!service_send_start_message(service, process_handle, service_argv, service_argc)) + if (!process_send_start_message(process, service->name, service_argv, service_argc)) err = ERROR_SERVICE_REQUEST_TIMEOUT; }

1 0

Matteo Bruni : d3d10core: Add feature level support.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: fcc8553d8b8075542cd3edf26276c1915d29b0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc8553d8b8075542cd3edf26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:10 2016 +0100 d3d10core: Add feature level support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 2 +- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10_1/d3d10_1_main.c | 6 ++---- dlls/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d10core/d3d10core.spec | 2 +- dlls/d3d10core/d3d10core_main.c | 11 +++++------ 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4600a70..e36ec51 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -117,7 +117,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } } - hr = D3D10CoreCreateDevice(factory, adapter, flags, NULL, device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, D3D_FEATURE_LEVEL_10_0, device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index dbd72ba..232399f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -268,7 +268,7 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 1f35c43..e9fad3e 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); #define WINE_D3D10_TO_STR(x) case x: return #x @@ -161,9 +161,7 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive } } - FIXME("Ignoring feature level %s.\n", debug_d3d10_feature_level(hw_level)); - - hr = D3D10CoreCreateDevice(factory, adapter, flags, NULL, (ID3D10Device **)device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, hw_level, (ID3D10Device **)device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index ccea06b..f7d188d 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -82,7 +82,7 @@ static void test_create_device(void) } feature_level = ID3D10Device1_GetFeatureLevel(device); - todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); ID3D10Device1_Release(device); @@ -165,7 +165,7 @@ static void test_create_device(void) ok(!refcount, "Swapchain has %u references left.\n", refcount); feature_level = ID3D10Device1_GetFeatureLevel(device); - todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); refcount = ID3D10Device1_Release(device); diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec index 6569888..9bf25b5 100644 --- a/dlls/d3d10core/d3d10core.spec +++ b/dlls/d3d10core/d3d10core.spec @@ -1,2 +1,2 @@ -@ stdcall D3D10CoreCreateDevice(ptr ptr long ptr ptr) +@ stdcall D3D10CoreCreateDevice(ptr ptr long long ptr) @ stdcall D3D10CoreRegisterLayers() diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 44f1e29..d364be9 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -26,8 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, - const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device); +HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device); HRESULT WINAPI D3D10CoreRegisterLayers(void) { @@ -37,14 +37,13 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) } HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device) + unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device) { - D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; ID3D11Device *device11; HRESULT hr; - TRACE("factory %p, adapter %p, flags %#x, unknown0 %p, device %p.\n", - factory, adapter, flags, unknown0, device); + TRACE("factory %p, adapter %p, flags %#x, feature_level %#x, device %p.\n", + factory, adapter, flags, feature_level, device); if (FAILED(hr = D3D11CoreCreateDevice(factory, adapter, flags, &feature_level, 1, &device11))) return hr;

1 0

Sebastian Lackner : services: Initialize service ref_count directly in service_create.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 7fc3107b4c107e86bdb167bc1fc875784bf41f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc3107b4c107e86bdb167bc1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:30:56 2016 +0100 services: Initialize service ref_count directly in service_create. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 1 - programs/services/services.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 933f18d..cdac948 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -507,7 +507,6 @@ static DWORD create_serviceW( return err; } - entry->ref_count = 1; entry->is_wow64 = is_wow64; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; diff --git a/programs/services/services.c b/programs/services/services.c index 9f7e889..03df852 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -107,6 +107,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) HeapFree(GetProcessHeap(), 0, *entry); return err; } + (*entry)->ref_count = 1; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; (*entry)->preshutdown_timeout = default_preshutdown_timeout; @@ -557,6 +558,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db) entry->db = db; list_add_tail(&db->services, &entry->entry); + release_service(entry); } return ERROR_SUCCESS; }

1 0

Józef Kucia : d3d10core/tests: Test values of unused fields in D3D10_DEPTH_STENCIL_DESC.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 3939dae06d4edbf35bd206321523deea9d404188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3939dae06d4edbf35bd206321… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 16 10:02:36 2016 +0100 d3d10core/tests: Test values of unused fields in D3D10_DEPTH_STENCIL_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f31d92a..b7ac197 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2142,6 +2142,53 @@ static void test_create_depthstencil_state(void) refcount = ID3D10DepthStencilState_Release(ds_state1); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + ds_desc.DepthEnable = FALSE; + ds_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ZERO; + ds_desc.DepthFunc = D3D10_COMPARISON_NEVER; + ds_desc.StencilEnable = FALSE; + ds_desc.StencilReadMask = 0; + ds_desc.StencilWriteMask = 0; + ds_desc.FrontFace.StencilFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilDepthFailOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilPassOp = D3D10_STENCIL_OP_ZERO; + ds_desc.FrontFace.StencilFunc = D3D10_COMPARISON_NEVER; + ds_desc.BackFace = ds_desc.FrontFace; + + hr = ID3D10Device_CreateDepthStencilState(device, &ds_desc, &ds_state1); + ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + + memset(&ds_desc, 0, sizeof(ds_desc)); + ID3D10DepthStencilState_GetDesc(ds_state1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected depth enable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ALL + || broken(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO), + "Got unexpected depth write mask %#x.\n", ds_desc.DepthWriteMask); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_LESS || broken(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER), + "Got unexpected depth func %#x.\n", ds_desc.DepthFunc); + ok(!ds_desc.StencilEnable, "Got unexpected stencil enable %#x.\n", ds_desc.StencilEnable); + ok(ds_desc.StencilReadMask == D3D10_DEFAULT_STENCIL_READ_MASK, + "Got unexpected stencil read mask %#x.\n", ds_desc.StencilReadMask); + ok(ds_desc.StencilWriteMask == D3D10_DEFAULT_STENCIL_WRITE_MASK, + "Got unexpected stencil write mask %#x.\n", ds_desc.StencilWriteMask); + ok(ds_desc.FrontFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil depth fail op %#x.\n", ds_desc.FrontFace.StencilDepthFailOp); + ok(ds_desc.FrontFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil pass op %#x.\n", ds_desc.FrontFace.StencilPassOp); + ok(ds_desc.FrontFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected front face stencil fail op %#x.\n", ds_desc.FrontFace.StencilFailOp); + ok(ds_desc.FrontFace.StencilFunc == D3D10_COMPARISON_ALWAYS, + "Got unexpected front face stencil func %#x.\n", ds_desc.FrontFace.StencilFunc); + ok(ds_desc.BackFace.StencilDepthFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil depth fail op %#x.\n", ds_desc.BackFace.StencilDepthFailOp); + ok(ds_desc.BackFace.StencilPassOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil pass op %#x.\n", ds_desc.BackFace.StencilPassOp); + ok(ds_desc.BackFace.StencilFailOp == D3D10_STENCIL_OP_KEEP, + "Got unexpected back face stencil fail op %#x.\n", ds_desc.BackFace.StencilFailOp); + ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_ALWAYS, + "Got unexpected back face stencil func %#x.\n", ds_desc.BackFace.StencilFunc); + + ID3D10DepthStencilState_Release(ds_state1); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Matteo Bruni : wined3d: Enable SM5 shaders in the GLSL backend, when possible.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 64d16294bf69913315fb0470ecaf44ffee76c933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d16294bf69913315fb0470e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 16 00:24:11 2016 +0100 wined3d: Enable SM5 shaders in the GLSL backend, when possible. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e484cc6..da66aac 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3588,6 +3588,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_version >= MAKEDWORD_VERSION(3, 2)) gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; + if (gl_version >= MAKEDWORD_VERSION(4, 3)) + gl_info->supported[WINED3D_GL_VERSION_4_3] = TRUE; if (gl_info->supported[APPLE_FENCE]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 136bd55..92a5b1c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8005,7 +8005,13 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s { UINT shader_model; - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] + /* FIXME: Check for the specific extensions required for SM5 support + * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as + * soon as we introduce them, adjusting the GL / GLSL version checks + * accordingly. */ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3]) + shader_model = 5; + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a59c847..e344ff1 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -171,6 +171,7 @@ enum wined3d_gl_extension WINED3D_GL_LEGACY_CONTEXT, WINED3D_GL_VERSION_2_0, WINED3D_GL_VERSION_3_2, + WINED3D_GL_VERSION_4_3, WINED3D_GL_EXT_COUNT, };

1 0

Alexandre Julliard : vssapi: Undefine __thiscall before redefining it.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 71d9791e1c85a35b2f96f1eb4ccf04487794046f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d9791e1c85a35b2f96f1eb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 16 16:09:41 2016 +0900 vssapi: Undefine __thiscall before redefining it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vssapi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 133f4c5..9234544 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0

Sebastian Lackner : services: Introduce refcounting for processes.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 6617ff24f206335d595c585b96289542ead9cbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6617ff24f206335d595c585b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:31:31 2016 +0100 services: Introduce refcounting for processes. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 9 ++++++++- programs/services/services.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 03df852..1119b25 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -73,6 +73,7 @@ static DWORD process_create(struct process_entry **entry) *entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**entry)); if (!*entry) return ERROR_NOT_ENOUGH_SERVER_MEMORY; + (*entry)->ref_count = 1; (*entry)->control_pipe = INVALID_HANDLE_VALUE; /* all other fields are zero */ return ERROR_SUCCESS; @@ -126,7 +127,7 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->description); HeapFree(GetProcessHeap(), 0, entry->dependOnServices); HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); - free_process_entry(entry->process); + release_process(entry->process); HeapFree(GetProcessHeap(), 0, entry); } @@ -455,6 +456,12 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase return NULL; } +void release_process(struct process_entry *process) +{ + if (InterlockedDecrement(&process->ref_count) == 0) + free_process_entry(process); +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 206d655..b8f4774 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -33,6 +33,7 @@ struct scmdatabase struct process_entry { + LONG ref_count; HANDLE process; HANDLE control_mutex; HANDLE control_pipe; @@ -87,6 +88,7 @@ void service_terminate(struct service_entry *service); /* Process functions */ +void release_process(struct process_entry *process); BOOL process_send_command(struct process_entry *process, const void *data, DWORD size, DWORD *result); extern HANDLE g_hStartedEvent;

1 0

Sebastian Lackner : services: Hold scmdatabase lock while checking marked_for_delete.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 38a09f9c7bb2b29287bb24dc9cb7053ca0c5303c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a09f9c7bb2b29287bb24dc9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:30:39 2016 +0100 services: Hold scmdatabase lock while checking marked_for_delete. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 78baaf2..9f7e889 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -456,13 +456,15 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase void release_service(struct service_entry *service) { + struct scmdatabase *db = service->db; + + scmdatabase_lock(db); if (InterlockedDecrement(&service->ref_count) == 0 && is_marked_for_delete(service)) { - scmdatabase_lock(service->db); - scmdatabase_remove_service(service->db, service); - scmdatabase_unlock(service->db); + scmdatabase_remove_service(db, service); free_service_entry(service); } + scmdatabase_unlock(db); } static DWORD scmdatabase_create(struct scmdatabase **db)

1 0

Sebastian Lackner : services: Fix a typo.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: 4a3d712608e3651394d952730bac89f4ffbd8c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3d712608e3651394d952730… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 16 04:28:32 2016 +0100 services: Fix a typo. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index c49dad3..78baaf2 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -103,7 +103,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) } if ((err = process_create(&(*entry)->process)) != ERROR_SUCCESS) { - HeapFree(GetProcessHeap(), 0, (*entry)->process); + HeapFree(GetProcessHeap(), 0, (*entry)->name); HeapFree(GetProcessHeap(), 0, *entry); return err; }

1 0

Piotr Caban : msvcrt: Destroy exception object when frame storing it is unwound.
by Alexandre Julliard March 16, 2016

March 16, 2016

Module: wine Branch: master Commit: f085be3028e86ebc6666d20a4802831bf7b3f3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f085be3028e86ebc6666d20a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 15 13:41:20 2016 +0100 msvcrt: Destroy exception object when frame storing it is unwound. Thrown object was incorrectly freed in following situation: try { throw obj; } catch(object &obj) { try { throw 1; } catch(...) {} //use object here } Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 56165c0..78ce488 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -131,6 +131,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); +BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void*); /* call a function with a given ebp */ static inline void *call_ebp_func( void *func, void *ebp ) @@ -361,9 +362,18 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + PEXCEPTION_RECORD prev_rec = nested_frame->rec; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { + if (prev_rec->ExceptionCode == CXX_EXCEPTION) + { + void *object = (void*)prev_rec->ExceptionInformation[1]; + cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; + if (info && info->destructor && _IsExceptionObjectToBeDestroyed(object)) + call_dtor( info->destructor, object); + } + msvcrt_get_thread_data()->exc_record = nested_frame->prev_rec; return ExceptionContinueSearch; } @@ -372,7 +382,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG if(rec->ExceptionCode == CXX_EXCEPTION) { - PEXCEPTION_RECORD prev_rec = nested_frame->rec; if((rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) || (prev_rec->ExceptionCode == CXX_EXCEPTION && rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && @@ -388,22 +397,6 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } } - else if (nested_frame->prev_rec && nested_frame->prev_rec->ExceptionCode == CXX_EXCEPTION && - nested_frame->prev_rec->ExceptionInformation[1] == prev_rec->ExceptionInformation[1] && - nested_frame->prev_rec->ExceptionInformation[2] == prev_rec->ExceptionInformation[2]) - { - TRACE("detect threw new exception in catch block - not owning old(obj: %lx type: %lx)\n", - prev_rec->ExceptionInformation[1], prev_rec->ExceptionInformation[2]); - } - else if (prev_rec->ExceptionCode == CXX_EXCEPTION) { - /* new exception in exception handler, destroy old */ - void *object = (void*)prev_rec->ExceptionInformation[1]; - cxx_exception_type *info = (cxx_exception_type*) prev_rec->ExceptionInformation[2]; - TRACE("detect threw new exception in catch block - destroy old(obj: %p type: %p)\n", - object, info); - if(info && info->destructor) - call_dtor( info->destructor, object ); - } else { TRACE("detect threw new exception in catch block\n");

1 0