December 2015 - Wine-Commits

Nikolay Sivov : dxdiagn: Improve error handling when converting to VT_BSTR (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 0aa56cabe4bfaa3effe338431795a7f1b24ccece URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa56cabe4bfaa3effe338431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:51:36 2015 +0300 dxdiagn: Improve error handling when converting to VT_BSTR (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 2890c61..5665d01 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -346,6 +346,7 @@ static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, co static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, ULONGLONG data ) { IDxDiagContainerImpl_Property *prop; + HRESULT hr; prop = allocate_property_information(propName); if (!prop) @@ -354,7 +355,12 @@ static inline HRESULT add_ull_as_bstr_property(IDxDiagContainerImpl_Container *n V_VT(&prop->vProp) = VT_UI8; V_UI8(&prop->vProp) = data; - VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + hr = VariantChangeType(&prop->vProp, &prop->vProp, 0, VT_BSTR); + if (FAILED(hr)) + { + free_property_information(prop); + return hr; + } list_add_tail(&node->properties, &prop->entry); ++node->nProperties;

1 0

Nikolay Sivov : winemenubuilder: Simplify MIME types list management.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

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 Dec. 22, 2015

Dec. 22, 2015

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 Dec. 22, 2015

Dec. 22, 2015

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

Thomas Faller : ntdll: Fix valgrind heap realloc notifications.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: a0b8f178df8ed704fc732f5aef3b2e1f623512fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b8f178df8ed704fc732f5ae… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Dec 16 22:00:58 2015 +0100 ntdll: Fix valgrind heap realloc notifications. Valgrind can't handle a realloc if the new size is zero. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a908f19..f928ebf 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -266,7 +266,8 @@ static inline void notify_free( void const *ptr ) static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new ) { #ifdef VALGRIND_RESIZEINPLACE_BLOCK - VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old, size_new, 0 ); + /* zero is not a valid size */ + VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old ? size_old : 1, size_new ? size_new : 1, 0 ); #endif }

1 0

Jactry Zeng : riched20/tests: Add multibyte character tests for selection.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: de0add976dea9b90cae8e2db37e80e46c692b935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0add976dea9b90cae8e2db3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:00:53 2015 +0800 riched20/tests: Add multibyte character tests for selection. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6c4195c..1b2a257 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4577,6 +4577,27 @@ static void test_EM_EXSETSEL(void) check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); } + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + char bufA[MAX_BUF_LEN] = {0}; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + ok(result == 8, "EM_EXSETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + ok(!strcmp(bufA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + DestroyWindow(hwndRichEdit); } @@ -4601,7 +4622,7 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) static void test_EM_SETSEL(void) { - char buffA[32]; + char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); @@ -4620,6 +4641,25 @@ static void test_EM_SETSEL(void) SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(buffA[0] == 0, "selection text %s\n", buffA); + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 78901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + ok(result == 8, "EM_SETSEL return %ld expected 8\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + ok(!strcmp(buffA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } + DestroyWindow(hwndRichEdit); }

1 0

Piotr Caban : msxml3/tests: Use exact comparison in IXMLDOMNode:: get_text tests.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: e2cf78232d3ed4576f7ca1f9be8e99ed9cf08165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cf78232d3ed4576f7ca1f9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:30 2015 +0100 msxml3/tests: Use exact comparison in IXMLDOMNode::get_text tests. 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/tests/domdoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1926f50..81b0256 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3138,8 +3138,7 @@ static void test_get_text(void) { r = IXMLDOMNode_get_text( nodeRoot, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( compareIgnoreReturns(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + expect_bstr_eq_and_free(str, "fn1.txt\n \nfn2.txt\n \nf1"); IXMLDOMNode_Release(nodeRoot); }

1 0

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

Dec. 21, 2015

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 : msvcrt: Return error if last known character is further in the string then current character.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Piotr Caban : msvcrt: Add _strtol_l implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Jacek Caban : mshtml: Added IHTMLWindow:: get_clientInformation implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 11a6bfc673cb45d3186c5d09926e0f44aae09dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6bfc673cb45d3186c5d099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 14:30:50 2015 +0100 mshtml: Added IHTMLWindow::get_clientInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/tests/dom.c | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fbb558e..d7d133a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1349,8 +1349,10 @@ static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y) static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOmNavigator **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLWindow2_get_navigator(&This->IHTMLWindow2_iface, p); } static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expression, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b892ac0..9d09acd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5965,11 +5965,16 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); - ok(navigator != navigator2, "navigator2 != navihgator\n"); + ok(navigator != navigator2, "navigator2 != navigator\n"); + IOmNavigator_Release(navigator2); - IHTMLWindow2_Release(window); + hres = IHTMLWindow2_get_clientInformation(window, &navigator2); + ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres); + todo_wine ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); + IHTMLWindow2_Release(window); + hres = IOmNavigator_get_appCodeName(navigator, &bstr); ok(hres == S_OK, "get_appCodeName failed: %08x\n", hres); ok(!strcmp_wa(bstr, "Mozilla"), "Unexpected appCodeName %s\n", wine_dbgstr_w(bstr));

1 0

Jactry Zeng : riched32/tests: Add tests for selection.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 43bd40bdec95fa15949017998c55e728c09d181f URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bd40bdec95fa15949017998… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:01:37 2015 +0800 riched32/tests: Add tests for selection. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 169 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 40daae0..ff37750 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1228,6 +1228,173 @@ static void test_enter(void) DestroyWindow(hwndRichEdit); } +struct exsetsel_s { + LONG min; + LONG max; + LRESULT expected_retval; + int expected_getsel_start; + int expected_getsel_end; + BOOL result_todo; + BOOL sel_todo; +}; + +static const struct exsetsel_s exsetsel_tests[] = { + /* sanity tests */ + {5, 10, 10, 5, 10, 0, 0 }, + {15, 17, 17, 15, 17, 0, 0 }, + /* test cpMax > strlen() */ + {0, 100, 19, 0, 19, 1, 0 }, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 1, 0 }, + /* test cpMin == cpMax */ + {5, 5, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ + {-1, 0, 5, 5, 5, 0, 0 }, + {-1, 17, 5, 5, 5, 0, 0 }, + {-1, 18, 5, 5, 5, 0, 0 }, + /* test cpMin < 0 && cpMax < 0 */ + {-1, -1, 17, 17, 17, 0, 0 }, + {-4, -5, 17, 17, 17, 0, 0 }, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 19, 0, 19, 1, 0 }, + {17, -5, 19, 17, 19, 1, 0 }, + {18, -3, 19, 17, 19, 1, 1 }, + /* test if cpMin > cpMax */ + {15, 19, 19, 15, 19, 1, 0 }, + {19, 15, 19, 15, 19, 1, 0 }, + /* cpMin == strlen() && cpMax > cpMin */ + {17, 18, 17, 17, 17, 1, 1 }, + {17, 50, 19, 17, 19, 1, 0 }, +}; + +static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + CHARRANGE cr; + LRESULT result; + int start, end; + + cr.cpMin = setsel->min; + cr.cpMax = setsel->max; + result = SendMessageA(hwnd, EM_EXSETSEL, 0, (LPARAM)&cr); + + if (setsel->result_todo) + todo_wine ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + else + ok(result == setsel->expected_retval, "EM_EXSETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->sel_todo) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_EXSETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_EXSETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + CHARRANGE cr; + LRESULT result; +#define MAX_BUF_LEN 1024 + char bufA[MAX_BUF_LEN] = {0}; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + cr.cpMin = 4, cr.cpMax = 8; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); + todo_wine ok(result == 7, "EM_EXSETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + todo_wine ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); + ok(cr.cpMin == 4, "Selection start incorrectly: %d expected 4\n", cr.cpMin); + ok(cr.cpMax == 8, "Selection end incorrectly: %d expected 8\n", cr.cpMax); + } + + DestroyWindow(hwndRichEdit); +} + +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + if (setsel->result_todo) + todo_wine ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + else + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->sel_todo) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_SETSEL(void) +{ + char buffA[32] = {0}; + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + SendMessageA(hwndRichEdit, EM_SETSEL, 17, 18); + buffA[0] = 123; + SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); + ok(buffA[0] == 0, "selection text %s\n", buffA); + + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + int sel_start, sel_end; + LRESULT result; + + /* Test with multibyte character */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"abcdef\x8e\xf0ghijk"); + /* 012345 6 7 8901 */ + result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); + todo_wine ok(result == 7, "EM_SETSEL return %ld expected 7\n", result); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + todo_wine ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); + result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); + ok(sel_end == 8, "Selection end incorrectly: %d expected 8\n", sel_end); + } + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -1254,6 +1421,8 @@ START_TEST( editor ) test_EM_GETOPTIONS(); test_autoscroll(); test_enter(); + test_EM_EXSETSEL(); + test_EM_SETSEL(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Piotr Caban : ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: a8ef26149308f577151f14a2d359868754c7ea20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ef26149308f577151f14a2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 18:42:04 2015 +0100 ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 14 -------------- dlls/ntdll/tests/directory.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4faafe9..23ebf48 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2120,15 +2120,6 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) - { - /* If the file does not exist, return that info. - * If the file DOES exist, return failure and fallback to the next - * read_directory_* function (we need to return the case-preserved - * filename stored on the filesystem). */ - ret = 0; - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - } else { ret = -1; @@ -2214,11 +2205,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) - { - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - ret = 0; - } } else ret = -1; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 730b0f1..7b1002a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -60,6 +60,7 @@ static struct testfile_s { int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { + { 0, 0, FILE_ATTRIBUTE_NORMAL, "longfilename.tmp", NULL, "normal" }, { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, @@ -234,10 +235,17 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char static void test_NtQueryDirectoryFile(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING ntdirname; + UNICODE_STRING ntdirname, mask; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; int i; + IO_STATUS_BLOCK io; + WCHAR short_name[12]; + UINT data_size; + BYTE data[8192]; + FILE_BOTH_DIRECTORY_INFORMATION *fbdi = (FILE_BOTH_DIRECTORY_INFORMATION*)data; + DWORD status; + HANDLE dirh; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -260,8 +268,6 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { - UNICODE_STRING mask; - if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); @@ -271,6 +277,35 @@ static void test_NtQueryDirectoryFile(void) test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); } + /* short path passed as mask */ + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); + ok(status == STATUS_SUCCESS, "failed to open dir '%s'\n", testdirA); + if (status != STATUS_SUCCESS) { + skip("can't test if we can't open the directory\n"); + return; + } + mask.Buffer = testfiles[0].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[0].nameW) * sizeof(WCHAR); + data_size = offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[256]); + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(fbdi->ShortName[0], "ShortName is empty\n"); + + mask.Length = mask.MaximumLength = fbdi->ShortNameLength; + memcpy(short_name, fbdi->ShortName, mask.Length); + mask.Buffer = short_name; + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, TRUE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status); + ok(fbdi->FileNameLength == strlen(testfiles[0].name)*sizeof(WCHAR) && + !memcmp(fbdi->FileName, testfiles[0].nameW, fbdi->FileNameLength), + "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, + fbdi->FileNameLength/sizeof(WCHAR))); + + pNtClose(dirh); + done: tear_down_attribute_test(testdirA); pRtlFreeUnicodeString(&ntdirname);

1 0

Piotr Caban : msxml3: Add support for CDATA nodes in node_get_text.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 028d5e5179807b7be8abfb79a3877eeed58c5f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=028d5e5179807b7be8abfb79a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:26 2015 +0100 msxml3: Add support for CDATA nodes in node_get_text. 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 | 77 +++++++++++++++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 4 +-- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 17e3838..72fa92f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -723,31 +723,15 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) return S_OK; } -static inline xmlChar* trim_whitespace(xmlChar* str) -{ - xmlChar* ret = str; - int len; - - if (!str) - return NULL; - - while (*ret && isspace(*ret)) - ++ret; - len = xmlStrlen(ret); - if (len) - while (isspace(ret[len-1])) --len; - - ret = xmlStrndup(ret, len); - xmlFree(str); - return ret; -} - -static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, DWORD *first, DWORD *last, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; BOOL preserving = is_preserving_whitespace(node); + *first = -1; + *last = 0; + if (!node->children) { str = xmlNodeGetContent(node); @@ -757,6 +741,7 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { BOOL ig_ws = FALSE; xmlChar* tmp; + DWORD pos = 0; str = xmlStrdup(BAD_CAST ""); if (node->type != XML_DOCUMENT_NODE) @@ -767,9 +752,17 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { switch (child->type) { - case XML_ELEMENT_NODE: - tmp = do_get_text(child, FALSE, trail_ig_ws); + case XML_ELEMENT_NODE: { + DWORD node_first, node_last; + + tmp = do_get_text(child, FALSE, &node_first, &node_last, trail_ig_ws); + + if (node_first!=-1 && pos+node_first<*first) + *first = pos+node_first; + if (node_last && pos+node_last>*last) + *last = pos+node_last; break; + } case XML_TEXT_NODE: tmp = xmlNodeGetContent(child); if (!preserving && tmp[0]) @@ -797,17 +790,22 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) break; } - if (tmp) + if ((tmp && *tmp) || child->type==XML_CDATA_SECTION_NODE) { - if (*tmp) + if (ig_ws && str[0]) { - if (ig_ws && str[0]) - str = xmlStrcat(str, BAD_CAST " "); - str = xmlStrcat(str, tmp); - ig_ws = FALSE; + str = xmlStrcat(str, BAD_CAST " "); + pos++; } - xmlFree(tmp); + if (tmp && *tmp) str = xmlStrcat(str, tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos<*first) + *first = pos; + if (tmp && *tmp) pos += xmlStrlen(tmp); + if (child->type==XML_CDATA_SECTION_NODE && pos>*last) + *last = pos; + ig_ws = FALSE; } + if (tmp) xmlFree(tmp); if (!ig_ws) { @@ -830,7 +828,23 @@ static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) - str = trim_whitespace(str); + { + xmlChar* ret = str; + int len; + + if (!str) + break; + + for (ret = str; *ret && isspace(*ret) && (*first)--; ret++) + if (*last) (*last)--; + for (len = xmlStrlen(ret)-1; len >= 0 && len >= *last; len--) + if(!isspace(ret[len])) break; + + ret = xmlStrndup(ret, len+1); + xmlFree(str); + str = ret; + break; + } break; default: break; @@ -843,11 +857,12 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + DWORD first, last; BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node, TRUE, &tmp); + content = do_get_text(This->node, TRUE, &first, &last, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4201bac..1926f50 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4178,7 +4178,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 } else { - todo_wine helper_expect_bstr_and_release(bstr, " This is a description."); + helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); @@ -4213,7 +4213,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else {

1 0

Piotr Caban : msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 900fe6afa6903a3ace29a60dc97e010cd8cfaadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=900fe6afa6903a3ace29a60dc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:41:22 2015 +0100 msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes. 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 +++++++++++++++++++++++++++++++++++++++------- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8914e05..17e3838 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -742,7 +742,7 @@ static inline xmlChar* trim_whitespace(xmlChar* str) return ret; } -static xmlChar* do_get_text(xmlNodePtr node) +static xmlChar* do_get_text(xmlNodePtr node, BOOL trim, BOOL *trail_ig_ws) { xmlNodePtr child; xmlChar* str; @@ -751,20 +751,42 @@ static xmlChar* do_get_text(xmlNodePtr node) if (!node->children) { str = xmlNodeGetContent(node); + *trail_ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; } else { - xmlElementType prev_type = XML_TEXT_NODE; + BOOL ig_ws = FALSE; xmlChar* tmp; str = xmlStrdup(BAD_CAST ""); + + if (node->type != XML_DOCUMENT_NODE) + ig_ws = *(DWORD*)&node->_private & NODE_PRIV_CHILD_IGNORABLE_WS; + *trail_ig_ws = FALSE; + for (child = node->children; child != NULL; child = child->next) { switch (child->type) { case XML_ELEMENT_NODE: - tmp = do_get_text(child); + tmp = do_get_text(child, FALSE, trail_ig_ws); break; case XML_TEXT_NODE: + tmp = xmlNodeGetContent(child); + if (!preserving && tmp[0]) + { + xmlChar *beg; + + for (beg = tmp; *beg; beg++) + if (!isspace(*beg)) break; + + if (!*beg) + { + ig_ws = TRUE; + xmlFree(tmp); + tmp = NULL; + } + break; + } case XML_CDATA_SECTION_NODE: case XML_ENTITY_REF_NODE: case XML_ENTITY_NODE: @@ -779,14 +801,24 @@ static xmlChar* do_get_text(xmlNodePtr node) { if (*tmp) { - if (prev_type == XML_ELEMENT_NODE && child->type == XML_ELEMENT_NODE) + if (ig_ws && str[0]) str = xmlStrcat(str, BAD_CAST " "); str = xmlStrcat(str, tmp); - prev_type = child->type; + ig_ws = FALSE; } xmlFree(tmp); } + + if (!ig_ws) + { + ig_ws = *(DWORD*)&child->_private & NODE_PRIV_TRAILING_IGNORABLE_WS; + } + if (!ig_ws) + ig_ws = *trail_ig_ws; + *trail_ig_ws = FALSE; } + + *trail_ig_ws = ig_ws; } switch (node->type) @@ -797,7 +829,7 @@ static xmlChar* do_get_text(xmlNodePtr node) case XML_ENTITY_NODE: case XML_DOCUMENT_NODE: case XML_DOCUMENT_FRAG_NODE: - if (!preserving) + if (trim && !preserving) str = trim_whitespace(str); break; default: @@ -811,10 +843,11 @@ HRESULT node_get_text(const xmlnode *This, BSTR *text) { BSTR str = NULL; xmlChar *content; + BOOL tmp; if (!text) return E_INVALIDARG; - content = do_get_text(This->node); + content = do_get_text(This->node, TRUE, &tmp); if (content) { str = bstr_from_xmlChar(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 00a24b6..4201bac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4174,7 +4174,7 @@ static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2 helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { - todo_wine helper_expect_bstr_and_release(bstr, str); + helper_expect_bstr_and_release(bstr, str); } else { @@ -4217,7 +4217,7 @@ static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocumen } else { - todo_wine helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1);

1 0

Changhui Liu : hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 0125ef6dd757b2be8295e0f10f4f0e0657a5486a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0125ef6dd757b2be8295e0f10… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:48:56 2015 +0800 hidclass.sys: Properly print 80 bytes in first line when tracing ParseDescriptor. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index eb0b42a..9a26f0f4 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -1030,7 +1030,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) for (cidx = 0; cidx < length; cidx++) { TRACE("%x ",descriptor[cidx]); - if (cidx % 80 == 0) + if ((cidx+1) % 80 == 0) TRACE("\n"); } TRACE("\n");

1 0

Piotr Caban : ole32: Fix apartment window class name.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

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

Changhui Liu : hidclass.sys: Initialize ext-> irp_queue immediately after HID_CreateDevice.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: acdd869e5d2b2fa01c60eddab7445b71ac21881a URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdd869e5d2b2fa01c60eddab… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Fri Dec 18 14:40:16 2015 +0800 hidclass.sys: Initialize ext->irp_queue immediately after HID_CreateDevice. Signed-off-by: Changhui Liu <liuchanghui(a)linuxdeepin.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 1ae3bb0..24dd140 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -132,6 +132,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } + ext = device->DeviceExtension; + InitializeListHead(&ext->irp_queue); + TRACE("Created device %p\n",device); status = minidriver->AddDevice(minidriver->minidriver.DriverObject, device); if (status != STATUS_SUCCESS) @@ -160,7 +163,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - ext = device->DeviceExtension; ext->information.VendorID = attr.VendorID; ext->information.ProductID = attr.ProductID; ext->information.VersionNumber = attr.VersionNumber; @@ -233,7 +235,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) HID_LinkDevice(device, serial, interface); ext->poll_interval = DEFAULT_POLL_INTERVAL; - InitializeListHead(&ext->irp_queue); ext->ring_buffer = RingBuffer_Create(sizeof(HID_XFER_PACKET) + ext->preparseData->caps.InputReportByteLength);

1 0

Joachim Priesner : wbemprox: Iterate over all drives instead of just the first four.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 29862da337cdfa50da0402a9b6e8593c951867dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29862da337cdfa50da0402a9b… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Dec 21 13:00:32 2015 +0100 wbemprox: Iterate over all drives instead of just the first four. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2ff3f50..b7db266 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1176,7 +1176,7 @@ static enum fill_status fill_cdromdrive( struct table *table, const struct expr if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1598,7 +1598,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1719,7 +1719,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * dirstack = alloc_dirstack(2); - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (!(drives & (1 << i))) continue; @@ -1831,7 +1831,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1895,7 +1895,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) { @@ -1962,7 +1962,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr if (!resize_table( table, 4, sizeof(*rec) )) return FILL_STATUS_FAILED; - for (i = 0; i < sizeof(drives); i++) + for (i = 0; i < 26; i++) { if (drives & (1 << i)) {

1 0

Nikolay Sivov : ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 86df15cbf1e1bc323a05e5a6c15b982c4fd7b92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86df15cbf1e1bc323a05e5a6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 17 16:06:50 2015 +0300 ntdll: Trace RTL_BITMAP api arguments as unsigned when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlbitmap.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 20d6a02..318f6fc 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -74,7 +74,7 @@ static const signed char NTDLL_mostSignificant[16] = { */ VOID WINAPI RtlInitializeBitMap(PRTL_BITMAP lpBits, PULONG lpBuff, ULONG ulSize) { - TRACE("(%p,%p,%d)\n", lpBits,lpBuff,ulSize); + TRACE("(%p,%p,%u)\n", lpBits,lpBuff,ulSize); lpBits->SizeOfBitMap = ulSize; lpBits->Buffer = lpBuff; } @@ -130,7 +130,7 @@ VOID WINAPI RtlSetBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -191,7 +191,7 @@ VOID WINAPI RtlClearBits(PRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) { LPBYTE lpOut; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -254,7 +254,7 @@ BOOLEAN WINAPI RtlAreBitsSet(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount) LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -327,7 +327,7 @@ BOOLEAN WINAPI RtlAreBitsClear(PCRTL_BITMAP lpBits, ULONG ulStart, ULONG ulCount LPBYTE lpOut; ULONG ulRemainder; - TRACE("(%p,%d,%d)\n", lpBits, ulStart, ulCount); + TRACE("(%p,%u,%u)\n", lpBits, ulStart, ulCount); if (!lpBits || !ulCount || ulStart >= lpBits->SizeOfBitMap || @@ -395,7 +395,7 @@ ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -442,7 +442,7 @@ ULONG WINAPI RtlFindClearBits(PCRTL_BITMAP lpBits, ULONG ulCount, ULONG ulHint) { ULONG ulPos, ulEnd; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); if (!lpBits || !ulCount || ulCount > lpBits->SizeOfBitMap) return ~0U; @@ -489,7 +489,7 @@ ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindSetBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -514,7 +514,7 @@ ULONG WINAPI RtlFindClearBitsAndSet(PRTL_BITMAP lpBits, ULONG ulCount, ULONG ulH { ULONG ulPos; - TRACE("(%p,%d,%d)\n", lpBits, ulCount, ulHint); + TRACE("(%p,%u,%u)\n", lpBits, ulCount, ulHint); ulPos = RtlFindClearBits(lpBits, ulCount, ulHint); if (ulPos != ~0U) @@ -870,7 +870,7 @@ ULONG WINAPI RtlFindNextForwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindSetRun(lpBits, ulStart, &ulSize); @@ -897,7 +897,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO { ULONG ulSize = 0; - TRACE("(%p,%d,%p)\n", lpBits, ulStart, lpPos); + TRACE("(%p,%u,%p)\n", lpBits, ulStart, lpPos); if (lpBits && ulStart < lpBits->SizeOfBitMap && lpPos) *lpPos = NTDLL_FindClearRun(lpBits, ulStart, &ulSize); @@ -922,7 +922,7 @@ ULONG WINAPI RtlFindNextForwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULO */ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -943,7 +943,7 @@ ULONG WINAPI RtlFindLastBackwardRunSet(PCRTL_BITMAP lpBits, ULONG ulStart, PULON */ ULONG WINAPI RtlFindLastBackwardRunClear(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpPos) { - FIXME("(%p,%d,%p)-stub!\n", lpBits, ulStart, lpPos); + FIXME("(%p,%u,%p)-stub!\n", lpBits, ulStart, lpPos); return 0; } @@ -1021,7 +1021,7 @@ static ULONG NTDLL_FindRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindSetRun); } @@ -1043,7 +1043,7 @@ ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG WINAPI RtlFindClearRuns(PCRTL_BITMAP lpBits, PRTL_BITMAP_RUN lpSeries, ULONG ulCount, BOOLEAN bLongest) { - TRACE("(%p,%p,%d,%d)\n", lpBits, lpSeries, ulCount, bLongest); + TRACE("(%p,%p,%u,%d)\n", lpBits, lpSeries, ulCount, bLongest); return NTDLL_FindRuns(lpBits, lpSeries, ulCount, bLongest, NTDLL_FindClearRun); }

1 0

Jacek Caban : mshtml: Added nsIChannel::Cancel implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 86c097142bdc66bccab7dc5fd7b44a7bc86e43d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c097142bdc66bccab7dc5fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 14:31:29 2015 +0100 mshtml: Added nsIChannel::Cancel implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 2 ++ dlls/mshtml/navigate.c | 21 +++++++++++++++------ dlls/mshtml/nsio.c | 8 ++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index e173431..3a4e06b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -55,6 +55,8 @@ typedef struct { REQUEST_METHOD request_method; struct list response_headers; struct list request_headers; + + nsChannelBSC *binding; } nsChannel; typedef struct { diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ed61ab0..1854a70 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -927,6 +927,8 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; + This->nschannel->binding = This; + /* FIXME: it's needed for http connections from BindToObject. */ if(!This->nschannel->response_status) This->nschannel->response_status = 200; @@ -972,11 +974,15 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) WARN("OnStopRequest failed: %08x\n", nsres); } - if(This->nschannel && This->nschannel->load_group) { - nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); - if(NS_FAILED(nsres)) - ERR("RemoveRequest failed: %08x\n", nsres); + if(This->nschannel) { + if(This->nschannel->load_group) { + nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, + (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + } + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; } } @@ -1217,8 +1223,11 @@ static void nsChannelBSC_destroy(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(This->nschannel) + if(This->nschannel) { + if(This->nschannel->binding == This) + This->nschannel->binding = NULL; nsIHttpChannel_Release(&This->nschannel->nsIHttpChannel_iface); + } if(This->nslistener) nsIStreamListener_Release(This->nslistener); if(This->nscontext) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a2615c4..a5a1ffd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -617,9 +617,13 @@ static nsresult NSAPI nsChannel_Cancel(nsIHttpChannel *iface, nsresult aStatus) { nsChannel *This = impl_from_nsIHttpChannel(iface); - FIXME("(%p)->(%08x)\n", This, aStatus); + TRACE("(%p)->(%08x)\n", This, aStatus); - return NS_ERROR_NOT_IMPLEMENTED; + if(This->binding && This->binding->bsc.binding) + IBinding_Abort(This->binding->bsc.binding); + else + WARN("No binding to cancel\n"); + return NS_OK; } static nsresult NSAPI nsChannel_Suspend(nsIHttpChannel *iface)

1 0

Jactry Zeng : riched20/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 99f0f6b91b981407b9f18c8b499f339dcf76f5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0f6b91b981407b9f18c8b4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 21:00:28 2015 +0800 riched20/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index efa0b29..6c4195c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -46,6 +46,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; format, string1, string2, string3); static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -486,6 +487,28 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + int offset_test1[3][2] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 9}, /* Line 2: |richedit\x8e\xf0\n */ + {15, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -4009,7 +4032,7 @@ static void test_EM_SETTEXTEX(void) ok(result == 0, "EM_SETTEXTEX: Test UTF8 with BOM set wrong text: Result: %s\n", bufACP); /* Test multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -4882,7 +4905,7 @@ static void test_EM_REPLACESEL(int redraw) ok(r == 7, "EM_GETLINECOUNT returned %d, expected 7\n", r); /* Test with multibyte character */ - if (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_JAPANESE) + if (!is_lang_japanese) skip("Skip multibyte character tests on non-Japanese platform\n"); else { @@ -8160,6 +8183,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE);

1 0

Jactry Zeng : riched32/tests: Test EM_LINELENGTH with multibyte character.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: d9ead0c899975780347916fe52f825681f8a16e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ead0c899975780347916fe5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Dec 21 20:59:58 2015 +0800 riched32/tests: Test EM_LINELENGTH with multibyte character. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index d3a286e..40daae0 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -35,6 +35,7 @@ #include <wine/test.h> static HMODULE hmoduleRichEdit; +static BOOL is_lang_japanese; static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; @@ -498,6 +499,32 @@ static void test_EM_LINELENGTH(void) offset_test[i][0], result, offset_test[i][1]); } + /* Test with multibyte character */ + if (!is_lang_japanese) + skip("Skip multibyte character tests on non-Japanese platform\n"); + else + { + const char *text1 = + "wine\n" + "richedit\x8e\xf0\n" + "wine"; + static int offset_test1[3][3] = { + {0, 4}, /* Line 1: |wine\n */ + {5, 10, 1}, /* Line 2: |richedit\x8e\xf0\n */ + {16, 4}, /* Line 3: |wine */ + }; + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); + for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); + if (offset_test1[i][2]) + todo_wine ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + else + ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test1[i][0], result, offset_test1[i][1]); + } + } + DestroyWindow(hwndRichEdit); } @@ -1211,6 +1238,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE();

1 0

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

Dec. 21, 2015

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

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

Dec. 21, 2015

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

Michael Stefaniuc : dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 0e5dcc2c841be0a4311d1915d073d2775fe436b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5dcc2c841be0a4311d1915d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 21 12:08:09 2015 +0100 dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 5 +++++ dlls/dsound/tests/ds3d8.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7b93455..e50ef58 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -542,6 +542,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } + if (from8 && (dsbd->dwFlags & DSBCAPS_CTRL3D) && (dsbd->dwFlags & DSBCAPS_CTRLPAN)) { + WARN("invalid parameter: DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN cannot be used together\n"); + return DSERR_INVALIDPARAM; + } + hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); if (dsb) { *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 330f590..25eb010 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -654,7 +654,6 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, /* Invalid flag combination */ bufdesc.dwFlags|=DSBCAPS_CTRLPAN; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - todo_wine ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc);

1 0

Piotr Caban : winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don' t use it WS_EX_ACCEPTFILES related drops.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: ba21de83a6d28c6c418804c62bbb03ac04748754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba21de83a6d28c6c418804c62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:31 2015 +0100 winex11.drv: XDNDDropEffect stores OLE Drag&Drop effect so don't use it WS_EX_ACCEPTFILES related drops. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0c34b4f..8b2c582 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -339,12 +339,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1; effect = DROPEFFECT_COPY; - XDNDDropEffect = effect; } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", @@ -432,7 +430,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (XDNDDropEffect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );

1 0

Piotr Caban : winex11.drv: Reset XDNDAccepted flag if IDropTarget:: DragEnter fails.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 76f7d8c7abf7447016e4edaf91c06563cc860918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f7d8c7abf7447016e4edaf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:27 2015 +0100 winex11.drv: Reset XDNDAccepted flag if IDropTarget::DragEnter fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 841eaff..0c34b4f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -314,7 +314,10 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("the application accepted the drop (effect = %d)\n", effect_ignore); } else + { + XDNDAccepted = FALSE; WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr); + } IDropTarget_Release(dropTarget); } }

1 0

Piotr Caban : winex11.drv: Ignore effect returned in IDropTarget:: DragEnter.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: a2f3d9740642ca6d4a7c63175f7e8db34120c2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f3d9740642ca6d4a7c63175… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:12 2015 +0100 winex11.drv: Ignore effect returned in IDropTarget::DragEnter. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 01af480..b066751 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -305,17 +305,13 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) XDNDLastDropTargetWnd = dropTargetWindow; if (dropTarget) { + DWORD effect_ignore = effect; hr = IDropTarget_DragEnter(dropTarget, &XDNDDataObject, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr == S_OK) { - if (effect != DROPEFFECT_NONE) - { - XDNDAccepted = TRUE; - TRACE("the application accepted the drop\n"); - } - else - TRACE("the application refused the drop\n"); + XDNDAccepted = TRUE; + TRACE("the application accepted the drop (effect = %d)\n", effect_ignore); } else WARN("IDropTarget_DragEnter failed, error 0x%08X\n", hr); @@ -340,7 +336,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (X11DRV_XDND_XdndActionToDROPEFFECT(event->data.l[4]) & DROPEFFECT_COPY) && + (effect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1;

1 0

Nikolay Sivov : ole2nls: Fix CompareString() prototype.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: e5d7d69f7225991ba6df6b1986cc04a3d2037940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d69f7225991ba6df6b198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:15:59 2015 +0300 ole2nls: Fix CompareString() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2nls.dll16/ole2nls.c | 5 ++--- include/wine/winbase16.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ole2nls.dll16/ole2nls.c b/dlls/ole2nls.dll16/ole2nls.c index b21601b..68db449 100644 --- a/dlls/ole2nls.dll16/ole2nls.c +++ b/dlls/ole2nls.dll16/ole2nls.c @@ -104,10 +104,9 @@ INT16 WINAPI LCMapString16(LCID lcid, DWORD mapflags, LPCSTR srcstr, INT16 srcle /*********************************************************************** * CompareStringA (OLE2NLS.8) */ -UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle, - LPCSTR s1,DWORD l1,LPCSTR s2,DWORD l2) +INT16 WINAPI CompareString16(LCID lcid, DWORD flags, LPCSTR str1, INT16 len1, LPCSTR str2, INT16 len2) { - return (UINT16)CompareStringA(lcid,fdwStyle,s1,l1,s2,l2); + return CompareStringA(lcid, flags, str1, len1, str2, len2); } /****************************************************************************** diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 310d5f6..f2f32a2 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -435,7 +435,7 @@ VOID WINAPI _LeaveWin16Lock(void); INT16 WINAPI AccessResource16(HINSTANCE16,HRSRC16); ATOM WINAPI AddAtom16(LPCSTR); -UINT16 WINAPI CompareString16(DWORD,DWORD,LPCSTR,DWORD,LPCSTR,DWORD); +INT16 WINAPI CompareString16(LCID,DWORD,LPCSTR,INT16,LPCSTR,INT16); BOOL16 WINAPI CreateDirectory16(LPCSTR,LPVOID); BOOL16 WINAPI DefineHandleTable16(WORD); ATOM WINAPI DeleteAtom16(ATOM);

1 0

Sebastian Lackner : ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 1980834c7d7ee3eb32fa9ece20673d9c39a74b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1980834c7d7ee3eb32fa9ece2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:18:50 2015 +0100 ntdll: ProcessDebugFlags should return debug_children flag instead of !debugger_present. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 2 +- dlls/ntdll/tests/info.c | 12 ++---------- include/wine/server_protocol.h | 5 +++-- server/debugger.c | 2 +- server/process.c | 5 +++-- server/protocol.def | 3 ++- server/request.h | 1 + server/trace.c | 1 + 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index ca9462a..5a5c3ef 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -339,7 +339,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( req->handle = wine_server_obj_handle( ProcessHandle ); if ((ret = wine_server_call( req )) == STATUS_SUCCESS) { - *(DWORD *)ProcessInformation = !reply->debugger_present; + *(DWORD *)ProcessInformation = reply->debug_children; } } SERVER_END_REQ; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 88d0417..a521447 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1345,11 +1345,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (!expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); if (!(test_flags[i] & CREATE_SUSPENDED)) { @@ -1379,11 +1375,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(pi.hProcess, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); ok(!status, "NtQueryInformationProcess failed, status %#x.\n", status); - if (expected_flags) - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); - else - todo_wine - ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); + ok(debug_flags == expected_flags, "Expected flag %x, got %x.\n", expected_flags, debug_flags); ret = DebugActiveProcess(pi.dwProcessId); ok(ret, "DebugActiveProcess failed, last error %#x.\n", GetLastError()); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4e33260..f0dc65a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -857,7 +857,8 @@ struct get_process_info_reply int exit_code; int priority; cpu_type_t cpu; - int debugger_present; + short int debugger_present; + short int debug_children; }; @@ -6153,6 +6154,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 490 +#define SERVER_PROTOCOL_VERSION 491 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 374f2ad..810e8d3 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -443,6 +443,7 @@ static int debugger_attach( struct process *process, struct thread *debugger ) resume_process( process ); return 0; } + process->debug_children = 0; return 1; error: @@ -483,7 +484,6 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; - process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index e00b429..8433002 100644 --- a/server/process.c +++ b/server/process.c @@ -513,7 +513,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->debug_children = 0; + process->debug_children = 1; process->is_terminating = 0; process->job = NULL; process->console = NULL; @@ -1228,7 +1228,7 @@ DECL_HANDLER(new_process) else if (parent->debugger && parent->debug_children) { set_process_debugger( process, parent->debugger ); - process->debug_children = 1; + /* debug_children is set to 1 by default */ } if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) @@ -1359,6 +1359,7 @@ DECL_HANDLER(get_process_info) reply->end_time = process->end_time; reply->cpu = process->cpu; reply->debugger_present = !!process->debugger; + reply->debug_children = process->debug_children; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 04814c9..bfb9089 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -818,7 +818,8 @@ struct rawinput_device int exit_code; /* process exit code */ int priority; /* priority class */ cpu_type_t cpu; /* CPU that this process is running on */ - int debugger_present; /* process is being debugged */ + short int debugger_present; /* process is being debugged */ + short int debug_children; /* inherit debugger to child processes */ @END diff --git a/server/request.h b/server/request.h index 48f4d46..9653f0c 100644 --- a/server/request.h +++ b/server/request.h @@ -760,6 +760,7 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debugger_present) == 60 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, debug_children) == 62 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4ec7aad..405a1c9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1279,6 +1279,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re fprintf( stderr, ", priority=%d", req->priority ); dump_cpu_type( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); + fprintf( stderr, ", debug_children=%d", req->debug_children ); } static void dump_set_process_info_request( const struct set_process_info_request *req )

1 0

Sebastian Lackner : kernel32/tests: Remove unnecessary call to GetExitCodeProcess in process tests.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 6cf682d207129771b97a2cd9d7495c64217944da URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf682d207129771b97a2cd9d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:26:09 2015 +0100 kernel32/tests: Remove unnecessary call to GetExitCodeProcess in process tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6dc1f5e..f186c94 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2729,7 +2729,6 @@ static void test_StartupNoConsole(void) char buffer[MAX_PATH]; STARTUPINFOA startup; PROCESS_INFORMATION info; - DWORD code; if (!pNtCurrentTeb) { @@ -2746,7 +2745,6 @@ static void test_StartupNoConsole(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); - ok(GetExitCodeProcess(info.hProcess, &code), "Getting exit code\n"); WritePrivateProfileStringA(NULL, NULL, NULL, resfile); okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE);

1 0

YongHao Hu : msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 67dc02fdebbe930c67fb5cc348b7ebc082ff63ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=67dc02fdebbe930c67fb5cc34… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:16:10 2015 +0800 msvcp120/tests: Add tests of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 12ca12d..6ea024a 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -129,6 +129,9 @@ static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); +static void* (__cdecl *p_tr2_sys__Open_dir)(char*, char const*, int *, enum file_type*); +static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*); +static void (__cdecl *p_tr2_sys__Close_dir)(void*); /* thrd */ typedef struct @@ -256,6 +259,12 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -303,6 +312,12 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); + SET(p_tr2_sys__Open_dir, + "?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z"); + SET(p_tr2_sys__Read_dir, + "?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z"); + SET(p_tr2_sys__Close_dir, + "?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1211,6 +1226,99 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_tr2_sys__dir_operation(void) +{ + char *file_name, first_file_name[MAX_PATH], dest[MAX_PATH], longer_path[MAX_PATH]; + HANDLE file, result_handle; + enum file_type type; + int err, num_of_f1 = 0, num_of_f2 = 0, num_of_sub_dir = 0, num_of_other_files = 0; + + CreateDirectoryA("tr2_test_dir", NULL); + file = CreateFileA("tr2_test_dir/f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileA("tr2_test_dir/f2", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + CreateDirectoryA("tr2_test_dir/sub_dir", NULL); + file = CreateFileA("tr2_test_dir/sub_dir/sub_f1", 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + memset(longer_path, 0, MAX_PATH); + GetCurrentDirectoryA(MAX_PATH, longer_path); + strcat(longer_path, "\\tr2_test_dir\\"); + while(lstrlenA(longer_path) < MAX_PATH-1) + strcat(longer_path, "s"); + ok(lstrlenA(longer_path) == MAX_PATH-1, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", lstrlenA(longer_path)); + memset(first_file_name, 0, MAX_PATH); + type = err = 0xdeadbeef; + result_handle = NULL; + result_handle = p_tr2_sys__Open_dir(first_file_name, longer_path, &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect NULL, got %p\n", result_handle); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect 0xdeadbeef, got %d\n", type); + + memset(first_file_name, 0, MAX_PATH); + memset(dest, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = NULL; + result_handle = p_tr2_sys__Open_dir(first_file_name, "tr2_test_dir", &err, &type); + ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "tr2_sys__Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + file_name = first_file_name; + while(*file_name) { + if (!strcmp(file_name, "f1")) { + ++num_of_f1; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!strcmp(file_name, "f2")) { + ++num_of_f2; + ok(type == regular_file, "expect regular_file, got %d\n", type); + }else if(!strcmp(file_name, "sub_dir")) { + ++num_of_sub_dir; + ok(type == directory_file, "expect directory_file, got %d\n", type); + }else { + ++num_of_other_files; + } + file_name = p_tr2_sys__Read_dir(dest, result_handle, &type); + } + p_tr2_sys__Close_dir(result_handle); + ok(result_handle != NULL, "tr2_sys__Open_dir(): expect: not NULL, got %p\n", result_handle); + ok(num_of_f1 == 1, "found f1 %d times\n", num_of_f1); + ok(num_of_f2 == 1, "found f2 %d times\n", num_of_f2); + ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); + ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); + + memset(first_file_name, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + todo_wine ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect: 0xdeadbeef, got %d\n", type); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + + CreateDirectoryA("empty_dir", NULL); + memset(first_file_name, 0, MAX_PATH); + err = type = 0xdeadbeef; + result_handle = file; + result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + ok(err == ERROR_SUCCESS, "tr2_sys__Open_dir(): expect: ERROR_SUCCESS, got %d\n", err); + ok(type == status_unknown, "tr2_sys__Open_dir(): expect: status_unknown, got %d\n", type); + ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); + p_tr2_sys__Close_dir(result_handle); + ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); + + ok(RemoveDirectoryA("empty_dir"), "expect empty_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/sub_dir/sub_f1"), "expect tr2_test_dir/sub_dir/sub_f1 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir/sub_dir"), "expect tr2_test_dir/sub_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1464,6 +1572,7 @@ START_TEST(msvcp120) test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); test_tr2_sys__Last_write_time(); + test_tr2_sys__dir_operation(); test_thrd(); test_cnd();

1 0

YongHao Hu : msvcp110: Add tr2_sys__Read_dir implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 2ed5d0afc1e516c65a2f606ead009e666ffc29ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed5d0afc1e516c65a2f606ea… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:15:34 2015 +0800 msvcp110: Add tr2_sys__Read_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a77a5c8..9751854 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1711,8 +1711,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4668129..4a136a2 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1672,8 +1672,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 9a1b6da..53f8b0b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1672,8 +1672,8 @@ @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA @ cdecl ?_Random_device(a)std@@YAIXZ() msvcp120.?_Random_device(a)std@@YAIXZ -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ stub -arch=arm ?_Release(a)_Pad@std@@QAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5242b53..f01cf6d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14478,6 +14478,32 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } +/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ +/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ +char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +{ + WIN32_FIND_DATAA data; + TRACE("(%p %p %p)\n", target, handle, type); + if(!FindNextFileA(handle, &data)) { + *type = status_unknown; + *target = '\0'; + return target; + } + while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + if(!FindNextFileA(handle, &data)) { + *type = status_unknown; + return NULL; + } + } + + strcpy(target, data.cFileName); + if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + *type = directory_file; + else + *type = regular_file; + return target; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Nikolay Sivov : kernel32/tests: Some tests for ZombifyActCtx().
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: fe2f86e93480698e0acce4c8ce67f8eb2b501518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f86e93480698e0acce4c8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:04 2015 +0300 kernel32/tests: Some tests for ZombifyActCtx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fcce93b..64176cb 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); +static BOOL (WINAPI *pZombifyActCtx)(HANDLE); static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID *,ULONG,PUNICODE_STRING,PACTCTX_SECTION_KEYED_DATA); static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); @@ -2425,6 +2426,7 @@ static BOOL init_funcs(void) X(QueryActCtxW); X(ReleaseActCtx); X(FindActCtxSectionGuid); + X(ZombifyActCtx); hLibrary = GetModuleHandleA("ntdll.dll"); X(RtlFindActivationContextSectionString); @@ -2435,6 +2437,77 @@ static BOOL init_funcs(void) return TRUE; } +static void test_ZombifyActCtx(void) +{ + ACTIVATION_CONTEXT_BASIC_INFORMATION basicinfo; + ULONG_PTR cookie; + HANDLE handle, current; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = pZombifyActCtx(NULL); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + handle = create_manifest("test.manifest", testdep_manifest3, __LINE__); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == NULL, "got %p\n", current); + + ret = pActivateActCtx(handle, &cookie); + ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(handle == current, "got %p, %p\n", current, handle); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(0, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == handle, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + + ret = pGetCurrentActCtx(&current); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(current == handle, "got %p\n", current); + + /* one more time */ + ret = pZombifyActCtx(handle); +todo_wine + ok(ret, "got %d\n", ret); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(handle); +} + START_TEST(actctx) { int argc; @@ -2457,5 +2530,6 @@ START_TEST(actctx) test_actctx(); test_CreateActCtx(); test_findsectionstring(); + test_ZombifyActCtx(); run_child_process(); }

1 0

Sebastian Lackner : server: Fix assignment of primary_group in token_duplicate.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 25b0a4981b137dcbf52dc18e85690fba11e2488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b0a4981b137dcbf52dc18e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 05:32:35 2015 +0100 server: Fix assignment of primary_group in token_duplicate. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/token.c b/server/token.c index 42cfb3d..6c2871f 100644 --- a/server/token.c +++ b/server/token.c @@ -559,6 +559,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, if (!token) return token; /* copy groups */ + token->primary_group = NULL; LIST_FOR_EACH_ENTRY( group, &src_token->groups, struct group, entry ) { size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[group->sid.SubAuthorityCount] ); @@ -570,8 +571,9 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, } memcpy( newgroup, group, size ); list_add_tail( &token->groups, &newgroup->entry ); + if (src_token->primary_group == &group->sid) + token->primary_group = &newgroup->sid; } - token->primary_group = src_token->primary_group; assert( token->primary_group ); /* copy privileges */

1 0

Nikolay Sivov : user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity).
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: eee6332e95d2a39b79e4410ebdfc075250277d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee6332e95d2a39b79e4410eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:13:56 2015 +0300 user.exe: Fix MapDialogRect() to actually convert passed rectangle (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index a194a58..fead42d 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -658,7 +658,7 @@ LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg, */ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect ) { - RECT rect32; + RECT rect32 = { rect->left, rect->top, rect->right, rect->bottom }; MapDialogRect( WIN_Handle32(hwnd), &rect32 ); rect->left = rect32.left; rect->right = rect32.right;

1 0

Andrey Melnikov : gdi32: Handle NULL filename in GetICMProfileA().
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: d4d304f4365134a6aec0fad18989e3c5f1950fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d304f4365134a6aec0fad18… Author: Andrey Melnikov <temnota.am(a)gmail.com> Date: Mon Dec 21 12:22:41 2015 +0300 gdi32: Handle NULL filename in GetICMProfileA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrey Melnikov <temnota.am(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/icm.c | 9 ++++++++- dlls/gdi32/tests/icm.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index d3a345d..9d0e2f6 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -116,11 +116,18 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) TRACE("%p, %p, %p\n", hdc, size, filename); - if (!hdc || !size || !filename) return FALSE; + if (!hdc || !size) return FALSE; if (GetICMProfileW(hdc, &buflen, filenameW)) { int len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + + if (!filename) + { + *size = len; + return FALSE; + } + if (*size >= len) { WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, *size, NULL, NULL); diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 764d0d2..6208090 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -55,7 +55,6 @@ static void test_GetICMProfileA( HDC dc ) size = 0; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); -todo_wine ok( size > 0, "got %u\n", size ); size = MAX_PATH;

1 0

Piotr Caban : winex11.drv: Only update drop effect if IDropTarget:: DragOver returned S_OK.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: c96589421a5fdf216daed54f20752e63cb31e1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96589421a5fdf216daed54f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:22 2015 +0100 winex11.drv: Only update drop effect if IDropTarget::DragOver returned S_OK. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index d5881ad..841eaff 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -325,7 +325,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (dropTarget) { hr = IDropTarget_DragOver(dropTarget, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr != S_OK) XDNDDropEffect = effect; else WARN("IDropTarget_DragOver failed, error 0x%08X\n", hr);

1 0

YongHao Hu : msvcp110: Add tr2_sys__Close_dir implementation.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: f142ca1f923519f9ae2ce493d6c538cac889eeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f142ca1f923519f9ae2ce493d… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Dec 21 12:15:47 2015 +0800 msvcp110: Add tr2_sys__Close_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 9751854..6c8aee4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1161,8 +1161,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 4a136a2..e3200a2 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1126,8 +1126,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) tr2_sys__Close_dir +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) tr2_sys__Close_dir @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) tr2_sys__Copy_file @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) tr2_sys__Copy_file_wchar diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 53f8b0b..655e0e6 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1126,8 +1126,8 @@ @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) msvcp120.?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA msvcp120.?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA -@ stub -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z -@ stub -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z +@ cdecl -arch=win64 ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z(ptr) msvcp120.?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z @ cdecl -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z(str str long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z @ cdecl -arch=win32 ?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z(wstr wstr long) msvcp120.?_Copy_file(a)sys@tr2(a)std@@YAHPB_W0_N(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f01cf6d..7440aff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14504,6 +14504,15 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type return target; } +/* ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z */ +/* ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z */ +void __cdecl tr2_sys__Close_dir(void* handle) +{ + TRACE("(%p)\n", handle); + + FindClose(handle); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Piotr Caban : winex11.drv: Call DragLeave instead of Drop if DROPEFFECT_NONE was set.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: fd4dbf0519c3b6126fdc906934d2eee5f825e32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4dbf0519c3b6126fdc90693… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 11:21:18 2015 +0100 winex11.drv: Call DragLeave instead of Drop if DROPEFFECT_NONE was set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b066751..d5881ad 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -386,7 +386,7 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) { dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (dropTarget && effect!=DROPEFFECT_NONE) { HRESULT hr; POINTL pointl; @@ -415,6 +415,13 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) } IDropTarget_Release(dropTarget); } + else if (dropTarget) + { + HRESULT hr = IDropTarget_DragLeave(dropTarget); + if (FAILED(hr)) + WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); + IDropTarget_Release(dropTarget); + } } if (drop_file)

1 0

Nikolay Sivov : user32/tests: One more activation context test for interthread SendMessage.
by Alexandre Julliard Dec. 21, 2015

Dec. 21, 2015

Module: wine Branch: master Commit: 69ec6f226e48949f020afe55b862d5e98618b5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ec6f226e48949f020afe55b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 21 12:10:27 2015 +0300 user32/tests: One more activation context test for interthread SendMessage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b90f8d0..c2a0557 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -76,6 +76,7 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,void*,ULONG,void*,SIZE_T,SIZE_T*); static void (WINAPI *pReleaseActCtx)(HANDLE); /* encoded DRAWITEMSTRUCT into an LPARAM */ @@ -7742,6 +7743,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_USER+10: { + ACTIVATION_CONTEXT_BASIC_INFORMATION basicinfo; HANDLE handle, event = (HANDLE)lParam; BOOL ret; @@ -7749,6 +7751,14 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, ret = pGetCurrentActCtx(&handle); ok(ret, "failed to get current context, %u\n", GetLastError()); ok(handle == 0, "got active context %p\n", handle); + + memset(&basicinfo, 0xff, sizeof(basicinfo)); + ret = pQueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, handle, 0, ActivationContextBasicInformation, + &basicinfo, sizeof(basicinfo), NULL); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(basicinfo.hActCtx == NULL, "got %p\n", basicinfo.hActCtx); + ok(basicinfo.dwFlags == 0, "got %x\n", basicinfo.dwFlags); + if (event) SetEvent(event); return 1; } @@ -14915,6 +14925,7 @@ static void init_funcs(void) X(CreateActCtxW); X(DeactivateActCtx); X(GetCurrentActCtx); + X(QueryActCtxW); X(ReleaseActCtx); #undef X }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8-rc4
by Jeremy Newman Dec. 21, 2015

Dec. 21, 2015

Module: website Branch: master Commit: 5ee7e622b0c6cc29057033b55b4caf2e7c3bfb07 URL: http://source.winehq.org/git/website.git/?a=commit;h=5ee7e622b0c6cc29057033… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 19 18:13:10 2015 +0100 Polish translation for release 1.8-rc4 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015121201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/pl/2015121201.xml b/news/pl/2015121201.xml new file mode 100644 index 0000000..85f57c8 --- /dev/null +++ b/news/pl/2015121201.xml @@ -0,0 +1,12 @@ +<news> +<date>Grudzień 12, 2015</date> +<title>Wydano Wine 1.8-rc4</title> +<body> + Wydanie rozwojowe Wine 1.8-rc4 jest już dostępne. + <a href="{$root}/announce/1.8-rc4">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc4.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8
by Jeremy Newman Dec. 21, 2015

Dec. 21, 2015

Module: website Branch: master Commit: cf4f04a989a0558f08fddefc5a8207f5a036aba6 URL: http://source.winehq.org/git/website.git/?a=commit;h=cf4f04a989a0558f08fdde… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 19 18:13:11 2015 +0100 Polish translation for release 1.8 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2015121901.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/news/pl/2015121901.xml b/news/pl/2015121901.xml new file mode 100644 index 0000000..b3964b3 --- /dev/null +++ b/news/pl/2015121901.xml @@ -0,0 +1,10 @@ +<news> +<date>Grudzień 19, 2015</date> +<title>Wydano Wine 1.8</title> +<body> + Zespół Wine z dumą ogłasza, że stabilne wydanie Wine 1.8 jest już dostępne. + Wydanie to stanowi 17 miesięcy pracy programistów, która przyniosła ponad 13,000 indywidualnych zmian w kodzie. Głównymi nowościami są implementacja DirectWrite oraz Direct2D, a także nowy sterownik dźwięku Pulse. + Wydanie zostało ulepszone wzdłuż i wszerz, przez co pozwala na uruchomienie wielu nowych gier i programów. Obejrzyj poniższe <a href="{$root}/announce/1.8">uwagi o wydaniu</a> below , aby zapoznać się z głównymi zmianami. +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.8
by Alexandre Julliard Dec. 19, 2015

Dec. 19, 2015

Module: website Branch: master Commit: e8db3c9596f2952c202d04658a4d2ff5ba710b8a URL: http://source.winehq.org/git/website.git/?a=commit;h=e8db3c9596f2952c202d04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 19 17:05:31 2015 +0100 Wine release 1.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015121901.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/news/en/2015121901.xml b/news/en/2015121901.xml new file mode 100644 index 0000000..715aa19 --- /dev/null +++ b/news/en/2015121901.xml @@ -0,0 +1,10 @@ +<news> +<date>December 19, 2015</date> +<title>Wine 1.8 Released</title> +<body> + The Wine team is proud to announce that the stable release Wine 1.8 is now available. + This release represents 17 months of development effort and around 13,000 individual changes. The main highlights are the implementation of DirectWrite and Direct2D, and the new Pulse Audio driver. + It also contains a lot of improvements across the board, as well as support for many new applications and games. See the <a href="{$root}/announce/1.8">release notes</a> below for a summary of the major changes. +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.8 : Alexandre Julliard : Release 1.8
by Alexandre Julliard Dec. 19, 2015

Dec. 19, 2015

Module: wine Branch: refs/tags/wine-1.8 Tag: 28474fc989736d5737a2ae1d8a78c858dbddf62e URL: http://source.winehq.org/git/wine.git/?a=tag;h=28474fc989736d5737a2ae1d8a78… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 19 16:57:44 2015 +0100 Release 1.8

1 0

Alexandre Julliard : Release 1.8.
by Alexandre Julliard Dec. 19, 2015

Dec. 19, 2015

Module: wine Branch: master Commit: a981d3738014339cd0fae1e7f5aa9429222ee03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a981d3738014339cd0fae1e7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 19 16:57:44 2015 +0100 Release 1.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 567 +++++++++++++++++++++++++++++++++++++++++++++++--------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 441 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a981d3738014339cd0fae…

1 0

Rosanne DiMesio : Website update Downloads page
by Jeremy Newman Dec. 16, 2015

Dec. 16, 2015

Module: website Branch: master Commit: e886239cfaccf1443c2d9b414bd58c186266ddec URL: http://source.winehq.org/git/website.git/?a=commit;h=e886239cfaccf1443c2d9b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Dec 15 13:42:45 2015 -0600 Website update Downloads page This updates the Downloads page to include the WineHQ packages. The layout is intended to clearly differentiate the WineHQ packages from the distro-built ones. Links for the WineHQ packages lead to the distros' respective pages on wiki.winehq.org, which have already been updated with instructions for installing the official WineHQ packages. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/download.template | 68 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index eadf9e8..93e1e78 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -34,9 +34,7 @@ requested in exchange for hosting the Wine web site. -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binary Downloads</h2> - -Binary packages are built and maintained by the distros, and may contain patches that are not supported here. The links below are provided solely as a convenience to users and do not represent an endorsement. +<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binary Packages</h2> <table style="margin: 0 0 15px 0;" width="100%"> <tr> @@ -53,48 +51,52 @@ requested in exchange for hosting the Wine web site. <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> - <td align="center" bgcolor="black">System</td> - <td align="center" bgcolor="black">Notes</td> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">WineHQ Binary Packages</td> <td align="center" bgcolor="black">Maintainer</td> </tr> + <tr bgcolor="#ffffff"> + <td align="center"></td> + <td align="center">These packages are built and supported by WineHQ. Please report any problems with them in <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. + </td> + <td></td> + <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> + <td align="center"> + <img src="{$root}/winehq_logo_glass_sm.png" alt="WineHQ" border="0"></a> </td> - <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu</td> - <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> + <td> + <a href="http://wiki.winehq.org/Ubuntu">Ubuntu</a> + - WineHQ binary packages for the development and staging branches for Ubuntu 12.04, 14.04, 15.04, 15.10, 16.04 + <a href="http://wiki.winehq.org/Debian">Debian</a> + - WineHQ binary packages for the development and staging branches for Debian Wheezy, Jessie, Stretch, and Sid + <a href="http://wiki.winehq.org/Fedora">Fedora</a> + - WineHQ binary packages for the development and staging branches for Fedora 22 and 23 + <a href="http://wiki.winehq.org/Mageia">Mageia</a> + - WineHQ binary packages for the development and staging branches for Mageia 4 and 5 + Mac OS X + - Planned; not yet available for download. + </tt> + <td><a href="mailto: michael(a)fds-team.de">Michael Müller</a></td> </tr> - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> - </td> - <td> <a href="{$root}/download/debian">Download Debian packages</a> - - binary and source .debs for Debian</td> - <td><a href="mailto:pkg-wine-party(a)lists.alioth.debian.org">Debian Wine Party</a></td> + <tr> + <td align="center" bgcolor="black"></td> + <td align="center" bgcolor="black">Distro Binary Packages</td> + <td align="center" bgcolor="black">Maintainer</td> </tr> - + <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> + <td align="center"></td> + <td align="center">These packages are built and supported by the distros. Please report any problems with them to the package maintainer. </td> - <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Download Red Hat / CentOS / Fedora packages</a> - - binary and source .rpms for Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 and - compatible distributions. - The wine meta package is available via <tt>yum</tt> - through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install - wine </tt> - </td> - <td><a href="mailto:andreas.bierfert(a)lowlatency.de">Andreas Bierfert</a></td> - </tr> - + <td></td> <tr bgcolor="#ffffff"> <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> - <td> <a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a> + <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.4 up to 13.2) and SUSE Linux Enterprise 11. </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> @@ -104,7 +106,7 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Download Slackware packages</a> + <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a> - binary txz (Slackware 14.1), and tgz (for older versions)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> @@ -113,7 +115,7 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.freshports.org/emulators/wine/">Download FreeBSD packages</a> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - source for FreeBSD 5.3 or later</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr>

1 0

Jeremy Newman : fix broken image, small tweaks
by Jeremy Newman Dec. 16, 2015

Dec. 16, 2015

Module: website Branch: master Commit: 5e5deabdd03f7408aed453cba10b0536e0a0f8cc URL: http://source.winehq.org/git/website.git/?a=commit;h=5e5deabdd03f7408aed453… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Dec 16 15:11:35 2015 -0600 fix broken image, small tweaks Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/download.template | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 93e1e78..9105297 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -20,12 +20,13 @@ </a> </td> <td align="left" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/">CrossOver</a> - is a polished version of Wine provided by <a href="http://www.codeweavers.com">CodeWeavers</a>. + <a href="https://www.codeweavers.com/products/">CrossOver</a> + is a polished version of Wine provided by <a href="https://www.codeweavers.com">CodeWeavers</a>. CrossOver makes it easier to use Wine and CodeWeavers provides excellent technical support to its users. All purchases of CrossOver are used to directly fund the developers working on Wine. So CrossOver is both a great way to get - support in using Wine and to support the Wine Project. CodeWeavers provides fully functional - <a href="http://www.codeweavers.com/products/download_trial/">trial versions of CrossOver</a>. + support in using Wine and to support the Wine Project. + CodeWeavers provides fully functional + <a href="https://www.codeweavers.com/products">trial versions of CrossOver</a>. </td> </tr> </table> @@ -58,13 +59,14 @@ requested in exchange for hosting the Wine web site. <tr bgcolor="#ffffff"> <td align="center"></td> - <td align="center">These packages are built and supported by WineHQ. Please report any problems with them in <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. + <td align="center">These packages are built and supported by WineHQ. + Please report any problems with them in <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. </td> <td></td> <tr bgcolor="#ffffff"> <td align="center"> - <img src="{$root}/winehq_logo_glass_sm.png" alt="WineHQ" border="0"></a> + <img src="{$root}/images/winehq_logo_glass_sm.png" alt="WineHQ" border="0"></a> </td> <td> <a href="http://wiki.winehq.org/Ubuntu">Ubuntu</a> @@ -89,7 +91,8 @@ requested in exchange for hosting the Wine web site. <tr bgcolor="#ffffff"> <td align="center"></td> - <td align="center">These packages are built and supported by the distros. Please report any problems with them to the package maintainer. + <td align="center">These packages are built and supported by the distros. + Please report any problems with them to the package maintainer. </td> <td></td> <tr bgcolor="#ffffff">

1 0

Nikolay Sivov : gdi32/tests: Some tests for GetICMProfile().
by Alexandre Julliard Dec. 15, 2015

Dec. 15, 2015

Module: wine Branch: master Commit: f0223182af1a72720a228b827f5b1559fb12e216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0223182af1a72720a228b827… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 14 19:39:40 2015 +0300 gdi32/tests: Some tests for GetICMProfile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/icm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 4afae6b..764d0d2 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -50,6 +50,13 @@ static void test_GetICMProfileA( HDC dc ) size = MAX_PATH; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); + ok( size > 0, "got %u\n", size ); + + size = 0; + ret = GetICMProfileA( dc, &size, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); +todo_wine + ok( size > 0, "got %u\n", size ); size = MAX_PATH; ret = GetICMProfileA( NULL, &size, filename ); @@ -109,6 +116,11 @@ static void test_GetICMProfileW( HDC dc ) ok( !ret, "GetICMProfileW succeeded\n" ); size = 0; + ret = GetICMProfileW( dc, &size, NULL ); + ok( !ret, "GetICMProfileW succeeded\n" ); + ok( size > 0, "got %u\n", size ); + + size = 0; SetLastError(0xdeadbeef); ret = GetICMProfileW( dc, &size, filename ); error = GetLastError();

1 0