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

Zhangrong Huang : secur32: Allow loading external schannel.dll.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: d42a601b52a17280ae2bf5501e857861f5458119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42a601b52a17280ae2bf5501… Author: Zhangrong Huang <hzhrong(a)gmail.com> Date: Wed Jul 2 23:18:49 2008 +0800 secur32: Allow loading external schannel.dll. --- dlls/secur32/schannel.c | 3 ++- dlls/secur32/secur32.c | 25 +++++++++++++++++++------ dlls/secur32/secur32_priv.h | 3 ++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 742cdb3..43b0f26 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -358,11 +358,12 @@ static const SecurityFunctionTableW schanTableW = { static const WCHAR schannelComment[] = { 'S','c','h','a','n','n','e','l',' ', 'S','e','c','u','r','i','t','y',' ','P','a','c','k','a','g','e',0 }; +static const WCHAR schannelDllName[] = { 's','c','h','a','n','n','e','l','.','d','l','l',0 }; void SECUR32_initSchannelSP(void) { SecureProvider *provider = SECUR32_addProvider(&schanTableA, &schanTableW, - NULL); + schannelDllName); if (provider) { diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 5eb4bcd..b9c4748 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -419,10 +419,10 @@ SecureProvider *SECUR32_addProvider(const SecurityFunctionTableA *fnTableA, if (fnTableA || fnTableW) { - ret->moduleName = NULL; + ret->moduleName = moduleName ? SECUR32_strdupW(moduleName) : NULL; _makeFnTableA(&ret->fnTableA, fnTableA, fnTableW); _makeFnTableW(&ret->fnTableW, fnTableA, fnTableW); - ret->loaded = TRUE; + ret->loaded = moduleName ? FALSE : TRUE; } else { @@ -505,9 +505,19 @@ static void _tryLoadProvider(PWSTR moduleName) if (pInitSecurityInterfaceW) fnTableW = pInitSecurityInterfaceW(); if (fnTableW && fnTableW->EnumerateSecurityPackagesW) - ret = fnTableW->EnumerateSecurityPackagesW(&toAdd, &infoW); + { + if (fnTableW != &securityFunctionTableW) + ret = fnTableW->EnumerateSecurityPackagesW(&toAdd, &infoW); + else + TRACE("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); + } else if (fnTableA && fnTableA->EnumerateSecurityPackagesA) - ret = fnTableA->EnumerateSecurityPackagesA(&toAdd, &infoA); + { + if (fnTableA != &securityFunctionTableA) + ret = fnTableA->EnumerateSecurityPackagesA(&toAdd, &infoA); + else + TRACE("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); + } if (ret == SEC_E_OK && toAdd > 0 && (infoW || infoA)) { SecureProvider *provider = SECUR32_addProvider(NULL, NULL, @@ -624,8 +634,11 @@ SecurePackage *SECUR32_findPackageW(PCWSTR packageName) fnTableA = pInitSecurityInterfaceA(); if (pInitSecurityInterfaceW) fnTableW = pInitSecurityInterfaceW(); - _makeFnTableA(&ret->provider->fnTableA, fnTableA, fnTableW); - _makeFnTableW(&ret->provider->fnTableW, fnTableA, fnTableW); + /* dont't update built-in SecurityFunctionTable */ + if (fnTableA != &securityFunctionTableA) + _makeFnTableA(&ret->provider->fnTableA, fnTableA, fnTableW); + if (fnTableW != &securityFunctionTableW) + _makeFnTableW(&ret->provider->fnTableW, fnTableA, fnTableW); ret->provider->loaded = TRUE; } else diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 8d5756d..6f9c1e7 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -89,7 +89,8 @@ typedef enum _sign_direction { } SignDirection; /* Allocates space for and initializes a new provider. If fnTableA or fnTableW - * is non-NULL, assumes the provider is built-in (and is thus already loaded.) + * is non-NULL, assumes the provider is built-in, and if moduleName is non-NULL, + * means must load the LSA/user mode functions tables from external SSP/AP module. * Otherwise moduleName must not be NULL. * Returns a pointer to the stored provider entry, for use adding packages. */

1 0

Zhangrong Huang : msxml3/test: Fix a typo in test node_to_string().
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 86a0643df8fa4ae1053578eb7ea2035056b0a51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a0643df8fa4ae1053578eb7… Author: Zhangrong Huang <hzhrong(a)gmail.com> Date: Thu Jul 3 00:18:48 2008 +0800 msxml3/test: Fix a typo in test node_to_string(). --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3817d8e..75cb605 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -332,7 +332,7 @@ static void node_to_string(IXMLDOMNode *node, char *buf) /* currently wine doesn't create a node for the <?xml ... ?>. To be able to test query * results we "fix" it */ if (r == S_OK) - ole_check(IXMLDOMNode_get_nodeType(node, &parent_type)); + ole_check(IXMLDOMNode_get_nodeType(new_node, &parent_type)); /* we need also to workaround the no document node problem - see below */ if (((r == S_FALSE && type != NODE_DOCUMENT) || parent_type == NODE_DOCUMENT) && type != NODE_PROCESSING_INSTRUCTION && pos==1) {

1 0

Alistair Leslie-Hughes : msxml3: Added tests to check for invalid arguments .
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 746cdb4a6d54bb628fb9b3c4cf5eacbab6c095ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=746cdb4a6d54bb628fb9b3c4c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 2 16:16:48 2008 +1000 msxml3: Added tests to check for invalid arguments. --- dlls/msxml3/tests/domdoc.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f3e8e0..3817d8e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1171,10 +1171,22 @@ todo_wine if (list) { + r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMNodeList_get_item(list, 0, NULL); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + + r = IXMLDOMNodeList_get_length(list, NULL); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + r = IXMLDOMNodeList_get_length( list, &count ); ok( r == S_OK, "get_length returns %08x\n", r ); ok( count == 4, "get_length got %ld\n", count ); + r = IXMLDOMNodeList_nextNode(list, NULL); + ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x", r); + r = IXMLDOMNodeList_nextNode( list, &node ); ok( r == S_OK, "nextNode returned wrong code\n"); } @@ -1582,6 +1594,7 @@ static void test_get_text(void) IXMLDOMNode *node, *node2, *node3; IXMLDOMNodeList *node_list; IXMLDOMNamedNodeMap *node_map; + long len; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -1599,6 +1612,22 @@ static void test_get_text(void) ok( r == S_OK, "ret %08x\n", r ); SysFreeString(str); + r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMNodeList_get_length( node_list, NULL ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + ok( len == 1, "expect 1 got %ld\n", len ); + + r = IXMLDOMNodeList_get_item( node_list, 0, NULL ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + + r = IXMLDOMNodeList_nextNode( node_list, NULL ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_item( node_list, 0, &node ); ok( r == S_OK, "ret %08x\n", r ); IXMLDOMNodeList_Release( node_list );

1 0

Alistair Leslie-Hughes : msxml3: Added checks for invalid arguments in nodelist.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 01bd1c17c89671a3226c6a450962ecc070ef3284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01bd1c17c89671a3226c6a450… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 2 16:16:05 2008 +1000 msxml3: Added checks for invalid arguments in nodelist. --- dlls/msxml3/nodelist.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 79bc710..c442775 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -66,6 +66,9 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + if(!ppvObject) + return E_INVALIDARG; + if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) @@ -203,7 +206,10 @@ static HRESULT WINAPI xmlnodelist_get_item( long nodeIndex = 0; TRACE("%p %ld\n", This, index); - + + if(!listItem) + return E_INVALIDARG; + *listItem = NULL; if (index < 0) @@ -234,6 +240,9 @@ static HRESULT WINAPI xmlnodelist_get_length( TRACE("%p\n", This); + if(!listLength) + return E_INVALIDARG; + curr = This->parent->children; while (curr) { @@ -253,6 +262,9 @@ static HRESULT WINAPI xmlnodelist_nextNode( TRACE("%p %p\n", This, nextItem ); + if(!nextItem) + return E_INVALIDARG; + *nextItem = NULL; if (!This->current)

1 0

Alexander Morozov : wininet/tests: Add HTTP 1.1 test.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 3ac31945276ce6445eaf6e79a784c4a899fccb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac31945276ce6445eaf6e79a… Author: Alexander Morozov <amorozov(a)builder.office.etersoft.ru> Date: Wed Jul 2 11:56:12 2008 +0400 wininet/tests: Add HTTP 1.1 test. --- dlls/wininet/tests/http.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cbea852..d6da2ca 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1347,6 +1347,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSADATA wsaData; int last_request = 0; char host_header[22]; + static int test_b = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -1481,6 +1482,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (!test_b && strstr(buffer, "/testB HTTP/1.1")) + { + test_b = 1; + send(c, okmsg, sizeof okmsg-1, 0); + recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); + send(c, okmsg, sizeof okmsg-1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1779,6 +1787,38 @@ static void test_connection_header(int port) InternetCloseHandle(ses); } +static void test_http1_1(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequest(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + if (ret) + { + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, "/testB", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + todo_wine + ok(ret, "HttpSendRequest failed\n"); + } + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -1803,6 +1843,7 @@ static void test_http_connection(void) test_basic_request(si.port, "POST", "/test5"); test_basic_request(si.port, "GET", "/test6"); test_connection_header(si.port); + test_http1_1(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Alistair Leslie-Hughes : msxml3: Added checks for invalid arguments in queryresult.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 212335e0b8bab15ce01ce6a3403db29019fa6c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=212335e0b8bab15ce01ce6a34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 2 16:15:55 2008 +1000 msxml3: Added checks for invalid arguments in queryresult. --- dlls/msxml3/queryresult.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index d4b837e..1b2070e 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -118,6 +118,9 @@ static HRESULT WINAPI queryresult_QueryInterface( { TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + if(!ppvObject) + return E_INVALIDARG; + if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) @@ -255,6 +258,9 @@ static HRESULT WINAPI queryresult_get_item( TRACE("%p %ld\n", This, index); + if(!listItem) + return E_INVALIDARG; + *listItem = NULL; if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval)) @@ -274,6 +280,9 @@ static HRESULT WINAPI queryresult_get_length( TRACE("%p\n", This); + if(!listLength) + return E_INVALIDARG; + *listLength = xmlXPathNodeSetGetLength(This->result->nodesetval); return S_OK; } @@ -286,6 +295,9 @@ static HRESULT WINAPI queryresult_nextNode( TRACE("%p %p\n", This, nextItem ); + if(!nextItem) + return E_INVALIDARG; + *nextItem = NULL; if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval))

1 0

Sinitsin Ivan : mshtml: Add HTMLWindow_scrollBy implementation.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 2b4dcb2577ce1724d1d830e4519dd6257cbd48fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4dcb2577ce1724d1d830e45… Author: Sinitsin Ivan <ivan(a)etersoft.ru> Date: Wed Jul 2 10:22:56 2008 +0400 mshtml: Add HTMLWindow_scrollBy implementation. --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9943b63..e3f8e75 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -642,8 +642,8 @@ static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%ld %ld)\n", This, x, y); - return E_NOTIMPL; + TRACE("(%p)->(%ld %ld)\n", This, x, y); + return nsIDOMWindow_ScrollBy(This->nswindow, x, y); } static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y)

1 0

Alexander Morozov : wininet/tests: Additional HTTP header tests.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 9d23d8ecefc7a92498c453ef965f8a6c4ab336cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d23d8ecefc7a92498c453ef9… Author: Alexander Morozov <amorozov(a)builder.office.etersoft.ru> Date: Wed Jul 2 11:52:18 2008 +0400 wininet/tests: Additional HTTP header tests. --- dlls/wininet/tests/http.c | 56 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 513afb8..cbea852 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1346,6 +1346,7 @@ static DWORD CALLBACK server_thread(LPVOID param) char buffer[0x100]; WSADATA wsaData; int last_request = 0; + char host_header[22]; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -1369,6 +1370,8 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(si->hEvent); + sprintf(host_header, "Host: localhost:%d", si->port); + do { c = accept(s, NULL, NULL); @@ -1448,7 +1451,10 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "/test8")) { if (!strstr(buffer, "Connection: Close") && - strstr(buffer, "Connection: Keep-Alive")) + strstr(buffer, "Connection: Keep-Alive") && + !strstr(buffer, "Cache-Control: no-cache") && + !strstr(buffer, "Pragma: no-cache") && + strstr(buffer, host_header)) send(c, okmsg, sizeof okmsg-1, 0); else send(c, notokmsg, sizeof notokmsg-1, 0); @@ -1456,7 +1462,21 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "/test9")) { if (!strstr(buffer, "Connection: Close") && - !strstr(buffer, "Connection: Keep-Alive")) + !strstr(buffer, "Connection: Keep-Alive") && + !strstr(buffer, "Cache-Control: no-cache") && + !strstr(buffer, "Pragma: no-cache") && + strstr(buffer, host_header)) + send(c, okmsg, sizeof okmsg-1, 0); + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/testA")) + { + if (!strstr(buffer, "Connection: Close") && + !strstr(buffer, "Connection: Keep-Alive") && + (strstr(buffer, "Cache-Control: no-cache") || + strstr(buffer, "Pragma: no-cache")) && + strstr(buffer, host_header)) send(c, okmsg, sizeof okmsg-1, 0); else send(c, notokmsg, sizeof notokmsg-1, 0); @@ -1706,6 +1726,7 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); + todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req); @@ -1720,6 +1741,37 @@ static void test_connection_header(int port) size = sizeof(status); ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); ok(ret, "HttpQueryInfo failed\n"); + todo_wine + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, "/test9", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + todo_wine + ok(status == 200, "request failed with status %u\n", status); + + InternetCloseHandle(req); + + req = HttpOpenRequest(con, "POST", "/testA", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed\n"); + + status = 0; + size = sizeof(status); + ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); + ok(ret, "HttpQueryInfo failed\n"); + todo_wine ok(status == 200, "request failed with status %u\n", status); InternetCloseHandle(req);

1 0

Sinitsin Ivan : mshtml: Add HTMLWindow_scrollTo implementation.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: e731a42b90da77fa0d17cf61a64013b43a86587d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e731a42b90da77fa0d17cf61a… Author: Sinitsin Ivan <ivan(a)etersoft.ru> Date: Wed Jul 2 10:20:42 2008 +0400 mshtml: Add HTMLWindow_scrollTo implementation. --- dlls/mshtml/htmlwindow.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 45c6cb7..9943b63 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -649,8 +649,8 @@ static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y) static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%ld %ld)\n", This, x, y); - return E_NOTIMPL; + TRACE("(%p)->(%ld %ld)\n", This, x, y); + return nsIDOMWindow_ScrollTo(This->nswindow, x, y); } static HRESULT WINAPI HTMLWindow2_moveTo(IHTMLWindow2 *iface, long x, long y)

1 0

Alistair Leslie-Hughes : msxml3: Use libxml macros to get the length of a set.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Module: wine Branch: master Commit: 13f202a6e98e90a2ef85c7fd22779823dd226419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f202a6e98e90a2ef85c7fd2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 2 10:22:36 2008 +1000 msxml3: Use libxml macros to get the length of a set. --- dlls/msxml3/queryresult.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 81c7de5..d4b837e 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -99,7 +99,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou *out = (IXMLDOMNodeList *)This; hr = S_OK; - TRACE("found %d matches\n", This->result->nodesetval->nodeNr); + TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); cleanup: if (This != NULL && FAILED(hr)) @@ -257,7 +257,7 @@ static HRESULT WINAPI queryresult_get_item( *listItem = NULL; - if (index < 0 || index >= This->result->nodesetval->nodeNr) + if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval)) return S_FALSE; *listItem = create_node(This->result->nodesetval->nodeTab[index]); @@ -274,7 +274,7 @@ static HRESULT WINAPI queryresult_get_length( TRACE("%p\n", This); - *listLength = This->result->nodesetval->nodeNr; + *listLength = xmlXPathNodeSetGetLength(This->result->nodesetval); return S_OK; } @@ -288,7 +288,7 @@ static HRESULT WINAPI queryresult_nextNode( *nextItem = NULL; - if (This->resultPos >= This->result->nodesetval->nodeNr) + if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval)) return S_FALSE; *nextItem = create_node(This->result->nodesetval->nodeTab[This->resultPos]);

1 0