December 2015 - Wine-Commits

André Hentschel : winebuild: Detect armv* toolchains.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: bd545cb0697e7f2b109422cf8c336fab691c1976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd545cb0697e7f2b109422cf8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 30 00:25:52 2015 +0100 winebuild: Detect armv* toolchains. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 4860a19..08e6b01 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -64,6 +64,9 @@ static const struct { "x86_64", CPU_x86_64 }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, { "arm64", CPU_ARM64 }, { "aarch64", CPU_ARM64 }, };

1 0

Daniel Lehman : shlwapi: Implement URL_ESCAPE_AS_UTF8.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 74e71b664350f5ec89ff6b1ec9d15b80f2bd2baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e71b664350f5ec89ff6b1ec… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Nov 23 17:34:24 2015 -0800 shlwapi: Implement URL_ESCAPE_AS_UTF8. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/url.c | 50 ++++++++++++++++++++++++++++++++------ include/shlwapi.h | 1 + 3 files changed, 107 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 857ed15..85da922 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -302,6 +302,45 @@ static const TEST_URL_ESCAPE TEST_ESCAPE[] = { {"ftp\x1f\1end/", 0, 0, S_OK, "ftp%1F%01end/"} }; +typedef struct _TEST_URL_ESCAPEW { + const WCHAR url[INTERNET_MAX_URL_LENGTH]; + DWORD flags; + HRESULT expectret; + const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; + const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ + const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ +} TEST_URL_ESCAPEW; + +static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { + {{' ','<','>','"',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','0','%','3','C','%','3','E','%','2','2',0}}, + {{'{','}','|','\\',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','7','B','%','7','D','%','7','C','%','5','C',0}}, + {{'^',']','[','`',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','5','E','%','5','D','%','5','B','%','6','0',0}}, + {{'&','/','?','#',0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','2','6','/','?','#',0}}, + {{'M','a','s','s',0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','s','s',0}}, + + /* broken < Win8/10 */ + + {{'M','a',0xdf,0}, URL_ESCAPE_AS_UTF8, S_OK, {'M','a','%','C','3','%','9','F',0}, + {'M','a','%','D','F',0}}, + /* 0x2070E */ + {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd841,0xdf0e,0}}, + /* 0x27A3E */ + {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0xde3e,0}}, + + {{0xd85e,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xd85e,0}}, + {{0xd85e,0x41}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D','A',0}, + {0xd85e,'A',0}}, + {{0xdc00,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','D',0}, + {0xdc00,0}}, + {{0xffff,0}, URL_ESCAPE_AS_UTF8, S_OK, {'%','E','F','%','B','F','%','B','F',0}, + {0xffff,0}}, +}; + /* ################ */ typedef struct _TEST_URL_COMBINE { @@ -862,6 +901,15 @@ static void test_UrlEscapeA(void) ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + size = 1; + empty_string[0] = 127; + ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); + ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ + "got %x, expected %x\n", ret, E_NOTIMPL); + ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ + "got %d, expected %d\n", size, 1); + ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { CHAR ret_url[INTERNET_MAX_URL_LENGTH]; @@ -925,6 +973,21 @@ static void test_UrlEscapeW(void) FreeWideString(urlW); FreeWideString(expected_urlW); } + + for(i=0; i<sizeof(TEST_ESCAPEW)/sizeof(TEST_ESCAPEW[0]); i++) { + WCHAR ret_url[INTERNET_MAX_URL_LENGTH]; + + size = INTERNET_MAX_URL_LENGTH; + ret = pUrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); + ok(ret == TEST_ESCAPEW[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for \"%s\"\n", + ret, TEST_ESCAPEW[i].expectret, wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || + broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", + wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), + wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + } } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 1a53252..0680a55 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -958,6 +958,8 @@ HRESULT WINAPI UrlEscapeA( if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; + if(dwFlags & URL_ESCAPE_AS_UTF8) + return E_NOTIMPL; if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags); @@ -994,6 +996,9 @@ static inline BOOL URL_NeedEscapeW(WCHAR ch, DWORD flags, DWORD int_flags) if ((flags & URL_ESCAPE_PERCENT) && (ch == '%')) return TRUE; + if ((flags & URL_ESCAPE_AS_UTF8) && (ch >= 0x80)) + return TRUE; + if (ch <= 31 || (ch >= 127 && ch <= 255) ) return TRUE; @@ -1069,8 +1074,8 @@ HRESULT WINAPI UrlEscapeW( LPCWSTR src; DWORD needed = 0, ret; BOOL stop_escaping = FALSE; - WCHAR next[5], *dst, *dst_ptr; - INT len; + WCHAR next[12], *dst, *dst_ptr; + INT i, len; PARSEDURLW parsed_url; DWORD int_flags; DWORD slashes = 0; @@ -1085,7 +1090,8 @@ HRESULT WINAPI UrlEscapeW( if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO | - URL_ESCAPE_PERCENT)) + URL_ESCAPE_PERCENT | + URL_ESCAPE_AS_UTF8)) FIXME("Unimplemented flags: %08x\n", dwFlags); dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); @@ -1188,10 +1194,40 @@ HRESULT WINAPI UrlEscapeW( if(cur == '\\' && (int_flags & WINE_URL_BASH_AS_SLASH) && !stop_escaping) cur = '/'; if(URL_NeedEscapeW(cur, dwFlags, int_flags) && stop_escaping == FALSE) { - next[0] = '%'; - next[1] = hexDigits[(cur >> 4) & 0xf]; - next[2] = hexDigits[cur & 0xf]; - len = 3; + if(dwFlags & URL_ESCAPE_AS_UTF8) { + char utf[16]; + + if ((cur >= 0xd800 && cur <= 0xdfff) && + (src[1] >= 0xdc00 && src[1] <= 0xdfff)) + { + WCHAR sur[2]; + + sur[0] = cur; + sur[1] = *++src; + len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, sur, 2, utf, sizeof(utf)); + } + else + len = wine_utf8_wcstombs(WC_ERR_INVALID_CHARS, &cur, 1, utf, sizeof(utf)); + + if(len < 0) { + utf[0] = 0xef; + utf[1] = 0xbf; + utf[2] = 0xbd; + len = 3; + } + + for(i = 0; i < len; i++) { + next[i*3+0] = '%'; + next[i*3+1] = hexDigits[(utf[i] >> 4) & 0xf]; + next[i*3+2] = hexDigits[utf[i] & 0xf]; + } + len *= 3; + } else { + next[0] = '%'; + next[1] = hexDigits[(cur >> 4) & 0xf]; + next[2] = hexDigits[cur & 0xf]; + len = 3; + } } else { next[0] = cur; len = 1; diff --git a/include/shlwapi.h b/include/shlwapi.h index 205d5e6..e3b14b3 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -646,6 +646,7 @@ typedef enum { #define URL_UNESCAPE_INPLACE 0x00100000 #define URL_FILE_USE_PATHURL 0x00010000 +#define URL_ESCAPE_AS_UTF8 0x00040000 #define URL_ESCAPE_SEGMENT_ONLY 0x00002000 #define URL_ESCAPE_PERCENT 0x00001000

1 0

Austin English : api-ms-win-security-lsalookup-l1-1-1: Add dll.
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 213d1094893b34bfa4896f4aa96f85b492932495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d1094893b34bfa4896f4aa… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:20:50 2015 -0600 api-ms-win-security-lsalookup-l1-1-1: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-1.spec | 16 ++++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/configure b/configure index ac6145a..a4c174a 100755 --- a/configure +++ b/configure @@ -957,6 +957,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 enable_api_ms_win_security_lsalookup_l1_1_0 +enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17352,6 +17353,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 +wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index a1d3f97..c4184cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in new file mode 100644 index 0000000..bdbf8d2 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-1.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec new file mode 100644 index 0000000..215c7b7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -0,0 +1,16 @@ +@ stub EnumerateIdentityProviders +@ stub GetDefaultIdentityProvider +@ stub GetIdentityProviderInfoByGUID +@ stub GetIdentityProviderInfoByName +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids +@ stub ReleaseIdentityProviderEnumContext

1 0

Nikolay Sivov : msacm32.drv: Initialize reserved fields in WAVEINCAPS/ WAVEOUTCAPS (Coverity).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: 8416bb0453c12e4975e24fd0d526fe8e3d676bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8416bb0453c12e4975e24fd0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 23:03:59 2015 +0300 msacm32.drv: Initialize reserved fields in WAVEINCAPS/WAVEOUTCAPS (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 0abc8bd..4c8cb6c 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -520,6 +520,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; woc.wChannels = 2; + woc.wReserved1 = 0; woc.dwSupport = WAVECAPS_VOLUME | WAVECAPS_LRVOLUME; memcpy(lpWaveCaps, &woc, min(dwParam2, sizeof(woc))); @@ -1075,6 +1076,7 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa WAVE_FORMAT_2M08 | WAVE_FORMAT_2S08 | WAVE_FORMAT_2M16 | WAVE_FORMAT_2S16 | WAVE_FORMAT_1M08 | WAVE_FORMAT_1S08 | WAVE_FORMAT_1M16 | WAVE_FORMAT_1S16; wic.wChannels = 2; + wic.wReserved1 = 0; memcpy(lpWaveCaps, &wic, min(dwParam2, sizeof(wic))); return MMSYSERR_NOERROR;

1 0

Nikolay Sivov : riched20: Initialize wEffects field before setting bits in it (Coverity).
by Alexandre Julliard Dec. 30, 2015

Dec. 30, 2015

Module: wine Branch: master Commit: c5b68d1db205cd0973c63d77ce0c0fb3880397bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b68d1db205cd0973c63d77c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 22:44:30 2015 +0300 riched20: Initialize wEffects field before setting bits in it (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28c845c..a41f838 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -547,7 +547,8 @@ void ME_RTFParAttrHook(RTF_Info *info) PARAFORMAT2 fmt; fmt.cbSize = sizeof(fmt); fmt.dwMask = 0; - + fmt.wEffects = 0; + switch(info->rtfMinor) { case rtfParDef: /* restores default paragraph attributes */

1 0

Sebastian Lackner : oleaut32: Pass size without terminating null to get_cache_entry.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 4bfc49a773d594ae9de934b6506fa90579fa9459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfc49a773d594ae9de934b65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 25 06:37:44 2015 +0100 oleaut32: Pass size without terminating null to get_cache_entry. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0352215..75f9cb4 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -119,7 +119,7 @@ static inline bstr_t *bstr_from_str(BSTR str) static inline bstr_cache_entry_t *get_cache_entry(size_t size) { - unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size-1])/BUCKET_SIZE; + unsigned cache_idx = FIELD_OFFSET(bstr_t, u.ptr[size+sizeof(WCHAR)-1])/BUCKET_SIZE; return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) ? bstr_cache + cache_idx : NULL; @@ -127,14 +127,14 @@ static inline bstr_cache_entry_t *get_cache_entry(size_t size) static bstr_t *alloc_bstr(size_t size) { - bstr_cache_entry_t *cache_entry = get_cache_entry(size+sizeof(WCHAR)); + bstr_cache_entry_t *cache_entry = get_cache_entry(size); bstr_t *ret; if(cache_entry) { EnterCriticalSection(&cs_bstr_cache); if(!cache_entry->cnt) { - cache_entry = get_cache_entry(size+sizeof(WCHAR)+BUCKET_SIZE); + cache_entry = get_cache_entry(size+BUCKET_SIZE); if(cache_entry && !cache_entry->cnt) cache_entry = NULL; } @@ -258,7 +258,7 @@ void WINAPI SysFreeString(BSTR str) return; bstr = bstr_from_str(str); - cache_entry = get_cache_entry(bstr->size+sizeof(WCHAR)); + cache_entry = get_cache_entry(bstr->size); if(cache_entry) { unsigned i;

1 0

Nikolay Sivov : oleview: Use proper pointer type when allocating names array (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: ff94fc1dafb415fb4c97b5fead66ab36fb4280db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff94fc1dafb415fb4c97b5fea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 20:36:55 2015 +0300 oleview: Use proper pointer type when allocating names array (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 04b9067..cbf6ab1 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -616,7 +616,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen } bstrParamNames = HeapAlloc(GetProcessHeap(), 0, - sizeof(BSTR*)*(pFuncDesc->cParams+1)); + sizeof(BSTR)*(pFuncDesc->cParams+1)); if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, pFuncDesc->cParams+1, &namesNo))) {

1 0

Nikolay Sivov : commdlg: Explicitely initialize remaining fields of CHOOSECOLORA (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: 4d3b87fc09f3d9acdb056181fa55caef6964bd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3b87fc09f3d9acdb056181f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 20:52:03 2015 +0300 commdlg: Explicitely initialize remaining fields of CHOOSECOLORA (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/colordlg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/commdlg.dll16/colordlg.c b/dlls/commdlg.dll16/colordlg.c index 845784e..dfdea6a 100644 --- a/dlls/commdlg.dll16/colordlg.c +++ b/dlls/commdlg.dll16/colordlg.c @@ -62,6 +62,9 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 cc16 ) cc32.lpCustColors = MapSL( cc16->lpCustColors ); cc32.Flags = cc16->Flags & ~(CC_ENABLETEMPLATE | CC_ENABLETEMPLATEHANDLE | CC_ENABLEHOOK); cc32.lCustData = cc16->lCustData; + cc32.hInstance = NULL; + cc32.lpfnHook = NULL; + cc32.lpTemplateName = NULL; if (cc16->Flags & (CC_ENABLETEMPLATE | CC_ENABLETEMPLATEHANDLE)) FIXME( "custom templates no longer supported, using default\n" );

1 0

Nikolay Sivov : user.exe: Fully convert MSG16 to MSG in IsDialogMessage() (Coverity).
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: d07a7bbba51d6c40a5ed089ab9069451805928c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07a7bbba51d6c40a5ed089ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 29 21:36:57 2015 +0300 user.exe: Fully convert MSG16 to MSG in IsDialogMessage() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 935b025..7bcc8e2 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1836,6 +1836,9 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, MSG16 *msg16 ) msg.message = msg16->message; msg.wParam = msg16->wParam; msg.lParam = msg16->lParam; + msg.time = msg16->time; + msg.pt.x = msg16->pt.x; + msg.pt.y = msg16->pt.y; return IsDialogMessageA( hwndDlg32, &msg ); }

1 0

Piotr Caban : ole32: Make clipboard latest_snapshot access thread safe.
by Alexandre Julliard Dec. 29, 2015

Dec. 29, 2015

Module: wine Branch: master Commit: d90ec79be2104acb3e2f59e31d3309591cd4f50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90ec79be2104acb3e2f59e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 29 14:39:01 2015 +0100 ole32: Make clipboard latest_snapshot access thread safe. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 31 +++++++++++++++++++++++++------ dlls/ole32/tests/clipboard.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index db1e4a8..ca9520f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -174,6 +174,15 @@ typedef struct PresentationDataHeader */ static ole_clipbrd* theOleClipboard; +static CRITICAL_SECTION latest_snapshot_cs; +static CRITICAL_SECTION_DEBUG latest_snapshot_cs_debug = +{ + 0, 0, &latest_snapshot_cs, + { &latest_snapshot_cs_debug.ProcessLocksList, &latest_snapshot_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": clipboard last snapshot") } +}; +static CRITICAL_SECTION latest_snapshot_cs = { &latest_snapshot_cs_debug, -1, 0, 0, 0, 0 }; + static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd) { struct oletls *info = COM_CurrentInfo(); @@ -1042,13 +1051,17 @@ static ULONG WINAPI snapshot_Release(IDataObject *iface) if (ref == 0) { - ole_clipbrd *clipbrd; - HRESULT hr = get_ole_clipbrd(&clipbrd); + EnterCriticalSection(&latest_snapshot_cs); + if (This->ref) + { + LeaveCriticalSection(&latest_snapshot_cs); + return ref; + } + if (theOleClipboard->latest_snapshot == This) + theOleClipboard->latest_snapshot = NULL; + LeaveCriticalSection(&latest_snapshot_cs); if(This->data) IDataObject_Release(This->data); - - if(SUCCEEDED(hr) && clipbrd->latest_snapshot == This) - clipbrd->latest_snapshot = NULL; HeapFree(GetProcessHeap(), 0, This); } @@ -2192,17 +2205,23 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) if(FAILED(hr = get_ole_clipbrd(&clipbrd))) return hr; seq_no = GetClipboardSequenceNumber(); + EnterCriticalSection(&latest_snapshot_cs); if(clipbrd->latest_snapshot && clipbrd->latest_snapshot->seq_no != seq_no) clipbrd->latest_snapshot = NULL; if(!clipbrd->latest_snapshot) { clipbrd->latest_snapshot = snapshot_construct(seq_no); - if(!clipbrd->latest_snapshot) return E_OUTOFMEMORY; + if(!clipbrd->latest_snapshot) + { + LeaveCriticalSection(&latest_snapshot_cs); + return E_OUTOFMEMORY; + } } *obj = &clipbrd->latest_snapshot->IDataObject_iface; IDataObject_AddRef(*obj); + LeaveCriticalSection(&latest_snapshot_cs); return S_OK; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 81b3a1c..02097ea 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1539,6 +1539,38 @@ static void test_getdatahere(void) } +static DWORD CALLBACK test_data_obj(void *arg) +{ + IDataObject *data_obj = arg; + + IDataObject_Release(data_obj); + return 0; +} + +static void test_multithreaded_clipboard(void) +{ + IDataObject *data_obj; + HANDLE thread; + HRESULT hr; + DWORD ret; + + OleInitialize(NULL); + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard returned %x\n", hr); + + thread = CreateThread(NULL, 0, test_data_obj, data_obj, 0, NULL); + ok(thread != NULL, "CreateThread failed (%d)\n", GetLastError()); + ret = WaitForSingleObject(thread, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard returned %x\n", hr); + IDataObject_Release(data_obj); + + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); @@ -1546,4 +1578,5 @@ START_TEST(clipboard) test_flushed_getdata(); test_nonole_clipboard(); test_getdatahere(); + test_multithreaded_clipboard(); }

1 0