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

Michael Müller : kernel32: Add stub for GetCurrentPackageFamilyName.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: d2b98081fd107219bdadf284d7211303fdf86528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b98081fd107219bdadf284d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 02:13:24 2017 +0100 kernel32: Add stub for GetCurrentPackageFamilyName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- dlls/kernel32/version.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 2c5cf9e..50f8594 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -3,7 +3,7 @@ @ stub FormatApplicationUserModelId @ stub GetApplicationUserModelId @ stub GetCurrentApplicationUserModelId -@ stub GetCurrentPackageFamilyName +@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName @ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 59e39a7..a144fd1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -628,8 +628,9 @@ # @ stub GetCurrentConsoleFontEx @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) -@ stdcall GetCurrentPackageId(ptr ptr) +@ stdcall GetCurrentPackageFamilyName(ptr ptr) @ stdcall GetCurrentPackageFullName(ptr ptr) +@ stdcall GetCurrentPackageId(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index cf783af..5a233ef 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -202,6 +202,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType); } +/*********************************************************************** + * GetCurrentPackageId (KERNEL32.@) + */ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) { FIXME("(%p %p): stub\n", len, buffer); @@ -209,6 +212,15 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) } /*********************************************************************** + * GetCurrentPackageFamilyName (KERNEL32.@) + */ +LONG WINAPI GetCurrentPackageFamilyName(UINT32 *length, PWSTR name) +{ + FIXME("(%p %p): stub\n", length, name); + return APPMODEL_ERROR_NO_PACKAGE; +} + +/*********************************************************************** * GetCurrentPackageFullName (KERNEL32.@) */ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name)

1 0

Henri Verbeet : usp10: Introduce an enumeration for script types.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: a523b46d0bd63a15bafbd2b0b0d13a09ffbe9d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a523b46d0bd63a15bafbd2b0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:28 2017 +0100 usp10: Introduce an enumeration for script types. 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/usp10.c | 51 ++++++------ dlls/usp10/usp10_internal.h | 192 ++++++++++++++++++++++---------------------- 2 files changed, 123 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a523b46d0bd63a15bafbd…

1 0

Henri Verbeet : usp10: Do not fall back to presentation form B if the contextual feature exists in ContextualShape_Arabic ().
by Alexandre Julliard March 8, 2017

March 8, 2017

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

Henri Verbeet : wined3d: Abort on invalid instructions in shader_get_registers_used().
by Alexandre Julliard March 8, 2017

March 8, 2017

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

Michael Müller : cabinet: Set index of folder in FDICopy callback.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 67639e6ce7b88894009751b19051c58b7258f952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67639e6ce7b88894009751b19… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 01:07:36 2017 +0100 cabinet: Set index of folder in FDICopy callback. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 2 ++ dlls/cabinet/tests/fdi.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fdff0bf..758133e 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2640,6 +2640,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; + fdin.iFolder = file->index; if ((filehf = ((*pfnfdin)(fdintCOPY_FILE, &fdin))) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); filehf = 0; @@ -2765,6 +2766,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + fdin.iFolder = file->index; ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); filehf = 0; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index b5bec38..ba622f6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -116,7 +116,7 @@ static const struct { { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, - { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { sizeof("Hello World!")-1, 0, 0x1234, 0x1225, 0x2013, 0xa114 }, { 'f','i','l','e','.','d','a','t',0 }, { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, { 'H','e','l','l','o',' ','W','o','r','l','d','!' } @@ -841,7 +841,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); - ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 1; case fdintCOPY_FILE: @@ -850,6 +850,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->cb == 12, "expected 12, got %u\n", info->cb); ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 0x12345678; /* call write() callback */ }

1 0

Henri Verbeet : usp10: Use bsearch() to lookup the script range in get_char_script().
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 3c704c2c16237167d356cbc174602aebe3b08bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c704c2c16237167d356cbc17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 7 08:57:29 2017 +0100 usp10: Use bsearch() to lookup the script range in get_char_script(). 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/usp10.c | 45 +++++++++++++++++++++++---------------------- dlls/usp10/usp10_internal.h | 3 +++ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6711347..8a8a62f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); -static const struct +static const struct usp10_script_range { enum usp10_script script; DWORD rangeFirst; @@ -51,7 +51,7 @@ static const struct enum usp10_script numericScript; enum usp10_script punctScript; } -scriptRanges[] = +script_ranges[] = { /* Basic Latin: U+0000–U+007A */ { Script_Latin, 0x00, 0x07a , Script_Numeric, Script_Punctuation}, @@ -296,8 +296,6 @@ scriptRanges[] = { Script_Osmanya, 0x10480, 0x104AF, Script_Osmanya_Numeric, 0}, /* Mathematical Alphanumeric Symbols: U+1D400–U+1D7FF */ { Script_MathAlpha, 0x1D400, 0x1D7FF, 0, 0}, - /* END */ - { SCRIPT_UNDEFINED, 0, 0, 0} }; /* this must be in order so that the index matches the Script value */ @@ -888,13 +886,25 @@ static inline DWORD decode_surrogate_pair(LPCWSTR str, INT index, INT end) return 0; } +static int usp10_compare_script_range(const void *key, const void *value) +{ + const struct usp10_script_range *range = value; + const DWORD *ch = key; + + if (*ch < range->rangeFirst) + return -1; + if (*ch > range->rangeLast) + return 1; + return 0; +} + static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, unsigned int end, unsigned int *consumed) { static const WCHAR latin_punc[] = {'#','$','&','\'',',',';','<','>','?','@','\\','^','_','`','{','|','}','~', 0x00a0, 0}; + struct usp10_script_range *range; WORD type = 0, type2 = 0; DWORD ch; - int i; *consumed = 1; @@ -936,24 +946,15 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, else ch = str[index]; - i = 0; - do - { - if (ch < scriptRanges[i].rangeFirst || scriptRanges[i].script == SCRIPT_UNDEFINED) - break; - - if (ch >= scriptRanges[i].rangeFirst && ch <= scriptRanges[i].rangeLast) - { - if (scriptRanges[i].numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) - return scriptRanges[i].numericScript; - if (scriptRanges[i].punctScript && type & C1_PUNCT) - return scriptRanges[i].punctScript; - return scriptRanges[i].script; - } - i++; - } while (1); + if (!(range = bsearch(&ch, script_ranges, ARRAY_SIZE(script_ranges), + sizeof(*script_ranges), usp10_compare_script_range))) + return Script_Undefined; - return SCRIPT_UNDEFINED; + if (range->numericScript && (type & C1_DIGIT || type2 == C2_ARABICNUMBER)) + return range->numericScript; + if (range->punctScript && type & C1_PUNCT) + return range->punctScript; + return range->script; } static int compare_FindGlyph(const void *a, const void* b) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index dd1b9fa..989620d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -24,6 +24,9 @@ ( (ULONG)_x2 << 8 ) | \ (ULONG)_x1 ) +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif enum usp10_script {

1 0

Hans Leidekker : webservices: Protect readers with a critical section.
by Alexandre Julliard March 8, 2017

March 8, 2017

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

Hans Leidekker : webservices: Protect heaps with a critical section.
by Alexandre Julliard March 8, 2017

March 8, 2017

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 errors with a critical section.
by Alexandre Julliard March 8, 2017

March 8, 2017

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 writers with a critical section.
by Alexandre Julliard March 8, 2017

March 8, 2017

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