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

Francois Gouget : wmiutils: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: b16f08b254d3199f51847acb2de6bd8061b76c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16f08b254d3199f51847acb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 28 18:52:53 2017 +0100 wmiutils: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/wmiutils_private.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 2b76f71..6782bd8 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -21,27 +21,24 @@ HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupW( const WCHAR *src )

1 0

Bruno Jesus : wine.inf: Add RtlTryEnterCriticalSection to default RelayExclude.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: c5bfbefacdab3c91fd84e8cede7f98eb6c4990a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bfbefacdab3c91fd84e8ced… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 18:19:01 2017 -0300 wine.inf: Add RtlTryEnterCriticalSection to default RelayExclude. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 18d8a49..0b3c940 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -530,7 +530,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" -HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlTryEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32" [DirectX]

1 0

Henri Verbeet : usp10: Make feature tables const.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 66df220c0059aead21ebf3fc625d9a01fa9d167e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66df220c0059aead21ebf3fc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:54 2017 +0100 usp10: Make feature tables const. 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 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5c257dd..8daefcc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -125,7 +125,7 @@ typedef void (*second_reorder_function)(LPWSTR pwChar, IndicSyllable *syllable,W typedef int (*combining_lexical_function)(WCHAR c); /* the orders of joined_forms and contextual_features need to line up */ -static const char* contextual_features[] = +static const char *const contextual_features[] = { "isol", "fina", @@ -168,7 +168,7 @@ static OPENTYPE_FEATURE_RECORD arabic_features[] = { MS_MAKE_TAG('m','s','e','t'), 1}, }; -static const char* required_arabic_features[] = +static const char *const required_arabic_features[] = { "fina", "init", @@ -205,7 +205,7 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = { MS_MAKE_TAG('d','l','i','g'), 1}, }; -static const char* required_syriac_features[] = +static const char *const required_syriac_features[] = { "fina", "fin2", @@ -263,13 +263,13 @@ static OPENTYPE_FEATURE_RECORD thai_gpos_features[] = { MS_MAKE_TAG('m','k','m','k'), 1}, }; -static const char* required_lao_features[] = +static const char *const required_lao_features[] = { "ccmp", NULL }; -static const char* required_devanagari_features[] = +static const char *const required_devanagari_features[] = { "nukt", "akhn", @@ -309,7 +309,7 @@ static OPENTYPE_FEATURE_RECORD myanmar_features[] = { MS_MAKE_TAG('c','l','i','g'), 1}, }; -static const char* required_bengali_features[] = +static const char *const required_bengali_features[] = { "nukt", "akhn", @@ -326,7 +326,7 @@ static const char* required_bengali_features[] = NULL }; -static const char* required_gurmukhi_features[] = +static const char *const required_gurmukhi_features[] = { "nukt", "akhn", @@ -345,7 +345,7 @@ static const char* required_gurmukhi_features[] = NULL }; -static const char* required_oriya_features[] = +static const char *const required_oriya_features[] = { "nukt", "akhn", @@ -362,7 +362,7 @@ static const char* required_oriya_features[] = NULL }; -static const char* required_tamil_features[] = +static const char *const required_tamil_features[] = { "nukt", "akhn", @@ -378,7 +378,7 @@ static const char* required_tamil_features[] = NULL }; -static const char* required_telugu_features[] = +static const char *const required_telugu_features[] = { "nukt", "akhn", @@ -405,7 +405,7 @@ static OPENTYPE_FEATURE_RECORD khmer_features[] = { MS_MAKE_TAG('c','l','i','g'), 1}, }; -static const char* required_khmer_features[] = +static const char *const required_khmer_features[] = { "pref", "blwf", @@ -446,7 +446,7 @@ static OPENTYPE_FEATURE_RECORD mongolian_features[] = typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; TEXTRANGE_PROPERTIES defaultGPOSTextRange; - const char** requiredFeatures; + const char *const *requiredFeatures; OPENTYPE_TAG newOtTag; ContextualShapingProc contextProc; ShapeCharGlyphPropProc charGlyphPropProc;

1 0

Henri Verbeet : usp10: Use memmove() in GSUB_apply_LigatureSubst().
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: bab506e1cd99d1284cb6bfe05610a2416d04b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab506e1cd99d1284cb6bfe05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:55 2017 +0100 usp10: Use memmove() in GSUB_apply_LigatureSubst(). 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/opentype.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 4f3b559..3bbf5ec 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1058,9 +1058,8 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN TRACE("0x%x\n",glyphs[replaceIdx]); if (CompCount > 0) { - int j; - for (j = replaceIdx + 1; j < *glyph_count; j++) - glyphs[j] =glyphs[j+CompCount]; + unsigned int j = replaceIdx + 1; + memmove(&glyphs[j], &glyphs[j + CompCount], (*glyph_count - j) * sizeof(*glyphs)); *glyph_count = *glyph_count - CompCount; } return replaceIdx + write_dir;

1 0

Henri Verbeet : usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters() .
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 1727dd41568cc445cf33e211f580ca706b622f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1727dd41568cc445cf33e211f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:56 2017 +0100 usp10: Use USP10_FindGlyphInLogClust() in UpdateClusters(). 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 | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8daefcc..9e0addc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -753,11 +753,9 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch { int i; int target_glyph = nextIndex - write_dir; - int seeking_glyph; int target_index = -1; int replacing_glyph = -1; int changed = 0; - int top_logclust = 0; if (changeCount > 0) { @@ -767,35 +765,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch target_glyph = nextIndex + (changeCount + 1); } - seeking_glyph = target_glyph; - for (i = 0; i < chars; i++) - if (pwLogClust[i] > top_logclust) - top_logclust = pwLogClust[i]; - - do { - if (write_dir > 0) - for (i = 0; i < chars; i++) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - else - for (i = chars - 1; i >= 0; i--) - { - if (pwLogClust[i] == seeking_glyph) - { - target_index = i; - break; - } - } - if (target_index == -1) - seeking_glyph ++; - } - while (target_index == -1 && seeking_glyph <= top_logclust); - + target_index = USP10_FindGlyphInLogClust(pwLogClust, chars, target_glyph); if (target_index == -1) { ERR("Unable to find target glyph\n");

1 0

Huw Davies : oledb32: Fixed length calculation in conversion to DBTYPE_STR.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 28debe67d251f91400f4d23e23795a853eda5fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=28debe67d251f91400f4d23e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 11:32:05 2017 +0000 oledb32: Fixed length calculation in conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ac462f2..e3e29e0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -813,26 +813,27 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, SysFreeString(b); return hr; } + case DBTYPE_STR: { BSTR b; - DBLENGTH bstr_len; + DBLENGTH length; INT bytes_to_copy; - hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &length, src, &b, sizeof(BSTR), src_status, dst_status, precision, scale, flags); if(hr != S_OK) return hr; - bstr_len = SysStringLen(b); - *dst_len = bstr_len * sizeof(char); /* Doesn't include size for '\0' */ + length = WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), NULL, 0, NULL, NULL); + *dst_len = length; /* Doesn't include size for '\0' */ *dst_status = DBSTATUS_S_OK; - bytes_to_copy = min(*dst_len + sizeof(char), dst_max_len); + bytes_to_copy = min(length + 1, dst_max_len); if(dst) { if(bytes_to_copy >= sizeof(char)) { - WideCharToMultiByte(CP_ACP, 0, b, bytes_to_copy - sizeof(char), dst, dst_max_len, NULL, NULL); - *((char *)dst + bytes_to_copy / sizeof(char) - 1) = 0; - if(bytes_to_copy < *dst_len + sizeof(char)) + WideCharToMultiByte(CP_ACP, 0, b, SysStringLen(b), dst, bytes_to_copy - 1, NULL, NULL); + *((char *)dst + bytes_to_copy - 1) = 0; + if(bytes_to_copy < length + 1) *dst_status = DBSTATUS_S_TRUNCATED; } else

1 0

Alistair Leslie-Hughes : oledb32/tests: Add tests for conversion to DBTYPE_STR.
by Alexandre Julliard 01 Mar '17

01 Mar '17

Module: wine Branch: master Commit: 853de70bc0279bc6805dce81d89186b70734e5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=853de70bc0279bc6805dce81d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 1 11:32:06 2017 +0000 oledb32/tests: Add tests for conversion to DBTYPE_STR. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 0e4a834..663f78e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1516,6 +1516,9 @@ static void test_converttostr(void) DBSTATUS dst_status; DBLENGTH dst_len; static const WCHAR ten[] = {'1','0',0}; + static const WCHAR idW[] = {'0','C','7','3','3','A','8','D','-','2','A','1','C',0 }; + static const char idA[] = "0C733A8D"; + static const char withnull[] = "test\0ed"; static const char ten_a[] = "10"; static const char fourthreetwoone[] = "4321"; static const char guid_str[] = "{0C733A8D-2A1C-11CE-ADE5-00AA0044773D}"; @@ -1877,6 +1880,47 @@ static void test_converttostr(void) ok(!lstrcmpA(ten_a, dst), "got %s\n", dst); SysFreeString(b); + b = SysAllocString(idW); + *(BSTR *)src = b; + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_STR, 0, &dst_len, src, dst, 9, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_TRUNCATED, "got %08x\n", dst_status); + ok(dst_len == 13, "got %ld\n", dst_len); + ok(!lstrcmpA(idA, dst), "got %s\n", dst); + SysFreeString(b); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, sizeof(withnull), &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 8), "got %s\n", dst); + ok(dst[8] == 0, "got %02x\n", dst[8]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 7, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 7, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 7), "got %s\n", dst); + ok(dst[7] == 0, "got %02x\n", dst[7]); + + memcpy(src, withnull, sizeof(withnull)); + memset(dst, 0xcc, sizeof(dst)); + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_STR, DBTYPE_STR, 6, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 6, "got %ld\n", dst_len); + ok(!memcmp(withnull, dst, 6), "got %s\n", dst); + ok(dst[6] == 0, "got %02x\n", dst[6]); + memcpy(src, ten, sizeof(ten)); memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234;

1 0