February 2015 - Wine-Commits

André Hentschel : Add WWN 386
by Jeremy Newman Feb. 27, 2015

Feb. 27, 2015

Module: website Branch: master Commit: 36db2d3272c4087ec293d6ac4c1522d9c0109c68 URL: http://source.winehq.org/git/website.git/?a=commit;h=36db2d3272c4087ec293d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 27 17:48:38 2015 +0100 Add WWN 386 --- news/de/2015022701.xml | 10 + news/en/2015022701.xml | 10 + wwn/en/wn20150227_386.xml | 556 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 576 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=36db2d3272c4087ec2…

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_GetPrivateData().
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 82049198286f23d2955a4d8d7978085c8d48ffd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82049198286f23d2955a4d8d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:45 2015 +0100 d3d10core: Implement d3d10_pixel_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 9245445..0b052c6 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -551,10 +551,12 @@ static void STDMETHODCALLTYPE d3d10_pixel_shader_GetDevice(ID3D10PixelShader *if static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelShader *iface,

1 0

Stefan Dösinger : d3d9/tests: Extend the FPU setup test.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 28a9d6324a9421d444dc9122673d2992642a5d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a9d6324a9421d444dc91226… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 27 10:48:41 2015 +0100 d3d9/tests: Extend the FPU setup test. Games created by GameMaker modify the FPU control word to enable division by zero exceptions. The game Risk of Rain, which is written with GameMaker, furthermore sets fogstart == fogend, which triggers an exception when the GL driver attempts to calculate 1 / (fogend - fogstart). This test adds some evidence that we are not supposed to temporarily restore the FPU CW if D3DCREATE_FPU_PRESERVE is used. --- dlls/d3d9/tests/device.c | 96 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b11d8d4..fde2bb6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4086,6 +4086,46 @@ static inline WORD get_fpu_cw(void) return cw; } +static WORD callback_cw, callback_set_cw; +static DWORD callback_tid; + +static HRESULT WINAPI dummy_object_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_object_AddRef(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 2; +} + +static ULONG WINAPI dummy_object_Release(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 1; +} + +static const IUnknownVtbl dummy_object_vtbl = +{ + dummy_object_QueryInterface, + dummy_object_AddRef, + dummy_object_Release, +}; + +static const GUID d3d9_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) @@ -4094,6 +4134,9 @@ static void test_fpu_setup(void) HWND window = NULL; IDirect3D9 *d3d9; WORD cw; + IDirect3DSurface9 *surface; + HRESULT hr; + IUnknown dummy_object = {&dummy_object_vtbl}; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); @@ -4120,7 +4163,34 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_set_cw = 0xf60; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + callback_cw = 0; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + + callback_set_cw = 0x7f; + set_fpu_cw(0x7f); + + IDirect3DSurface9_Release(surface); + + callback_cw = 0; IDirect3DDevice9_Release(device); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); @@ -4134,9 +4204,26 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - set_fpu_cw(0x37f); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_cw = 0; + callback_set_cw = 0x37f; + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0x37f, "cw is %#x, expected 0x37f.\n", cw); + + IDirect3DSurface9_Release(surface); + + callback_cw = 0; IDirect3DDevice9_Release(device); + ok(callback_cw == 0x37f, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); done: IDirect3D9_Release(d3d9); @@ -6976,13 +7063,6 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; - static const GUID d3d9_private_data_test_guid = - { - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} - }; static const GUID d3d9_private_data_test_guid2 = { 0x2e5afac2,

1 0

Stefan Dösinger : d3d8/tests: Extend the FPU setup test.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 3b2cf06b913fbabc5ab7a8414335b29b4dadc03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2cf06b913fbabc5ab7a8414… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 27 10:48:42 2015 +0100 d3d8/tests: Extend the FPU setup test. --- dlls/d3d8/tests/device.c | 95 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e06b1a3..c8aa724 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3023,6 +3023,46 @@ static inline WORD get_fpu_cw(void) return cw; } +static WORD callback_cw, callback_set_cw; +static DWORD callback_tid; + +static HRESULT WINAPI dummy_object_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_object_AddRef(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 2; +} + +static ULONG WINAPI dummy_object_Release(IUnknown *iface) +{ + callback_cw = get_fpu_cw(); + set_fpu_cw(callback_set_cw); + callback_tid = GetCurrentThreadId(); + return 1; +} + +static const IUnknownVtbl dummy_object_vtbl = +{ + dummy_object_QueryInterface, + dummy_object_AddRef, + dummy_object_Release, +}; + +static const GUID d3d8_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + static void test_fpu_setup(void) { #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) @@ -3033,6 +3073,8 @@ static void test_fpu_setup(void) HWND window; HRESULT hr; WORD cw; + IDirect3DSurface8 *surface; + IUnknown dummy_object = {&dummy_object_vtbl}; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_CAPTION, 0, 0, registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, 0, 0, 0, 0); @@ -3062,7 +3104,34 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_set_cw = 0xf60; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); + + callback_cw = 0; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + + callback_set_cw = 0x7f; + set_fpu_cw(0x7f); + + IDirect3DSurface8_Release(surface); + + callback_cw = 0; IDirect3DDevice8_Release(device); + ok(callback_cw == 0x7f, "Callback cw is %#x, expected 0x7f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); cw = get_fpu_cw(); ok(cw == 0x7f, "cw is %#x, expected 0x7f.\n", cw); @@ -3076,9 +3145,26 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - set_fpu_cw(0x37f); + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + + callback_cw = 0; + callback_set_cw = 0x37f; + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, + &dummy_object, sizeof(IUnknown *), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + ok(callback_cw == 0xf60, "Callback cw is %#x, expected 0xf60.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); + cw = get_fpu_cw(); + ok(cw == 0x37f, "cw is %#x, expected 0x37f.\n", cw); + + IDirect3DSurface8_Release(surface); + + callback_cw = 0; IDirect3DDevice8_Release(device); + ok(callback_cw == 0x37f, "Callback cw is %#x, expected 0x37f.\n", callback_cw); + ok(callback_tid == GetCurrentThreadId(), "Got unexpected thread id.\n"); done: DestroyWindow(window); @@ -4541,13 +4627,6 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; - static const GUID d3d8_private_data_test_guid = - { - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} - }; static const GUID d3d8_private_data_test_guid2 = { 0x2e5afac2,

1 0

Henri Verbeet : d3d10core: Implement d3d10_blend_state_SetPrivateData().
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 2971a928405aaa979db45c39b3cc10ac2c1c648e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2971a928405aaa979db45c39b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:46 2015 +0100 d3d10core: Implement d3d10_blend_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 1756afc..791f302 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -247,6 +247,7 @@ struct d3d10_blend_state ID3D10BlendState ID3D10BlendState_iface; LONG refcount; + struct wined3d_private_store private_store; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; ID3D10Device1 *device; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 460bc8d..8d2dae1 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -79,6 +79,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface struct d3d10_device *device = impl_from_ID3D10Device(state->device); wine_rb_remove(&device->blend_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -109,10 +110,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, @@ -155,11 +158,13 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_dev { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) { ERR("Failed to insert blend state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_pixel_shader_SetPrivateDataInterface().
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: ed0c1c2ad5ea1bcef84bb2065ce1d15fd6db8617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c1c2ad5ea1bcef84bb2065… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 12:29:44 2015 +0100 d3d10core: Implement d3d10_pixel_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index cdd0608..9245445 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -571,9 +571,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateData(ID3D10PixelSh static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_pixel_shader *shader = impl_from_ID3D10PixelShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl =

1 0

Nikolay Sivov : scrrun: It' s not allowed to change compare mode when dictionary is not empty.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 778d4da2d9e9f899013ce52a2aa30ada263542ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=778d4da2d9e9f899013ce52a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:27:02 2015 +0300 scrrun: It's not allowed to change compare mode when dictionary is not empty. --- dlls/scrrun/dictionary.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a33e1de..958d7fc 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -41,6 +41,7 @@ typedef struct LONG ref; CompareMethod method; + LONG count; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -200,14 +201,13 @@ static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *Key, VARIANT * return E_NOTIMPL; } -static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *pCount) +static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p)\n", This, pCount); - - *pCount = 0; + TRACE("(%p)->(%p)\n", This, count); + *count = This->count; return S_OK; } @@ -271,6 +271,9 @@ static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMeth TRACE("(%p)->(%d)\n", This, method); + if (This->count) + return CTL_E_ILLEGALFUNCTIONCALL; + This->method = method; return S_OK; } @@ -411,6 +414,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->IDictionary_iface.lpVtbl = &dictionary_vtbl; This->ref = 1; This->method = BinaryCompare; + This->count = 0; *obj = &This->IDictionary_iface;

1 0

Nikolay Sivov : advapi32: Fix trace format for access mask in OpenService( ).
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 7520297a49c9b058a5ddbfaec6bfb0c2b0d22c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7520297a49c9b058a5ddbfaec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 23:25:48 2015 +0300 advapi32: Fix trace format for access mask in OpenService(). --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4657bd9..f2d37ca 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -921,7 +921,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPWSTR lpServiceNameW; SC_HANDLE ret; - TRACE("%p %s %d\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); lpServiceNameW = SERV_dup(lpServiceName); ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); @@ -940,7 +940,7 @@ DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { DWORD err; - TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); if (!hSCManager) return ERROR_INVALID_HANDLE;

1 0

Sebastian Lackner : winebuild: Do not access memory below ESP when restoring thread contexts.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fbc018eda12bdee5c2c1e2e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 12 11:09:34 2015 +0100 winebuild: Do not access memory below ESP when restoring thread contexts. Based on a patch by John Reiser. --- tools/winebuild/relay.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cc7dd37..63c2ca4 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -852,31 +852,48 @@ static void build_call_from_regs_x86(void) /* Restore the context structure */ - output( "2:\tpushl 0x94(%%ecx)\n"); /* SegEs */ + output( "2:\n" ); + + /* As soon as we have switched stacks the context structure could + * be invalid (when signal handlers are executed for example). Copy + * values on the target stack before changing ESP. */ + + output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ + output( "\tpopl %%es\n" ); + output( "\tmovl 0xc4(%%ecx),%%eax\n" ); /* Esp */ + output( "\tleal -4*4(%%eax),%%eax\n" ); + + output( "\tmovl 0xc0(%%ecx),%%edx\n" ); /* EFlags */ + output( "\t.byte 0x26\n\tmovl %%edx,3*4(%%eax)\n" ); + output( "\tmovl 0xbc(%%ecx),%%edx\n" ); /* SegCs */ + output( "\t.byte 0x26\n\tmovl %%edx,2*4(%%eax)\n" ); + output( "\tmovl 0xb8(%%ecx),%%edx\n" ); /* Eip */ + output( "\t.byte 0x26\n\tmovl %%edx,1*4(%%eax)\n" ); + output( "\tmovl 0xb0(%%ecx),%%edx\n" ); /* Eax */ + output( "\t.byte 0x26\n\tmovl %%edx,0*4(%%eax)\n" ); + + output( "\tpushl %%es\n" ); + output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ + + output(" \tpushl 0x94(%%ecx)\n" ); /* SegEs */ output( "\tpopl %%es\n" ); output( "\tpushl 0x90(%%ecx)\n"); /* SegFs */ output( "\tpopl %%fs\n" ); output( "\tpushl 0x8c(%%ecx)\n"); /* SegGs */ output( "\tpopl %%gs\n" ); - output( "\tmovl 0x9c(%%ecx),%%edi\n"); /* Edi */ - output( "\tmovl 0xa0(%%ecx),%%esi\n"); /* Esi */ - output( "\tmovl 0xa8(%%ecx),%%edx\n"); /* Edx */ - output( "\tmovl 0xa4(%%ecx),%%ebx\n"); /* Ebx */ - output( "\tmovl 0xb0(%%ecx),%%eax\n"); /* Eax */ - output( "\tmovl 0xb4(%%ecx),%%ebp\n"); /* Ebp */ + output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ + output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ + output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ + output( "\tmovl 0xa8(%%ecx),%%edx\n" ); /* Edx */ + output( "\tmovl 0xb4(%%ecx),%%ebp\n" ); /* Ebp */ + output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ - output( "\tpushl 0xc8(%%ecx)\n"); /* SegSs */ + output( "\tpopl %%ds\n" ); output( "\tpopl %%ss\n" ); - output( "\tmovl 0xc4(%%ecx),%%esp\n"); /* Esp */ + output( "\tmovl %%eax,%%esp\n" ); - output( "\tpushl 0xc0(%%ecx)\n"); /* EFlags */ - output( "\tpushl 0xbc(%%ecx)\n"); /* SegCs */ - output( "\tpushl 0xb8(%%ecx)\n"); /* Eip */ - output( "\tpushl 0x98(%%ecx)\n"); /* SegDs */ - output( "\tmovl 0xac(%%ecx),%%ecx\n"); /* Ecx */ - - output( "\tpopl %%ds\n" ); + output( "\tpopl %%eax\n" ); output( "\tiret\n" ); output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" );

1 0

Nikolay Sivov : services: Mark WOW64 services in registry.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 1896064332f785a69f665d02e220d5878ead5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896064332f785a69f665d02e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:30:54 2015 +0300 services: Mark WOW64 services in registry. --- programs/services/rpc.c | 1 + programs/services/services.c | 15 +++++++++++++-- programs/services/services.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 43eb3cd..9ecc09c 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -510,6 +510,7 @@ static DWORD create_serviceW( } entry->ref_count = 1; + entry->is_wow64 = is_wow64; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; entry->config.dwErrorControl = dwErrorControl; diff --git a/programs/services/services.c b/programs/services/services.c index 54d9e89..dd79770 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -66,7 +66,7 @@ static const WCHAR SZ_OBJECT_NAME[] = {'O','b','j','e','c','t','N','a','m' 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}; DWORD service_create(LPCWSTR name, struct service_entry **entry) { @@ -108,7 +108,7 @@ void free_service_entry(struct service_entry *entry) static DWORD load_service_config(HKEY hKey, struct service_entry *entry) { - DWORD err; + DWORD err, value = 0; WCHAR *wptr; if ((err = load_reg_string(hKey, SZ_IMAGE_PATH, TRUE, &entry->config.lpBinaryPathName)) != 0) @@ -137,6 +137,9 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) if ((err = load_reg_dword(hKey, SZ_PRESHUTDOWN, &entry->preshutdown_timeout)) != 0) return err; + if (load_reg_dword(hKey, SZ_WOW64, &value) == 0 && value == 1) + entry->is_wow64 = TRUE; + WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); WINE_TRACE("Service account name = %s\n", wine_dbgstr_w(entry->config.lpServiceStartName) ); @@ -216,6 +219,14 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) goto cleanup; + if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) + goto cleanup; + if (entry->is_wow64) + { + const DWORD is_wow64 = 1; + if ((err = RegSetValueExW(hKey, SZ_WOW64, 0, REG_DWORD, (LPBYTE)&is_wow64, sizeof(DWORD))) != 0) + goto cleanup; + } if (entry->config.dwTagId) err = RegSetValueExW(hKey, SZ_TAG, 0, REG_DWORD, (LPBYTE)&entry->config.dwTagId, sizeof(DWORD)); diff --git a/programs/services/services.h b/programs/services/services.h index 88a84ad..9090542 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -49,6 +49,7 @@ struct service_entry HANDLE overlapped_event; HANDLE status_changed_event; BOOL marked_for_delete; + BOOL is_wow64; }; extern struct scmdatabase *active_database;

1 0