December 2015 - Wine-commits

Nikolay Sivov : regedit: Fix potential buffer leak, simplify error handling (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: c9fb3b7f8f1924e58ccc36caa73617f366853d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fb3b7f8f1924e58ccc36caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:55:00 2015 +0300 regedit: Fix potential buffer leak, simplify error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 008e6a1..7afc7bf 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -95,17 +95,17 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) { - int pathLen = 0, maxLen; + int pathLen = 0, maxLen = 1024; WCHAR *pathBuffer; - pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024*sizeof(WCHAR)); + if (!hItem) { + hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + if (!hItem) return NULL; + } + + pathBuffer = HeapAlloc(GetProcessHeap(), 0, maxLen*sizeof(WCHAR)); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); - if (maxLen == (SIZE_T) - 1) return NULL; - maxLen = maxLen / sizeof(WCHAR); - if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; return pathBuffer; }

1 0

Nikolay Sivov : winemenubuilder: Simplify MIME types list management.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: f2538c6e26e5f2b415acfc43f24978d2a6f7eebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2538c6e26e5f2b415acfc43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:23:29 2015 +0300 winemenubuilder: Simplify MIME types list management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 53 ++++++++++++------------------ 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e6fd042..2b7340f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2102,16 +2102,13 @@ static void free_native_mime_types(struct list *native_mime_types) HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); HeapFree(GetProcessHeap(), 0, mime_type_entry); } - HeapFree(GetProcessHeap(), 0, native_mime_types); } -static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mime_types) +static BOOL build_native_mime_types(const char *xdg_data_home, struct list *mime_types) { char *xdg_data_dirs; BOOL ret; - *mime_types = NULL; - xdg_data_dirs = getenv("XDG_DATA_DIRS"); if (xdg_data_dirs == NULL) xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); @@ -2120,39 +2117,29 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mim if (xdg_data_dirs) { - *mime_types = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); - if (*mime_types) - { - const char *begin; - char *end; + const char *begin; + char *end; - list_init(*mime_types); - ret = add_mimes(xdg_data_home, *mime_types); - if (ret) + ret = add_mimes(xdg_data_home, mime_types); + if (ret) + { + for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) { - for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) - { - *end = '\0'; - ret = add_mimes(begin, *mime_types); - *end = ':'; - if (!ret) - break; - } - if (ret) - ret = add_mimes(begin, *mime_types); + *end = '\0'; + ret = add_mimes(begin, mime_types); + *end = ':'; + if (!ret) + break; } + if (ret) + ret = add_mimes(begin, mime_types); } - else - ret = FALSE; HeapFree(GetProcessHeap(), 0, xdg_data_dirs); } else ret = FALSE; - if (!ret && *mime_types) - { - free_native_mime_types(*mime_types); - *mime_types = NULL; - } + if (!ret) + free_native_mime_types(mime_types); return ret; } @@ -2557,7 +2544,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package { static const WCHAR openW[] = {'o','p','e','n',0}; struct wine_rb_tree mimeProgidTree; - struct list *nativeMimeTypes = NULL; + struct list nativeMimeTypes; LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2567,6 +2554,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package WINE_ERR("wine_rb_init failed\n"); return FALSE; } + + list_init(&nativeMimeTypes); if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n"); @@ -2634,7 +2623,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (contentTypeW) strlwrW(contentTypeW); - if (!freedesktop_mime_type_for_extension(nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) + if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionA, extensionW, &mimeTypeA)) goto end; if (mimeTypeA == NULL) @@ -2780,7 +2769,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); - free_native_mime_types(nativeMimeTypes); + free_native_mime_types(&nativeMimeTypes); return hasChanged; }

1 0

Nikolay Sivov : gdi32: Initialize 'param' field (Coverity).
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: 1aa53bc470e81ca70b33c6d2c07744febff6d74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa53bc470e81ca70b33c6d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:14:25 2015 +0300 gdi32: Initialize 'param' field (Coverity). For consistency with the rest of the code, initialize both 'free' and 'param' fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index a944e71..6b8a8b5 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -828,6 +828,7 @@ static DWORD get_image_dib_info( dib_info *dib, BITMAPINFO *info, bits->ptr = dib->bits.ptr; bits->is_copy = FALSE; bits->free = NULL; + bits->param = NULL; if (dib->stride < 0) bits->ptr = (char *)bits->ptr + (dib->height - 1) * dib->stride; src->x += dib->rect.left; src->y += dib->rect.top;

1 0

Nikolay Sivov : comdlg32/fontdlg: Limit text length user can type in as font point size.
by Alexandre Julliard 22 Dec '15

22 Dec '15

Module: wine Branch: master Commit: a48d96843cfbf0debae54df686fec913d82b0374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48d96843cfbf0debae54df68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:30 2015 +0300 comdlg32/fontdlg: Limit text length user can type in as font point size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 9e73ec9..8ba9c1e 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -753,6 +753,9 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE), (LPARAM)GetDlgItem(hDlg,cmb5)); } + /* limit text length user can type in as font size */ + SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0); + if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle) { j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle);

1 0

Piotr Caban : msvcrt: Add _strtol_l implementation.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 5e10634a5af26326dac3db6f6667a46e452d29f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e10634a5af26326dac3db6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:22:45 2015 +0100 msvcrt: Add _strtol_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 15 ++++++++++++--- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 40b131a..319bff5 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -34,7 +34,7 @@ @ cdecl -ret64 _strtoi64(str ptr long) ucrtbase._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) ucrtbase._strtoi64_l @ stub _strtoimax_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) ucrtbase._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) ucrtbase._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) ucrtbase._strtoui64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8ceecc9..56d15bd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1364,7 +1364,7 @@ @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e42ec11..4b9f2a5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1722,7 +1722,7 @@ @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9f04cbf..0fa1e14 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1735,7 +1735,7 @@ @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ stub _strtoimax_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d3591c1..c104a7b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1446,7 +1446,7 @@ @ cdecl -ret64 _strtoi64(str ptr long) msvcr120._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l @ stub _strtoimax_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @ cdecl -ret64 _strtoui64(str ptr long) msvcr120._strtoui64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e83e056..6de0c3b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1045,7 +1045,7 @@ @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9aef185..f2de405 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1019,7 +1019,7 @@ @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c1f41da..2bbf6d6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -980,7 +980,7 @@ @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -# stub _strtol_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index dde95ac..f44ac52 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1018,11 +1018,12 @@ int CDECL MSVCRT_atoi(const char *str) #endif /****************************************************************** - * strtol (MSVCRT.@) + * _strtol_l (MSVCRT.@) */ -MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) +MSVCRT_long CDECL MSVCRT__strtol_l(const char* nptr, + char** end, int base, MSVCRT__locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL); + __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, locale); if(ret > MSVCRT_LONG_MAX) { ret = MSVCRT_LONG_MAX; @@ -1036,6 +1037,14 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) } /****************************************************************** + * strtol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) +{ + return MSVCRT__strtol_l(nptr, end, base, NULL); +} + +/****************************************************************** * _strtoul_l (MSVCRT.@) */ MSVCRT_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, MSVCRT__locale_t locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c3f76d1..336b87e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1953,7 +1953,7 @@ @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l @ stub _strtoimax_l -@ stub _strtol_l +@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64

1 0

Piotr Caban : msvcrt: Return error if last known character is further in the string then current character.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 9f532321d0bb88fc1bd321de44c89c64122acceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f532321d0bb88fc1bd321de4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:22:55 2015 +0100 msvcrt: Return error if last known character is further in the string then current character. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e7adaad..56945bb 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -520,6 +520,9 @@ unsigned int CDECL _mbcjmstojis(unsigned int c) */ unsigned char* CDECL _mbsdec(const unsigned char* start, const unsigned char* cur) { + if(start >= cur) + return NULL; + if(get_mbcinfo()->ismbcodepage) return (unsigned char *)(_ismbstrail(start,cur-1) ? cur - 2 : cur -1);

1 0

Alexandre Julliard : secur32/tests: Don' t check the exact number of cipher bits.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 9ab03dd7bbded6f9a2a93e5fec2f60b61125140a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab03dd7bbded6f9a2a93e5fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 18:20:29 2015 +0100 secur32/tests: Don't check the exact number of cipher bits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 35100f7..51c22d5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -927,8 +927,7 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, - "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength >= 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0

Piotr Caban : ole32: Fix apartment window class name.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: d7e302b52bdc399f144fe711decb2962eb4af2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e302b52bdc399f144fe711d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:27:37 2015 +0100 ole32: Fix apartment window class name. TestStand 2010 makes class name comparison when pumping RPC messages. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2f55076..90b049a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -466,8 +466,7 @@ struct apartment_loaded_dll BOOL multi_threaded; }; -static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',' ', - '0','x','#','#','#','#','#','#','#','#',' ',0}; +static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r','e','a','d','W','n','d','C','l','a','s','s',0}; /***************************************************************************** * This section contains OpenDllList implementation

1 0

Piotr Caban : msxml3: Update xmlNode reference count when nodes are merged in node_insert_before.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: 7bd995a1166d0807e830ccb8b810db4e7d65e27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd995a1166d0807e830ccb8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:10 2015 +0100 msxml3: Update xmlNode reference count when nodes are merged in node_insert_before. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f8d7761..9c768bd 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -429,6 +429,19 @@ int xmlnode_get_inst_cnt(xmlnode *node) return node_get_inst_cnt(node->node); } +/* _private field holds a number of COM instances spawned from this libxml2 node */ +static void xmlnode_add_ref(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedIncrement((LONG*)&node->_private); +} + +static void xmlnode_release(xmlNodePtr node) +{ + if (node->type == XML_DOCUMENT_NODE) return; + InterlockedDecrement((LONG*)&node->_private); +} + HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { @@ -489,6 +502,7 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT if(before) { + xmlNodePtr new_node; xmlnode *before_node_obj = get_node_obj(before); /* refs count including subtree */ @@ -496,19 +510,35 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(before_node_obj->node->doc, refcount); - node_obj->node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); + new_node = xmlAddPrevSibling(before_node_obj->node, node_obj->node); + if (new_node != node_obj->node) + { + if (refcount != 1) + FIXME("referenced xmlNode was freed, expect crashes\n"); + xmlnode_add_ref(new_node); + node_obj->node = new_node; + } if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->parent; } else { + xmlNodePtr new_node; + if (doc != This->node->doc) refcount = xmlnode_get_inst_cnt(node_obj); if (refcount) xmldoc_add_refs(This->node->doc, refcount); /* xmlAddChild doesn't unlink node from previous parent */ xmlUnlinkNode(node_obj->node); - node_obj->node = xmlAddChild(This->node, node_obj->node); + new_node = xmlAddChild(This->node, node_obj->node); + if (new_node != node_obj->node) + { + if (refcount != 1) + FIXME("referenced xmlNode was freed, expect crashes\n"); + xmlnode_add_ref(new_node); + node_obj->node = new_node; + } if (refcount) xmldoc_release_refs(doc, refcount); node_obj->parent = This->iface; } @@ -1392,19 +1422,6 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) return S_OK; } -/* _private field holds a number of COM instances spawned from this libxml2 node */ -static void xmlnode_add_ref(xmlNodePtr node) -{ - if (node->type == XML_DOCUMENT_NODE) return; - InterlockedIncrement((LONG*)&node->_private); -} - -static void xmlnode_release(xmlNodePtr node) -{ - if (node->type == XML_DOCUMENT_NODE) return; - InterlockedDecrement((LONG*)&node->_private); -} - void destroy_xmlnode(xmlnode *This) { if(This->node)

1 0

Piotr Caban : msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable.
by Alexandre Julliard 21 Dec '15

21 Dec '15

Module: wine Branch: master Commit: bc0eca60c6e13c3ab74c1988c83e20266e14ea2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0eca60c6e13c3ab74c1988c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:18 2015 +0100 msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 7 +++++++ dlls/msxml3/msxml_private.h | 3 +++ dlls/msxml3/node.c | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 184a01f..e9f2504 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -448,7 +448,14 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) (!ctxt->node->last || ((ctxt->node->last && (cur == '<' || ctxt->node->last->type != XML_TEXT_NODE)) ))) + { + /* Keep information about ignorable whitespace text node in previous or parent node */ + if (ctxt->node->last) + *(DWORD*)&ctxt->node->last->_private |= NODE_PRIV_TRAILING_IGNORABLE_WS; + else if (ctxt->node->type != XML_DOCUMENT_NODE) + *(DWORD*)&ctxt->node->_private |= NODE_PRIV_CHILD_IGNORABLE_WS; return; + } } xmlSAX2Characters(ctxt, ch, len); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6c0376f..56be916 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -559,4 +559,7 @@ HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; /* ... */ #define E_XML_REQUIRED_ATTRIBUTE_MISSING 0xC00CE020 +#define NODE_PRIV_TRAILING_IGNORABLE_WS 0x40000000 +#define NODE_PRIV_CHILD_IGNORABLE_WS 0x80000000 +#define NODE_PRIV_REFCOUNT_MASK ~(NODE_PRIV_TRAILING_IGNORABLE_WS|NODE_PRIV_CHILD_IGNORABLE_WS) #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9c768bd..8914e05 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -398,7 +398,7 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) static int node_get_inst_cnt(xmlNodePtr node) { - int ret = *(LONG *)&node->_private; + int ret = *(LONG *)&node->_private & NODE_PRIV_REFCOUNT_MASK; xmlNodePtr child; /* add attribute counts */ @@ -429,7 +429,8 @@ int xmlnode_get_inst_cnt(xmlnode *node) return node_get_inst_cnt(node->node); } -/* _private field holds a number of COM instances spawned from this libxml2 node */ +/* _private field holds a number of COM instances spawned from this libxml2 node + * most significant bits are used to store information about ignorrable whitespace nodes */ static void xmlnode_add_ref(xmlNodePtr node) { if (node->type == XML_DOCUMENT_NODE) return;

1 0