December 2007 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implement cloneNode.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 86af5b9754acddbf5412b2bb4f153469c501b8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86af5b9754acddbf5412b2bb4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 3 08:17:48 2007 +1100 msxml3: Implement cloneNode. --- dlls/msxml3/node.c | 32 ++++++++++- dlls/msxml3/tests/domdoc.c | 127 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e52718e..63f3ad5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -519,8 +519,36 @@ static HRESULT WINAPI xmlnode_cloneNode( VARIANT_BOOL deep, IXMLDOMNode** cloneRoot) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + xmlNodePtr pClone = NULL; + IXMLDOMNode *pNode = NULL; + + TRACE("%p (%d)\n", This, deep); + + if(!cloneRoot) + return E_INVALIDARG; + + pClone = xmlCopyNode(This->node, deep ? 1 : 2); + if(pClone) + { + pClone->doc = This->node->doc; + + pNode = create_node(pClone); + if(!pNode) + { + ERR("Copy failed\n"); + return E_FAIL; + } + + *cloneRoot = pNode; + } + else + { + ERR("Copy failed\n"); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI xmlnode_get_nodeTypeString( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 937e2fd..dd48824 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1594,6 +1594,132 @@ static void test_XPath(void) free_bstrs(); } +static void test_cloneNode(void ) +{ + IXMLDOMDocument *doc = NULL; + VARIANT_BOOL b; + IXMLDOMNodeList *pList; + IXMLDOMNamedNodeMap *mapAttr; + long nLength = 0, nLength1 = 0; + long nAttrCnt = 0, nAttrCnt1 = 0; + IXMLDOMNode *node; + IXMLDOMNode *node_clone; + HRESULT r; + BSTR str; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + ole_check(IXMLDOMDocument_loadXML(doc, str, &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString(str); + + if(!b) + return; + + r = IXMLDOMNode_selectSingleNode(doc, _bstr_("lc/pr"), &node); + ok( r == S_OK, "ret %08x\n", r ); + ok( node != NULL, "node %p\n", node ); + + if(!node) + { + IXMLDOMDocument_Release(doc); + return; + } + + /* Check invalid parameter */ + r = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + /* All Children */ + r = IXMLDOMNode_cloneNode(node, VARIANT_TRUE, &node_clone); + ok( r == S_OK, "ret %08x\n", r ); + ok( node_clone != NULL, "node %p\n", node ); + + if(!node_clone) + { + IXMLDOMDocument_Release(doc); + IXMLDOMNode_Release(node); + return; + } + + r = IXMLDOMNode_get_childNodes(node, &pList); + ok( r == S_OK, "ret %08x\n", r ); + if (pList) + { + IXMLDOMNodeList_get_length(pList, &nLength); + IXMLDOMNodeList_Release(pList); + } + + r = IXMLDOMNode_get_attributes(node, &mapAttr); + ok( r == S_OK, "ret %08x\n", r ); + if(mapAttr) + { + IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt); + IXMLDOMNamedNodeMap_Release(mapAttr); + } + + r = IXMLDOMNode_get_childNodes(node_clone, &pList); + ok( r == S_OK, "ret %08x\n", r ); + if (pList) + { + IXMLDOMNodeList_get_length(pList, &nLength1); + IXMLDOMNodeList_Release(pList); + } + + r = IXMLDOMNode_get_attributes(node_clone, &mapAttr); + ok( r == S_OK, "ret %08x\n", r ); + if(mapAttr) + { + IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt1); + IXMLDOMNamedNodeMap_Release(mapAttr); + } + + ok(nLength == nLength1, "wrong Child count (%ld, %ld)\n", nLength, nLength1); + ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%ld, %ld)\n", nAttrCnt, nAttrCnt1); + IXMLDOMNode_Release(node_clone); + + /* No Children */ + r = IXMLDOMNode_cloneNode(node, VARIANT_FALSE, &node_clone); + ok( r == S_OK, "ret %08x\n", r ); + ok( node_clone != NULL, "node %p\n", node ); + + if(!node_clone) + { + IXMLDOMDocument_Release(doc); + IXMLDOMNode_Release(node); + return; + } + + r = IXMLDOMNode_get_childNodes(node_clone, &pList); + ok( r == S_OK, "ret %08x\n", r ); + if (pList) + { + IXMLDOMNodeList_get_length(pList, &nLength1); + ok( nLength1 == 0, "Length should be 0 (%ld)\n", nLength1); + IXMLDOMNodeList_Release(pList); + } + + r = IXMLDOMNode_get_attributes(node_clone, &mapAttr); + ok( r == S_OK, "ret %08x\n", r ); + if(mapAttr) + { + IXMLDOMNamedNodeMap_get_length(mapAttr, &nAttrCnt1); + ok( nAttrCnt1 == 3, "Attribute count should be 3 (%ld)\n", nAttrCnt1); + IXMLDOMNamedNodeMap_Release(mapAttr); + } + + ok(nLength != nLength1, "wrong Child count (%ld, %ld)\n", nLength, nLength1); + ok(nAttrCnt == nAttrCnt1, "wrong Attribute count (%ld, %ld)\n", nAttrCnt, nAttrCnt1); + IXMLDOMNode_Release(node_clone); + + + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT r; @@ -1612,6 +1738,7 @@ START_TEST(domdoc) test_XMLHTTP(); test_IXMLDOMDocument2(); test_XPath(); + test_cloneNode(); CoUninitialize(); }

1 0

Alex Villacís Lasso : riched20: WM_GETTEXTLENGTH should include CRLF conversions in returned count.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: f945f16de201dbd834da10701025665bfa8f05ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f945f16de201dbd834da10701… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 6 13:50:22 2007 -0500 riched20: WM_GETTEXTLENGTH should include CRLF conversions in returned count. --- dlls/riched20/editor.c | 8 +++++++- dlls/riched20/tests/editor.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1ffb1ea..d30ba9d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1996,7 +1996,13 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, return 0; } case WM_GETTEXTLENGTH: - return ME_GetTextLength(editor); + { + GETTEXTLENGTHEX how; + + how.flags = GTL_CLOSE | GTL_USECRLF | GTL_NUMCHARS; + how.codepage = unicode ? 1200 : CP_ACP; + return ME_GetTextLengthEx(editor, &how); + } case EM_GETTEXTLENGTHEX: return ME_GetTextLengthEx(editor, (GETTEXTLENGTHEX *)wParam); case WM_GETTEXT: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5512017..c3d09bf 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -671,6 +671,12 @@ static void test_WM_GETTEXT(void) ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + /* Test for returned value of WM_GETTEXTLENGTH */ + result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == strlen(text), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, strlen(text)); + /* Test for behavior in overflow case */ memset(buffer, 0, 1024); result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text), (LPARAM)buffer); @@ -689,6 +695,12 @@ static void test_WM_GETTEXT(void) ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + /* Test for returned value of WM_GETTEXTLENGTH */ + result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + ok(result == strlen(text2_after), + "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", + result, strlen(text2_after)); + /* Test for behavior of CRLF conversion in case of overflow */ memset(buffer, 0, 1024); result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text2), (LPARAM)buffer);

1 0

Andrew Talbot : devenum: Remove unneeded cast.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: b8e10c75fd6b5aad580854f33e38dd225bf398fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e10c75fd6b5aad580854f33… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 20:58:39 2007 +0000 devenum: Remove unneeded cast. --- dlls/devenum/createdevenum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 824a3df..11efca2 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -459,7 +459,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 }; VARIANT var; V_VT(&var) = VT_I4; - V_UNION(&var, ulVal) = (ULONG)i; + V_UNION(&var, ulVal) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); if (SUCCEEDED(res)) res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var);

1 0

Alex Villacís Lasso : riched20: EM_GETTEXTLENGTHEX must not count last paragraph break if GTL_USECRLF.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 3b636b58ba6917ca3f1358f4bc363fdd8df6c94c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b636b58ba6917ca3f1358f4b… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 6 13:41:28 2007 -0500 riched20: EM_GETTEXTLENGTHEX must not count last paragraph break if GTL_USECRLF. --- dlls/riched20/caret.c | 2 +- dlls/riched20/tests/editor.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3bc5b5e..af52e9f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -59,7 +59,7 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) length = ME_GetTextLength(editor); if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_MULTILINE) && (how->flags & GTL_USECRLF)) - length += editor->nParagraphs; + length += editor->nParagraphs - 1; if (how->flags & GTL_NUMBYTES) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 83fe42d..5512017 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2504,8 +2504,10 @@ static void test_EM_GETTEXTLENGTHEX(void) HWND hwnd; GETTEXTLENGTHEX gtl; int ret; + const char * base_string = "base string"; const char * test_string = "a\nb\n\n\r\n"; const char * test_string_after = "a"; + const char * test_string_2 = "a\rtest\rstring"; char buffer[64] = {0}; /* single line */ @@ -2523,6 +2525,18 @@ static void test_EM_GETTEXTLENGTHEX(void) ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); ok(ret == 0, "ret %d\n",ret); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) base_string); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(base_string), "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(base_string), "ret %d\n",ret); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string); gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; @@ -2549,19 +2563,43 @@ static void test_EM_GETTEXTLENGTHEX(void) gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; gtl.codepage = CP_ACP; ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - todo_wine ok(ret == 0, "ret %d\n",ret); + ok(ret == 0, "ret %d\n",ret); gtl.flags = GTL_NUMCHARS | GTL_PRECISE; gtl.codepage = CP_ACP; ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); ok(ret == 0, "ret %d\n",ret); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) base_string); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(base_string), "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(base_string), "ret %d\n",ret); + + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string_2); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(test_string_2) + 2, "ret %d\n",ret); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = CP_ACP; + ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); + ok(ret == strlen(test_string_2), "ret %d\n",ret); + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string); gtl.flags = GTL_NUMCHARS | GTL_PRECISE | GTL_USECRLF; gtl.codepage = CP_ACP; ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); - todo_wine ok(ret == 10, "ret %d\n",ret); + ok(ret == 10, "ret %d\n",ret); gtl.flags = GTL_NUMCHARS | GTL_PRECISE; gtl.codepage = CP_ACP;

1 0

Andrew Talbot : dinput: Remove unneeded casts.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 39b99d47adab89d687dcebbcdd1471b34dfa2b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b99d47adab89d687dcebbcd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 20:58:42 2007 +0000 dinput: Remove unneeded casts. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 68f61ec..5127aa9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -319,7 +319,7 @@ void fill_DataFormat(void *out, const void *in, const DataFormat *df) { case 4: TRACE("Copying (i) to %d default value %d\n", df->dt[i].offset_out, df->dt[i].value); - *((int *) (out_c + df->dt[i].offset_out)) = (int) df->dt[i].value; + *((int *) (out_c + df->dt[i].offset_out)) = df->dt[i].value; break; default: diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 15f3cda..2e12bc1 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -55,17 +55,17 @@ static const IDirectInput8WVtbl ddi8wvt; static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface ) { - return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl7w ); + return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl7w ); } static inline IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface ) { - return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8a ); + return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8a ); } static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface ) { - return (IDirectInputImpl *)CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8w ); + return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8w ); } static inline IDirectInput7W *IDirectInput7W_from_impl( IDirectInputImpl *iface )

1 0

Alexander Nicolaysen Sørnes : user32: A few more colour changes to match modern Windows.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 82d937de8f0f3d486800e6ec7b49eb928c08f8e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d937de8f0f3d486800e6ec7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 6 17:00:29 2007 +0100 user32: A few more colour changes to match modern Windows. Thanks to Bamm Gabriana for the info. --- dlls/user32/sysparams.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2bf8127..dd44639 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -100,7 +100,7 @@ static const char * const DefSysColors[] = "ActiveBorder", "212 208 200", /* COLOR_ACTIVEBORDER */ "InactiveBorder", "212 208 200", /* COLOR_INACTIVEBORDER */ "AppWorkSpace", "128 128 128", /* COLOR_APPWORKSPACE */ - "Hilight", "0 0 128", /* COLOR_HIGHLIGHT */ + "Hilight", "10 36 106", /* COLOR_HIGHLIGHT */ "HilightText", "255 255 255", /* COLOR_HIGHLIGHTTEXT */ "ButtonFace", "212 208 200", /* COLOR_BTNFACE */ "ButtonShadow", "128 128 128", /* COLOR_BTNSHADOW */ @@ -112,11 +112,11 @@ static const char * const DefSysColors[] = "ButtonLight", "212 208 200", /* COLOR_3DLIGHT */ "InfoText", "0 0 0", /* COLOR_INFOTEXT */ "InfoWindow", "255 255 225", /* COLOR_INFOBK */ - "ButtonAlternateFace", "180 180 180", /* COLOR_ALTERNATEBTNFACE */ - "HotTrackingColor", "0 0 255", /* COLOR_HOTLIGHT */ + "ButtonAlternateFace", "181 181 181", /* COLOR_ALTERNATEBTNFACE */ + "HotTrackingColor", "0 0 128", /* COLOR_HOTLIGHT */ "GradientActiveTitle", "166 202 240", /* COLOR_GRADIENTACTIVECAPTION */ "GradientInactiveTitle", "192 192 192", /* COLOR_GRADIENTINACTIVECAPTION */ - "MenuHilight", "0 0 0", /* COLOR_MENUHILIGHT */ + "MenuHilight", "10 36 106", /* COLOR_MENUHILIGHT */ "MenuBar", "212 208 200" /* COLOR_MENUBAR */ };

1 0

Alex Villacís Lasso : riched20: WM_GETTEXT should return 0 on overflow but fill buffer anyway.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 99f0dc4ff4e875a376967a15488973a03d5a060d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0dc4ff4e875a376967a154… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 6 10:50:48 2007 -0500 riched20: WM_GETTEXT should return 0 on overflow but fill buffer anyway. --- dlls/riched20/editor.c | 25 +++++++++++++++++++++++-- dlls/riched20/tests/editor.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5a78fe4..1ffb1ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2002,13 +2002,34 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, case WM_GETTEXT: { GETTEXTEX ex; + LRESULT rc; + LPSTR bufferA = NULL; + LPWSTR bufferW = NULL; - ex.cb = wParam; + if (unicode) + bufferW = richedit_alloc((wParam + 2) * sizeof(WCHAR)); + else bufferA = richedit_alloc(wParam + 2); + + ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2); ex.flags = GT_USECRLF; ex.codepage = unicode ? 1200 : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefaultChar = NULL; - return RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, lParam, unicode); + rc = RichEditWndProc_common(hWnd, EM_GETTEXTEX, (WPARAM)&ex, unicode ? (LPARAM)bufferW : (LPARAM)bufferA, unicode); + + if (unicode) + { + memcpy((LPWSTR)lParam, bufferW, wParam); + if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0; + } + else + { + memcpy((LPSTR)lParam, bufferA, wParam); + if (strlen(bufferA) >= wParam) rc = 0; + } + if (bufferA != NULL) richedit_free(bufferA); + if (bufferW != NULL) richedit_free(bufferW); + return rc; } case EM_GETTEXTEX: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6877a10..83fe42d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -656,14 +656,48 @@ static void test_WM_GETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); static const char text[] = "Hello. My name is RichEdit!"; + static const char text2[] = "Hello. My name is RichEdit!\r"; + static const char text2_after[] = "Hello. My name is RichEdit!\r\n"; char buffer[1024] = {0}; int result; + /* Baseline test with normal-sized buffer */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(result == strlen(buffer), + "WM_GETTEXT returned %d, expected %d\n", result, strlen(buffer)); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,text); ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + + /* Test for behavior in overflow case */ + memset(buffer, 0, 1024); + result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text), (LPARAM)buffer); + ok(result == 0, + "WM_GETTEXT returned %d, expected 0\n", result); + result = strcmp(buffer,text); + ok(result == 0, + "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + + /* Baseline test with normal-sized buffer and carriage return */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(result == strlen(buffer), + "WM_GETTEXT returned %d, expected %d\n", result, strlen(buffer)); + result = strcmp(buffer,text2_after); + ok(result == 0, + "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + + /* Test for behavior of CRLF conversion in case of overflow */ + memset(buffer, 0, 1024); + result = SendMessage(hwndRichEdit, WM_GETTEXT, strlen(text2), (LPARAM)buffer); + ok(result == 0, + "WM_GETTEXT returned %d, expected 0\n", result); + result = strcmp(buffer,text2); + ok(result == 0, + "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + DestroyWindow(hwndRichEdit); }

1 0

Andrew Talbot : cabinet: Remove unneeded casts.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 81d964824b46deb525c8fc7fc11bb93d084708e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d964824b46deb525c8fc7fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 20:58:36 2007 +0000 cabinet: Remove unneeded casts. --- dlls/cabinet/cabinet.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index f566124..e786c1f 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -403,11 +403,11 @@ typedef struct { #define FDI_INT_MAGIC 0xfdfdfd05 #define REALLY_IS_FCI(hfci) ( \ - (((void *) hfci) != NULL) && \ + ((hfci) != NULL) && \ (PFCI_INT(hfci)->FCI_Intmagic == FCI_INT_MAGIC) ) #define REALLY_IS_FDI(hfdi) ( \ - (((void *) hfdi) != NULL) && \ + ((hfdi) != NULL) && \ (PFDI_INT(hfdi)->FDI_Intmagic == FDI_INT_MAGIC) ) /*

1 0

James Hawkins : msi: Add tests for MsiGetProductCode.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 8090dbad93293db72816ffafc260146f6d22eb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8090dbad93293db72816ffafc… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 6 11:33:08 2007 -0600 msi: Add tests for MsiGetProductCode. --- dlls/msi/tests/msi.c | 320 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 320 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8090dbad93293db72816f…

1 0

Alex Villacís Lasso : riched20: EM_GETTEXTEX with GT_USECRLF should not leave a single CR when running out of space .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 4545f1944e24d0abca16f6308b02cf2dd80c85f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4545f1944e24d0abca16f6308… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 6 10:47:59 2007 -0500 riched20: EM_GETTEXTEX with GT_USECRLF should not leave a single CR when running out of space. --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/tests/editor.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b1444c0..5a78fe4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2804,7 +2804,10 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, in if (!ME_FindItemFwd(item, diRun)) /* No '\r' is appended to the last paragraph. */ nLen = 0; - else { + else if (bCRLF && nChars == 1) { + nLen = 0; + nChars = 0; + } else { *buffer = '\r'; if (bCRLF) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5fb5975..6877a10 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1116,6 +1116,33 @@ static void test_EM_SETTEXTEX(void) ok(strcmp((const char *)buf, TestItem2_after) == 0, "WM_GETTEXT did *not* see \\r converted to \\r\\n pairs.\n"); + /* Baseline test for just-enough buffer space for string */ + getText.cb = (lstrlenW(TestItem2) + 1) * sizeof(WCHAR); + getText.codepage = 1200; /* no constant for unicode */ + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; + memset(buf, 0, MAX_BUF_LEN); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem2) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + /* When there is enough space for one character, but not both, of the CRLF + pair at the end of the string, the CR is not copied at all. That is, + the caller must not see CRLF pairs truncated to CR at the end of the + string. + */ + getText.cb = (lstrlenW(TestItem2) + 1) * sizeof(WCHAR); + getText.codepage = 1200; /* no constant for unicode */ + getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; + memset(buf, 0, MAX_BUF_LEN); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem1) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + /* \r\n pairs get changed into \r */ setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */

1 0