March 2017 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Abort on invalid instructions in shader_get_registers_used().
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: dfe8b7798a7bb408cec72106ba18f2c6505525a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe8b7798a7bb408cec72106b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:06 2017 +0100 wined3d: Abort on invalid instructions in shader_get_registers_used(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/d3d9/tests/device.c | 2 +- dlls/wined3d/shader.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 1dbab26..a3cbdbf 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2429,7 +2429,7 @@ static void test_unsupported_shaders(void) hr = IDirect3DDevice9Ex_CreatePixelShader(device, ps_3_224, &ps); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CreatePixelShader(device, ps_2_0_boolint, &ps); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); if (ps) IDirect3DPixelShader9_Release(ps); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5aba575..4da1653 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6528,7 +6528,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET hr = IDirect3DDevice9_CreatePixelShader(device, ps_3_224, &ps); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ps_2_0_boolint, &ps); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); if (ps) IDirect3DPixelShader9_Release(ps); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0c617c4..9601b2d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -933,8 +933,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st /* Unhandled opcode, and its parameters. */ if (ins.handler_idx == WINED3DSIH_TABLE_SIZE) { - TRACE("Skipping unrecognized instruction.\n"); - continue; + WARN("Encountered unrecognised or invalid instruction.\n"); + return WINED3DERR_INVALIDCALL; } /* Handle declarations. */

1 0

Hans Leidekker : webservices: Implement WS_HEAP_PROPERTY_REQUESTED_SIZE and WS_HEAP_PROPERTY_ACTUAL_SIZE.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: c6a392b9843f64b9e8ae497b03f701a1d0d22418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a392b9843f64b9e8ae497b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:53 2017 +0100 webservices: Implement WS_HEAP_PROPERTY_REQUESTED_SIZE and WS_HEAP_PROPERTY_ACTUAL_SIZE. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 14 +++++++++++++- dlls/webservices/tests/reader.c | 21 ++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5d15f78..8d4a751 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -877,7 +877,19 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); - return prop_get( heap->prop, heap->prop_count, id, buf, size ); + switch (id) + { + case WS_HEAP_PROPERTY_REQUESTED_SIZE: + case WS_HEAP_PROPERTY_ACTUAL_SIZE: + { + SIZE_T *heap_size = buf; + if (!buf || size != sizeof(heap_size)) return E_INVALIDARG; + *heap_size = heap->allocated; + return S_OK; + } + default: + return prop_get( heap->prop, heap->prop_count, id, buf, size ); + } } /************************************************************************** diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 28a7af4..c10b581 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1758,6 +1758,8 @@ static void test_WsAlloc(void) HRESULT hr; WS_HEAP *heap; void *ptr; + SIZE_T requested, actual; + ULONG size; hr = WsCreateHeap( 256, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1776,6 +1778,19 @@ static void test_WsAlloc(void) hr = WsAlloc( heap, 16, &ptr, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( ptr != NULL, "ptr not set\n" ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( requested == 16, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + WsFreeHeap( heap ); } @@ -3078,13 +3093,13 @@ static void test_WsResetHeap(void) size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( requested == 128, "got %u\n", (ULONG)requested ); + ok( requested == 128, "got %u\n", (ULONG)requested ); actual = 0xdeadbeef; size = sizeof(actual); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + ok( actual == 128, "got %u\n", (ULONG)actual ); hr = WsAlloc( heap, 1, &ptr, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -3093,7 +3108,7 @@ static void test_WsResetHeap(void) size = sizeof(requested); hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( requested == 129, "got %u\n", (ULONG)requested ); + ok( requested == 129, "got %u\n", (ULONG)requested ); actual = 0xdeadbeef; size = sizeof(actual);

1 0

Hans Leidekker : webservices: Protect messages with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 2422fe84575e39c148df1a2580d99d6d0626d889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2422fe84575e39c148df1a258… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:54 2017 +0100 webservices: Protect messages with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 616 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 486 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2422fe84575e39c148df1…

1 0

Hans Leidekker : webservices: Protect channels with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 4cd4f7c4ca4b20d0cd9d2aaadd9786b501984a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd4f7c4ca4b20d0cd9d2aaad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:55 2017 +0100 webservices: Protect channels with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 176 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 153 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cd4f7c4ca4b20d0cd9d2…

1 0

Hans Leidekker : webservices: Protect proxies with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: fc30e2054c2897a3548ea07fa48a3743411dbda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc30e2054c2897a3548ea07fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:56 2017 +0100 webservices: Protect proxies with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 108 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 92 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 05214e0..63cf559 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -43,11 +43,15 @@ static const struct prop_desc proxy_props[] = struct proxy { - WS_CHANNEL *channel; - ULONG prop_count; - struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; + ULONG magic; + CRITICAL_SECTION cs; + WS_CHANNEL *channel; + ULONG prop_count; + struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; }; +#define PROXY_MAGIC (('P' << 24) | ('R' << 16) | ('O' << 8) | 'X') + static struct proxy *alloc_proxy(void) { static const ULONG count = sizeof(proxy_props)/sizeof(proxy_props[0]); @@ -55,6 +59,11 @@ static struct proxy *alloc_proxy(void) ULONG size = sizeof(*ret) + prop_size( proxy_props, count ); if (!(ret = heap_alloc_zero( size ))) return NULL; + + ret->magic = PROXY_MAGIC; + InitializeCriticalSection( &ret->cs ); + ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy.cs"); + prop_init( proxy_props, count, ret->prop, &ret[1] ); ret->prop_count = count; return ret; @@ -62,8 +71,9 @@ static struct proxy *alloc_proxy(void) static void free_proxy( struct proxy *proxy ) { - if (!proxy) return; WsFreeChannel( proxy->channel ); + proxy->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &proxy->cs ); heap_free( proxy ); } @@ -188,6 +198,20 @@ void WINAPI WsFreeServiceProxy( WS_SERVICE_PROXY *handle ) struct proxy *proxy = (struct proxy *)handle; TRACE( "%p\n", handle ); + + if (!proxy) return; + + EnterCriticalSection( &proxy->cs ); + + if (proxy->magic != PROXY_MAGIC) + { + LeaveCriticalSection( &proxy->cs ); + return; + } + + proxy->magic = 0; + + LeaveCriticalSection( &proxy->cs ); free_proxy( proxy ); } @@ -198,11 +222,25 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO void *buf, ULONG size, WS_ERROR *error ) { struct proxy *proxy = (struct proxy *)handle; + HRESULT hr; TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); - return prop_get( proxy->prop, proxy->prop_count, id, buf, size ); + if (!proxy) return E_INVALIDARG; + + EnterCriticalSection( &proxy->cs ); + + if (proxy->magic != PROXY_MAGIC) + { + LeaveCriticalSection( &proxy->cs ); + return E_INVALIDARG; + } + + hr = prop_get( proxy->prop, proxy->prop_count, id, buf, size ); + + LeaveCriticalSection( &proxy->cs ); + return hr; } /************************************************************************** @@ -212,13 +250,26 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct proxy *proxy = (struct proxy *)handle; + HRESULT hr; TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (!handle || !endpoint) return E_INVALIDARG; - return WsOpenChannel( proxy->channel, endpoint, NULL, NULL ); + if (!proxy || !endpoint) return E_INVALIDARG; + + EnterCriticalSection( &proxy->cs ); + + if (proxy->magic != PROXY_MAGIC) + { + LeaveCriticalSection( &proxy->cs ); + return E_INVALIDARG; + } + + hr = WsOpenChannel( proxy->channel, endpoint, NULL, NULL ); + + LeaveCriticalSection( &proxy->cs ); + return hr; } /************************************************************************** @@ -227,13 +278,26 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct proxy *proxy = (struct proxy *)handle; + HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (!handle) return E_INVALIDARG; - return WsCloseChannel( proxy->channel, NULL, NULL ); + if (!proxy) return E_INVALIDARG; + + EnterCriticalSection( &proxy->cs ); + + if (proxy->magic != PROXY_MAGIC) + { + LeaveCriticalSection( &proxy->cs ); + return E_INVALIDARG; + } + + hr = WsCloseChannel( proxy->channel, NULL, NULL ); + + LeaveCriticalSection( &proxy->cs ); + return hr; } /************************************************************************** @@ -374,7 +438,7 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct proxy *proxy = (struct proxy *)handle; - WS_MESSAGE *msg; + WS_MESSAGE *msg = NULL; HRESULT hr; ULONG i; @@ -391,17 +455,29 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION } } - if (!handle || !desc || (desc->parameterCount && !args)) return E_INVALIDARG; + if (!proxy || !desc || (desc->parameterCount && !args)) return E_INVALIDARG; + + EnterCriticalSection( &proxy->cs ); + + if (proxy->magic != PROXY_MAGIC) + { + LeaveCriticalSection( &proxy->cs ); + return E_INVALIDARG; + } + + if ((hr = create_input_message( proxy->channel, properties, count, &msg )) != S_OK) goto done; + if ((hr = send_message( proxy->channel, msg, desc->inputMessageDescription, desc->parameterDescription, + desc->parameterCount, args )) != S_OK) goto done; - if ((hr = create_input_message( proxy->channel, properties, count, &msg )) != S_OK) return hr; - hr = send_message( proxy->channel, msg, desc->inputMessageDescription, desc->parameterDescription, - desc->parameterCount, args ); WsFreeMessage( msg ); - if (hr != S_OK) return hr; + msg = NULL; - if ((hr = create_output_message( proxy->channel, properties, count, &msg )) != S_OK) return hr; + if ((hr = create_output_message( proxy->channel, properties, count, &msg )) != S_OK) goto done; hr = receive_message( proxy->channel, msg, desc->outputMessageDescription, desc->parameterDescription, desc->parameterCount, heap, args ); + +done: WsFreeMessage( msg ); + LeaveCriticalSection( &proxy->cs ); return hr; }

1 0

Hans Leidekker : webservices: Protect writers with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: bf589507cdc736d5d53c01088ada305d10bdce2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf589507cdc736d5d53c01088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:57 2017 +0100 webservices: Protect writers with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 625 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 515 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf589507cdc736d5d53c0…

1 0

Hans Leidekker : webservices: Protect errors with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: f261a830c4831d7703e31390ab444bef7a3ba951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f261a830c4831d7703e31390a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:58 2017 +0100 webservices: Protect errors with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 170 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 125 insertions(+), 45 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8d4a751..8c538ea 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -79,10 +79,14 @@ static const struct prop_desc error_props[] = struct error { - ULONG prop_count; - struct prop prop[sizeof(error_props)/sizeof(error_props[0])]; + ULONG magic; + CRITICAL_SECTION cs; + ULONG prop_count; + struct prop prop[sizeof(error_props)/sizeof(error_props[0])]; }; +#define ERROR_MAGIC (('E' << 24) | ('R' << 16) | ('R' << 8) | 'O') + static struct error *alloc_error(void) { static const ULONG count = sizeof(error_props)/sizeof(error_props[0]); @@ -90,11 +94,23 @@ static struct error *alloc_error(void) ULONG size = sizeof(*ret) + prop_size( error_props, count ); if (!(ret = heap_alloc_zero( size ))) return NULL; + + ret->magic = ERROR_MAGIC; + InitializeCriticalSection( &ret->cs ); + ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": error.cs"); + prop_init( error_props, count, ret->prop, &ret[1] ); ret->prop_count = count; return ret; } +static void free_error( struct error *error ) +{ + error->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &error->cs ); + heap_free( error ); +} + /************************************************************************** * WsCreateError [webservices.@] */ @@ -115,14 +131,14 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, { if (properties[i].id == WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE) { - heap_free( error ); + free_error( error ); return E_INVALIDARG; } hr = prop_set( error->prop, error->prop_count, properties[i].id, properties[i].value, properties[i].valueSize ); if (hr != S_OK) { - heap_free( error ); + free_error( error ); return hr; } } @@ -131,6 +147,13 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, return S_OK; } +static void reset_error( struct error *error ) +{ + ULONG code = 0; + /* FIXME: release strings added with WsAddErrorString when it's implemented, reset string count */ + prop_set( error->prop, error->prop_count, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, sizeof(code) ); +} + /************************************************************************** * WsFreeError [webservices.@] */ @@ -139,7 +162,22 @@ void WINAPI WsFreeError( WS_ERROR *handle ) struct error *error = (struct error *)handle; TRACE( "%p\n", handle ); - heap_free( error ); + + if (!error) return; + + EnterCriticalSection( &error->cs ); + + if (error->magic != ERROR_MAGIC) + { + LeaveCriticalSection( &error->cs ); + return; + } + + reset_error( error ); + error->magic = 0; + + LeaveCriticalSection( &error->cs ); + free_error( error ); } /************************************************************************** @@ -148,15 +186,92 @@ void WINAPI WsFreeError( WS_ERROR *handle ) HRESULT WINAPI WsResetError( WS_ERROR *handle ) { struct error *error = (struct error *)handle; - ULONG code; TRACE( "%p\n", handle ); - if (!handle) return E_INVALIDARG; + if (!error) return E_INVALIDARG; - /* FIXME: release strings added with WsAddErrorString when it's implemented, reset string count */ - code = 0; - return prop_set( error->prop, error->prop_count, WS_ERROR_PROPERTY_ORIGINAL_ERROR_CODE, &code, sizeof(code) ); + EnterCriticalSection( &error->cs ); + + if (error->magic != ERROR_MAGIC) + { + LeaveCriticalSection( &error->cs ); + return E_INVALIDARG; + } + + reset_error( error ); + + LeaveCriticalSection( &error->cs ); + return S_OK; +} + +/************************************************************************** + * WsGetErrorProperty [webservices.@] + */ +HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, void *buf, + ULONG size ) +{ + struct error *error = (struct error *)handle; + HRESULT hr; + + TRACE( "%p %u %p %u\n", handle, id, buf, size ); + + if (!error) return E_INVALIDARG; + + EnterCriticalSection( &error->cs ); + + if (error->magic != ERROR_MAGIC) + { + LeaveCriticalSection( &error->cs ); + return E_INVALIDARG; + } + + hr = prop_get( error->prop, error->prop_count, id, buf, size ); + + LeaveCriticalSection( &error->cs ); + return hr; +} + +/************************************************************************** + * WsGetErrorString [webservices.@] + */ +HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) +{ + FIXME( "%p %u %p: stub\n", handle, index, str ); + return E_NOTIMPL; +} + +/************************************************************************** + * WsSetErrorProperty [webservices.@] + */ +HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, + ULONG size ) +{ + struct error *error = (struct error *)handle; + HRESULT hr; + + TRACE( "%p %u %p %u\n", handle, id, value, size ); + + if (!error) return E_INVALIDARG; + + EnterCriticalSection( &error->cs ); + + if (error->magic != ERROR_MAGIC) + { + LeaveCriticalSection( &error->cs ); + return E_INVALIDARG; + } + + if (id == WS_ERROR_PROPERTY_LANGID) + { + LeaveCriticalSection( &error->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = prop_set( error->prop, error->prop_count, id, value, size ); + + LeaveCriticalSection( &error->cs ); + return hr; } static const struct prop_desc heap_props[] = @@ -846,27 +961,6 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY } /************************************************************************** - * WsGetErrorProperty [webservices.@] - */ -HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, void *buf, - ULONG size ) -{ - struct error *error = (struct error *)handle; - - TRACE( "%p %u %p %u\n", handle, id, buf, size ); - return prop_get( error->prop, error->prop_count, id, buf, size ); -} - -/************************************************************************** - * WsGetErrorString [webservices.@] - */ -HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) -{ - FIXME( "%p %u %p: stub\n", handle, index, str ); - return E_NOTIMPL; -} - -/************************************************************************** * WsGetHeapProperty [webservices.@] */ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, @@ -4358,20 +4452,6 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi NULL, value, size ); } -/************************************************************************** - * WsSetErrorProperty [webservices.@] - */ -HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, - ULONG size ) -{ - struct error *error = (struct error *)handle; - - TRACE( "%p %u %p %u\n", handle, id, value, size ); - - if (id == WS_ERROR_PROPERTY_LANGID) return WS_E_INVALID_OPERATION; - return prop_set( error->prop, error->prop_count, id, value, size ); -} - static inline BOOL is_utf8( const unsigned char *data, ULONG size, ULONG *offset ) { static const char bom[] = {0xef,0xbb,0xbf};

1 0

Hans Leidekker : webservices: Protect heaps with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: dea8708079414d26c4ab41d539da9cc7451a5d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea8708079414d26c4ab41d53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:25:59 2017 +0100 webservices: Protect heaps with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 182 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 134 insertions(+), 48 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8c538ea..6c95d8a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -284,13 +284,17 @@ static const struct prop_desc heap_props[] = struct heap { - HANDLE handle; - SIZE_T max_size; - SIZE_T allocated; - ULONG prop_count; - struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; + ULONG magic; + CRITICAL_SECTION cs; + HANDLE handle; + SIZE_T max_size; + SIZE_T allocated; + ULONG prop_count; + struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; }; +#define HEAP_MAGIC (('H' << 24) | ('E' << 16) | ('A' << 8) | 'P') + static BOOL ensure_heap( struct heap *heap ) { SIZE_T size; @@ -304,31 +308,48 @@ static BOOL ensure_heap( struct heap *heap ) void *ws_alloc( WS_HEAP *handle, SIZE_T size ) { - void *ret; struct heap *heap = (struct heap *)handle; - if (!ensure_heap( heap ) || size > heap->max_size - heap->allocated) return NULL; + void *ret = NULL; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC) goto done; + if (!ensure_heap( heap ) || size > heap->max_size - heap->allocated) goto done; if ((ret = HeapAlloc( heap->handle, 0, size ))) heap->allocated += size; + +done: + LeaveCriticalSection( &heap->cs ); return ret; } static void *ws_alloc_zero( WS_HEAP *handle, SIZE_T size ) { - void *ret; struct heap *heap = (struct heap *)handle; - if (!ensure_heap( heap ) || size > heap->max_size - heap->allocated) return NULL; + void *ret = NULL; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC) goto done; + if (!ensure_heap( heap ) || size > heap->max_size - heap->allocated) goto done; if ((ret = HeapAlloc( heap->handle, HEAP_ZERO_MEMORY, size ))) heap->allocated += size; + +done: + LeaveCriticalSection( &heap->cs ); return ret; } void *ws_realloc( WS_HEAP *handle, void *ptr, SIZE_T old_size, SIZE_T new_size ) { - void *ret; struct heap *heap = (struct heap *)handle; - if (!ensure_heap( heap )) return NULL; + void *ret = NULL; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC || !ensure_heap( heap )) goto done; if (new_size >= old_size) { SIZE_T size = new_size - old_size; - if (size > heap->max_size - heap->allocated) return NULL; + if (size > heap->max_size - heap->allocated) goto done; if ((ret = HeapReAlloc( heap->handle, 0, ptr, new_size ))) heap->allocated += size; } else @@ -336,18 +357,24 @@ void *ws_realloc( WS_HEAP *handle, void *ptr, SIZE_T old_size, SIZE_T new_size ) SIZE_T size = old_size - new_size; if ((ret = HeapReAlloc( heap->handle, 0, ptr, new_size ))) heap->allocated -= size; } + +done: + LeaveCriticalSection( &heap->cs ); return ret; } static void *ws_realloc_zero( WS_HEAP *handle, void *ptr, SIZE_T old_size, SIZE_T new_size ) { - void *ret; struct heap *heap = (struct heap *)handle; - if (!ensure_heap( heap )) return NULL; + void *ret = NULL; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC || !ensure_heap( heap )) goto done; if (new_size >= old_size) { SIZE_T size = new_size - old_size; - if (size > heap->max_size - heap->allocated) return NULL; + if (size > heap->max_size - heap->allocated) goto done; if ((ret = HeapReAlloc( heap->handle, HEAP_ZERO_MEMORY, ptr, new_size ))) heap->allocated += size; } else @@ -355,15 +382,25 @@ static void *ws_realloc_zero( WS_HEAP *handle, void *ptr, SIZE_T old_size, SIZE_ SIZE_T size = old_size - new_size; if ((ret = HeapReAlloc( heap->handle, HEAP_ZERO_MEMORY, ptr, new_size ))) heap->allocated -= size; } + +done: + LeaveCriticalSection( &heap->cs ); return ret; } void ws_free( WS_HEAP *handle, void *ptr, SIZE_T size ) { struct heap *heap = (struct heap *)handle; - if (!heap->handle) return; - HeapFree( heap->handle, 0, ptr ); - heap->allocated -= size; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic == HEAP_MAGIC) + { + HeapFree( heap->handle, 0, ptr ); + heap->allocated -= size; + } + + LeaveCriticalSection( &heap->cs ); } /************************************************************************** @@ -389,6 +426,11 @@ static struct heap *alloc_heap(void) ULONG size = sizeof(*ret) + prop_size( heap_props, count ); if (!(ret = heap_alloc_zero( size ))) return NULL; + + ret->magic = HEAP_MAGIC; + InitializeCriticalSection( &ret->cs ); + ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); + prop_init( heap_props, count, ret->prop, &ret[1] ); ret->prop_count = count; return ret; @@ -415,6 +457,13 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR return S_OK; } +static void reset_heap( struct heap *heap ) +{ + HeapDestroy( heap->handle ); + heap->handle = NULL; + heap->max_size = heap->allocated = 0; +} + /************************************************************************** * WsFreeHeap [webservices.@] */ @@ -425,7 +474,22 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) TRACE( "%p\n", handle ); if (!heap) return; - HeapDestroy( heap->handle ); + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC) + { + LeaveCriticalSection( &heap->cs ); + return; + } + + reset_heap( heap ); + heap->magic = 0; + + LeaveCriticalSection( &heap->cs ); + + heap->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &heap->cs ); heap_free( heap ); } @@ -441,12 +505,60 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) if (!heap) return E_INVALIDARG; - HeapDestroy( heap->handle ); - heap->handle = NULL; - heap->max_size = heap->allocated = 0; + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC) + { + LeaveCriticalSection( &heap->cs ); + return E_INVALIDARG; + } + + reset_heap( heap ); + + LeaveCriticalSection( &heap->cs ); return S_OK; } +/************************************************************************** + * WsGetHeapProperty [webservices.@] + */ +HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct heap *heap = (struct heap *)handle; + HRESULT hr = S_OK; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!heap) return E_INVALIDARG; + + EnterCriticalSection( &heap->cs ); + + if (heap->magic != HEAP_MAGIC) + { + LeaveCriticalSection( &heap->cs ); + return E_INVALIDARG; + } + + switch (id) + { + case WS_HEAP_PROPERTY_REQUESTED_SIZE: + case WS_HEAP_PROPERTY_ACTUAL_SIZE: + { + SIZE_T *heap_size = buf; + if (!buf || size != sizeof(heap_size)) hr = E_INVALIDARG; + else *heap_size = heap->allocated; + break; + } + default: + hr = prop_get( heap->prop, heap->prop_count, id, buf, size ); + } + + LeaveCriticalSection( &heap->cs ); + return hr; +} + struct node *alloc_node( WS_XML_NODE_TYPE type ) { struct node *ret; @@ -961,32 +1073,6 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY } /************************************************************************** - * WsGetHeapProperty [webservices.@] - */ -HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void *buf, - ULONG size, WS_ERROR *error ) -{ - struct heap *heap = (struct heap *)handle; - - TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); - if (error) FIXME( "ignoring error parameter\n" ); - - switch (id) - { - case WS_HEAP_PROPERTY_REQUESTED_SIZE: - case WS_HEAP_PROPERTY_ACTUAL_SIZE: - { - SIZE_T *heap_size = buf; - if (!buf || size != sizeof(heap_size)) return E_INVALIDARG; - *heap_size = heap->allocated; - return S_OK; - } - default: - return prop_get( heap->prop, heap->prop_count, id, buf, size ); - } -} - -/************************************************************************** * WsGetNamespaceFromPrefix [webservices.@] */ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STRING *prefix,

1 0

Hans Leidekker : webservices: Protect readers with a critical section.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 36c5252265be968388db4e65bdeeae1d4063bd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c5252265be968388db4e65b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 8 11:26:00 2017 +0100 webservices: Protect readers with a critical section. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 592 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 488 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36c5252265be968388db4…

1 0

Henri Verbeet : usp10: Do not fall back to presentation form B if the contextual feature exists in ContextualShape_Arabic ().
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 502d23986c90f8b5fe61e690f78c811a1192b7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=502d23986c90f8b5fe61e690f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:27 2017 +0100 usp10: Do not fall back to presentation form B if the contextual feature exists in ContextualShape_Arabic(). E.g., the base form of 'ا' may be the same as the isolated form, in which case the "isol" feature may not have a substitution for it. At the same time, while the presentation form B glyph may look the same or similar as the base form, it may have a different glyph ID. This can break e.g. GSUB_LOOKUP_CONTEXT_CHAINED substitutions because of the unexpected glyph ID. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index ce19465..9d07e5b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1129,8 +1129,14 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p offset = *pcGlyphs - prevCount; glyph_index += dirL * (offset + 1); } + shaped = TRUE; + } + else if (nextIndex == GSUB_E_NOGLYPH) + { + char_index += dirL; + glyph_index += dirL; + shaped = TRUE; } - shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped)

1 0