July 2008 - Wine-Commits - list.winehq.org

Piotr Caban : msxml3: Added support for more arguments in ISAXXMLReader_parse.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: fc825af3ee8d837e486e3226b3f991077a331ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc825af3ee8d837e486e3226b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:38:58 2008 +0200 msxml3: Added support for more arguments in ISAXXMLReader_parse. Parsing is not working when XMLDOMDocument is passed. It's because IXMLDOMDocument_get_xml returns incomplete data. --- dlls/msxml3/saxreader.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d0afcf5..9ea2aa2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1071,26 +1071,50 @@ static HRESULT WINAPI isaxxmlreader_parse( case VT_UNKNOWN: case VT_DISPATCH: { IPersistStream *persistStream; - IStream *stream; + IStream *stream = NULL; IXMLDOMDocument *xmlDoc; if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IPersistStream, (void**)&persistStream) == S_OK) { + hr = IPersistStream_Save(persistStream, stream, TRUE); IPersistStream_Release(persistStream); - hr = E_NOTIMPL; - break; + if(hr != S_OK) break; } - if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), - &IID_IStream, (void**)&stream) == S_OK) + if(stream || IUnknown_QueryInterface(V_UNKNOWN(&varInput), + &IID_IStream, (void**)&stream) == S_OK) { + STATSTG dataInfo; + ULONG dataRead; + + while(1) + { + hr = IStream_Stat(stream, &dataInfo, STATFLAG_NONAME); + if(hr == E_PENDING) continue; + break; + } + data = HeapAlloc(GetProcessHeap(), 0, + dataInfo.cbSize.QuadPart+1); + while(1) + { + hr = IStream_Read(stream, data, + dataInfo.cbSize.QuadPart, &dataRead); + if(hr == E_PENDING) continue; + break; + } + data[dataInfo.cbSize.QuadPart] = '\0'; + xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); IStream_Release(stream); - hr = E_NOTIMPL; break; } if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IXMLDOMDocument, (void**)&xmlDoc) == S_OK) { + BSTR bstrData; + + IXMLDOMDocument_get_xml(xmlDoc, &bstrData); + data = xmlChar_from_wchar(bstrData); + xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); IXMLDOMDocument_Release(xmlDoc); hr = E_NOTIMPL; break;

1 0

Piotr Caban : msxml3: Reorganize ISAXXMLReader_parse function.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: 194bae3b60a2c4bb8ef4831a36b146a3b67e5455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194bae3b60a2c4bb8ef4831a3… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 23 16:38:50 2008 +0200 msxml3: Reorganize ISAXXMLReader_parse function. --- dlls/msxml3/saxreader.c | 74 +++++++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f0d1ef5..d0afcf5 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1039,52 +1039,72 @@ static HRESULT WINAPI isaxxmlreader_parse( xmlChar *data = NULL; HRESULT hr; - FIXME("(%p) semi-stub\n", This); + TRACE("(%p)\n", This); hr = SAXLocator_create(This, &locator); if(FAILED(hr)) return E_FAIL; + locator->pParserCtxt = xmlNewParserCtxt(); + if(!locator->pParserCtxt) + { + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return E_FAIL; + } + + locator->pParserCtxt->sax = &locator->saxreader->sax; + locator->pParserCtxt->userData = locator; + hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: - locator->pParserCtxt = xmlNewParserCtxt(); - if(!locator->pParserCtxt) - { - hr = E_FAIL; - break; - } data = xmlChar_from_wchar(V_BSTR(&varInput)); xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); - - locator->pParserCtxt->sax = &locator->saxreader->sax; - locator->pParserCtxt->userData = locator; - - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; - else hr = locator->ret; break; case VT_ARRAY|VT_UI1: - locator->pParserCtxt = xmlNewParserCtxt(); - if(!locator->pParserCtxt) - { - hr = E_FAIL; - break; - } - hr = SafeArrayAccessData(V_ARRAY(&varInput), (void**)&data); if(hr != S_OK) break; xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); SafeArrayUnaccessData(V_ARRAY(&varInput)); - - locator->pParserCtxt->sax = &locator->saxreader->sax; - locator->pParserCtxt->userData = locator; - - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; - else hr = locator->ret; break; + case VT_UNKNOWN: + case VT_DISPATCH: { + IPersistStream *persistStream; + IStream *stream; + IXMLDOMDocument *xmlDoc; + + if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), + &IID_IPersistStream, (void**)&persistStream) == S_OK) + { + IPersistStream_Release(persistStream); + hr = E_NOTIMPL; + break; + } + if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), + &IID_IStream, (void**)&stream) == S_OK) + { + IStream_Release(stream); + hr = E_NOTIMPL; + break; + } + if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), + &IID_IXMLDOMDocument, (void**)&xmlDoc) == S_OK) + { + IXMLDOMDocument_Release(xmlDoc); + hr = E_NOTIMPL; + break; + } + } default: - hr = E_NOTIMPL; + WARN("vt %d not implemented\n", V_VT(&varInput)); + hr = E_INVALIDARG; + } + + if(hr == S_OK) + { + if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; + else hr = locator->ret; } if(locator->pParserCtxt)

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_appCodeName implementation.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: 2609e45c31263253d3e3c7d36f996971a236a25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2609e45c31263253d3e3c7d36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 13:17:48 2008 +0200 mshtml: Added IOmNavigator::get_appCodeName implementation. --- dlls/mshtml/omnavigator.c | 9 +++++++-- dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a579333..9c285b0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -127,8 +127,13 @@ static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMembe static HRESULT WINAPI OmNavigator_get_appCodeName(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR mozillaW[] = {'M','o','z','i','l','l','a',0}; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(mozillaW); + return S_OK; } static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index abaff25..cb15187 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1799,6 +1799,7 @@ static void test_navigator(IHTMLDocument2 *doc) IHTMLWindow2 *window; IOmNavigator *navigator, *navigator2; ULONG ref; + BSTR bstr; HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); @@ -1815,6 +1816,12 @@ static void test_navigator(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); IOmNavigator_Release(navigator2); + + 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", dbgstr_w(bstr)); + SysFreeString(bstr); + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::[get|put]_title tests.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: e629e049dbb22d114a863db1484f8e8dfc23d2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e629e049dbb22d114a863db14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 13:17:21 2008 +0200 mshtml: Added IHTMLDocument2::[get|put]_title tests. --- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2c25870..abaff25 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1361,6 +1361,30 @@ static void _test_node_remove_child(unsigned line, IUnknown *unk, IHTMLDOMNode * IHTMLDOMNode_Release(new_node); } +#define test_doc_title(d,t) _test_doc_title(__LINE__,d,t) +static void _test_doc_title(unsigned line, IHTMLDocument2 *doc, const char *extitle) +{ + BSTR title = NULL; + HRESULT hres; + + hres = IHTMLDocument2_get_title(doc, &title); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + ok_(__FILE__,line) (!strcmp_wa(title, extitle), "unexpected title %s\n", dbgstr_w(title)); + SysFreeString(title); +} + +#define test_doc_set_title(d,t) _test_doc_set_title(__LINE__,d,t) +static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const char *title) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(title); + hres = IHTMLDocument2_put_title(doc, tmp); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + SysFreeString(tmp); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1978,6 +2002,7 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLStyleSheetsCollection_Release(stylesheetcol); test_default_selection(doc); + test_doc_title(doc, ""); } static void test_stylesheet(IDispatch *disp) @@ -2332,6 +2357,10 @@ static void test_elems(IHTMLDocument2 *doc) test_stylesheets(doc); test_create_option_elem(doc); + + test_doc_title(doc, "test"); + test_doc_set_title(doc, "test title"); + test_doc_title(doc, "test title"); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::get_title implementation.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: 8e6dbe750a316a66738cd392e4365af5f0d86a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6dbe750a316a66738cd392e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 13:16:57 2008 +0200 mshtml: Added IHTMLDocument2::get_title implementation. Based on patch by Ivan Sinitsin. --- dlls/mshtml/htmldoc.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 40099d3..b1f063f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -413,8 +413,38 @@ static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_title(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMDocument *nsdoc; + const PRUnichar *ret; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nscontainer) + return E_FAIL; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + + nsAString_Init(&nsstr, NULL); + + nsres = nsIDOMHTMLDocument_GetTitle(nshtmldoc, &nsstr); + nsIDOMHTMLDocument_Release(nshtmldoc); + if (NS_FAILED(nsres)) + ERR("GetTitle failed: %08x\n", nsres); + + nsAString_GetData(&nsstr, &ret); + *p = SysAllocString(ret); + nsAString_Finish(&nsstr); + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_scripts(IHTMLDocument2 *iface, IHTMLElementCollection **p)

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_title implementation.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: 80f33889eabadd9d9d3423e23bbf1d86c297d3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f33889eabadd9d9d3423e23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 23 13:16:39 2008 +0200 mshtml: Added IHTMLDocument2::put_title implementation. Based on patch by Ivan Sinitsin. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b77d69e..40099d3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -381,8 +381,33 @@ static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMHTMLDocument *nshtmldoc; + nsIDOMDocument *nsdoc; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nscontainer) + return E_FAIL; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres) || !nsdoc) { + ERR("GetDocument failed: %08x\n", nsres); + return E_FAIL; + } + + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); + nsIDOMDocument_Release(nsdoc); + + nsAString_Init(&nsstr, v); + nsres = nsIDOMHTMLDocument_SetTitle(nshtmldoc, &nsstr); + nsIDOMHTMLDocument_Release(nshtmldoc); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + ERR("SetTitle failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_title(IHTMLDocument2 *iface, BSTR *p)

1 0

Hans Leidekker : usp10: Use a valid string analysis when testing ScriptXtoCP and ScriptCPtoX.
by Alexandre Julliard July 24, 2008

July 24, 2008

Module: wine Branch: master Commit: e691de4a1af7ea3ea6c4ee39adf1914c0176ccca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e691de4a1af7ea3ea6c4ee39a… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 23 13:03:06 2008 +0200 usp10: Use a valid string analysis when testing ScriptXtoCP and ScriptCPtoX. --- dlls/usp10/tests/usp10.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0705904..67a4ea9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -615,22 +615,26 @@ static void test_ScriptXtoX(void) * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * ****************************************************************************************/ { + static const WCHAR test[] = {'t', 'e', 's', 't',0}; + SCRIPT_ITEM items[2]; int iX, iCP; int cChars; int cGlyphs; WORD pwLogClust[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; SCRIPT_VISATTR psva[10]; int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; - SCRIPT_ANALYSIS psa; int piCP, piX; int piTrailing; BOOL fTrailing; HRESULT hr; + hr = ScriptItemize(test, lstrlenW(test), sizeof(items)/sizeof(items[0]), NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + iX = -1; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -640,7 +644,7 @@ static void test_ScriptXtoX(void) iX = 1954; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) /* win2k3 */ ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -650,7 +654,7 @@ static void test_ScriptXtoX(void) iX = 779; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -660,7 +664,7 @@ static void test_ScriptXtoX(void) iX = 780; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -670,7 +674,7 @@ static void test_ScriptXtoX(void) iX = 868; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 4 || piCP == -1, /* win2k3 */ @@ -679,7 +683,7 @@ static void test_ScriptXtoX(void) iX = 0; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0 || piCP == 10, /* win2k3 */ @@ -688,14 +692,14 @@ static void test_ScriptXtoX(void) iX = 195; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); iX = 196; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 1 || piCP == 0, /* win2k3 */ @@ -705,7 +709,7 @@ static void test_ScriptXtoX(void) fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 976 || piX == 100, /* win2k3 */ @@ -715,7 +719,7 @@ static void test_ScriptXtoX(void) fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -725,7 +729,7 @@ static void test_ScriptXtoX(void) fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -735,7 +739,7 @@ static void test_ScriptXtoX(void) fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */ @@ -745,7 +749,7 @@ static void test_ScriptXtoX(void) fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */

1 0

Alexander Nicolaysen Sørnes : version: Only allow submitter to edit if it hasn't been accepted yet
by Chris Morgan July 23, 2008

July 23, 2008

Module: appdb Branch: master Commit: 1ab8145d021e4387d9acaecf6dc54c973df16de6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1ab8145d021e4387d9acaecf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 22 14:07:32 2008 +0200 version: Only allow submitter to edit if it hasn't been accepted yet --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index 3526012..b6ed1bf 100644 --- a/include/version.php +++ b/include/version.php @@ -1493,7 +1493,7 @@ class version { if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) return TRUE; - if($this->iSubmitterId == $_SESSION['current']->iUserId) + if($this->sState != 'accepted' && $this->iSubmitterId == $_SESSION['current']->iUserId) return TRUE; return FALSE;

1 0

Reece Dunn : crypt32/tests: Be more verbose on the failing base64 tests on Vista to help locate the failures .
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 2f445e4e4a74bda3034d993226f05073e777eb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f445e4e4a74bda3034d99322… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Jul 22 22:25:30 2008 +0100 crypt32/tests: Be more verbose on the failing base64 tests on Vista to help locate the failures. --- dlls/crypt32/tests/base64.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 4dd7c5f..965b3f8 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -280,7 +280,7 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, ok(ret, "CryptStringToBinaryA failed: %d\n", GetLastError()); else ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + "Expected !ret and last error ERROR_INVALID_DATA, got ret=%d, error=%d\n", ret, GetLastError()); if (ret) { buf = HeapAlloc(GetProcessHeap(), 0, bufLen); @@ -291,8 +291,8 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, ret = pCryptStringToBinaryA(str, 0, useFormat, buf, &bufLen, &skipped, &usedFormat); ok(skipped == strlen(garbage), - "Expected %d characters skipped, got %d\n", lstrlenA(garbage), - skipped); + "Expected %d characters of \"%s\" skipped when trying format %08x, got %d (used format is %08x)\n", + lstrlenA(garbage), str, useFormat, skipped, usedFormat); HeapFree(GetProcessHeap(), 0, buf); } }

1 0

Andrew Talbot : advapi32: Sign-compare warnings fix.
by Alexandre Julliard July 23, 2008

July 23, 2008

Module: wine Branch: master Commit: 414cdc04755ef85730ed0ee4da93f050e44dcc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=414cdc04755ef85730ed0ee4d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 21 22:12:04 2008 +0100 advapi32: Sign-compare warnings fix. --- dlls/advapi32/registry.c | 8 ++++---- dlls/advapi32/security.c | 23 +++++++++++++---------- dlls/advapi32/service.c | 3 --- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 089cf3e..55607c2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -470,8 +470,8 @@ LSTATUS WINAPI RegEnumKeyExW( HKEY hkey, DWORD index, LPWSTR name, LPDWORD name_ KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)buffer; DWORD total_size; - TRACE( "(%p,%d,%p,%p(%d),%p,%p,%p,%p)\n", hkey, index, name, name_len, - name_len ? *name_len : -1, reserved, class, class_len, ft ); + TRACE( "(%p,%d,%p,%p(%u),%p,%p,%p,%p)\n", hkey, index, name, name_len, + name_len ? *name_len : 0, reserved, class, class_len, ft ); if (reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; @@ -534,8 +534,8 @@ LSTATUS WINAPI RegEnumKeyExA( HKEY hkey, DWORD index, LPSTR name, LPDWORD name_l KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)buffer; DWORD total_size; - TRACE( "(%p,%d,%p,%p(%d),%p,%p,%p,%p)\n", hkey, index, name, name_len, - name_len ? *name_len : -1, reserved, class, class_len, ft ); + TRACE( "(%p,%d,%p,%p(%u),%p,%p,%p,%p)\n", hkey, index, name, name_len, + name_len ? *name_len : 0, reserved, class, class_len, ft ); if (reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3423cbe..95b7a7b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2119,28 +2119,31 @@ LookupAccountSidW( } if (dm) { + DWORD ac_len = lstrlenW(ac); + DWORD dm_len = lstrlenW(dm); BOOL status = TRUE; - if (*accountSize > lstrlenW(ac)) { + + if (*accountSize > ac_len) { if (account) lstrcpyW(account, ac); } - if (*domainSize > lstrlenW(dm)) { + if (*domainSize > dm_len) { if (domain) lstrcpyW(domain, dm); } - if (((*accountSize != 0) && (*accountSize < strlenW(ac))) || - ((*domainSize != 0) && (*domainSize < strlenW(dm)))) { + if (((*accountSize != 0) && (*accountSize < ac_len)) || + ((*domainSize != 0) && (*domainSize < dm_len))) { SetLastError(ERROR_INSUFFICIENT_BUFFER); status = FALSE; } if (*domainSize) - *domainSize = strlenW(dm); + *domainSize = dm_len; else - *domainSize = strlenW(dm) + 1; + *domainSize = dm_len + 1; if (*accountSize) - *accountSize = strlenW(ac); + *accountSize = ac_len; else - *accountSize = strlenW(ac) + 1; + *accountSize = ac_len + 1; *name_use = use; HeapFree(GetProcessHeap(), 0, computer_name); return status; @@ -4050,7 +4053,7 @@ static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) { - int i; + size_t i; for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) { if (WellKnownSids[i].wstr[0] && EqualSid(psid, (PSID)&(WellKnownSids[i].Sid.Revision))) @@ -4102,7 +4105,7 @@ static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) { static const WCHAR fmtW[] = {'0','x','%','x',0}; WCHAR buf[15]; - int i; + size_t i; if (mask == 0) return; diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c04eb8c..45666ab 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1599,9 +1599,6 @@ QueryServiceConfigW( SC_HANDLE hService, move_string_to_buffer(&bufpos, &lpServiceConfig->lpServiceStartName); move_string_to_buffer(&bufpos, &lpServiceConfig->lpDisplayName); - if (bufpos - (LPBYTE)lpServiceConfig > cbBufSize) - ERR("Buffer overflow!\n"); - TRACE("Image path = %s\n", debugstr_w(lpServiceConfig->lpBinaryPathName) ); TRACE("Group = %s\n", debugstr_w(lpServiceConfig->lpLoadOrderGroup) ); TRACE("Dependencies = %s\n", debugstr_w(lpServiceConfig->lpDependencies) );

1 0