March 2013 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Implment IXMLParser SetInput.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 6f2f577fa5c77ddd8f1790ee142c92ec1c460967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f577fa5c77ddd8f1790ee1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 15 16:16:02 2013 +1100 msxml3: Implment IXMLParser SetInput. --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 46812c8..51f2a27 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -135,6 +135,9 @@ static void create_test(void) ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); ok(nodefactory == &thenodefactory, "expected NULL\n"); + hr = IXMLParser_SetInput(parser, NULL); + ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_SetFactory(parser, NULL); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 154e439..4c91a1e 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -47,6 +47,7 @@ typedef struct _xmlparser { IXMLParser IXMLParser_iface; IXMLNodeFactory *nodefactory; + IUnknown *input; LONG ref; int flags; @@ -96,6 +97,9 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + if(This->input) + IUnknown_Release(This->input); + if(This->nodefactory) IXMLNodeFactory_Release(This->nodefactory); @@ -246,9 +250,18 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p %p)\n", This, pStm); + TRACE("(%p %p)\n", This, pStm); - return E_NOTIMPL; + if(!pStm) + return E_INVALIDARG; + + if(This->input) + IUnknown_Release(This->input); + + This->input = pStm; + IUnknown_AddRef(This->input); + + return S_OK; } static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData, @@ -435,6 +448,7 @@ HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj) This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl; This->nodefactory = NULL; + This->input = NULL; This->flags = 0; This->ref = 1;

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 02f2ab943777840176bc7ee552826e7933be7aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f2ab943777840176bc7ee55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 15 10:39:00 2013 +0100 winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO. --- dlls/winhttp/session.c | 94 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++ include/winhttp.h | 16 +++++++ 3 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d43b225..394fddd 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -25,6 +25,11 @@ #include "windef.h" #include "winbase.h" +#ifndef __MINGW32__ +#define USE_WS_PREFIX +#endif +#include "winsock2.h" +#include "ws2ipdef.h" #include "winhttp.h" #include "wincrypt.h" #include "winreg.h" @@ -587,6 +592,71 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } +static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +{ +#ifndef __MINGW32__ + switch (addr->sa_family) + { + case AF_INET: + { + const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; + struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; + char *p; + + addr_win->sin_family = WS_AF_INET; + addr_win->sin_port = addr_unix->sin_port; + memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); + p = (char *)&addr_win->sin_addr + 4; + memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); + return TRUE; + } + case AF_INET6: + { + const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; + struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; + + addr_win->sin6_family = WS_AF_INET6; + addr_win->sin6_port = addr_unix->sin6_port; + addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; + memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + addr_win->sin6_scope_id = addr_unix->sin6_scope_id; +#else + addr_win->sin6_scope_id = 0; +#endif + memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#else + switch (addr->sa_family) + { + case AF_INET: + { + struct sockaddr_in *addr_in = (struct sockaddr_in *)addr_storage; + + memcpy( addr_in, addr, sizeof(*addr_in) ); + memset( addr_in + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in) ); + return TRUE; + } + case AF_INET6: + { + struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr_storage; + + memcpy( addr_in6, addr, sizeof(*addr_in6) ); + memset( addr_in6 + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in6) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#endif +} + static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { request_t *request = (request_t *)hdr; @@ -683,6 +753,30 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(DWORD); return TRUE; } + case WINHTTP_OPTION_CONNECTION_INFO: + { + WINHTTP_CONNECTION_INFO *info = buffer; + struct sockaddr local; + socklen_t len = sizeof(local); + const struct sockaddr *remote = (const struct sockaddr *)&request->connect->sockaddr; + + if (!buffer || *buflen < sizeof(*info)) + { + *buflen = sizeof(*info); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!netconn_connected( &request->netconn )) + { + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + if (getsockname( request->netconn.socket, &local, &len )) return FALSE; + if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + info->cbSize = sizeof(*info); + return TRUE; + } case WINHTTP_OPTION_RESOLVE_TIMEOUT: *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index fd0db18..b03e108 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -23,6 +23,8 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> @@ -2019,6 +2021,65 @@ static void test_bad_header( int port ) WinHttpCloseHandle( ses ); } +static void test_connection_info( int port ) +{ + static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; + HINTERNET ses, con, req; + WINHTTP_CONNECTION_INFO info; + DWORD size, error; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, basicW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + size = sizeof(info); + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + if (!ret && error == ERROR_INVALID_PARAMETER) + { + win_skip( "WINHTTP_OPTION_CONNECTION_INFO not supported\n" ); + return; + } + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + size = 0; + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_credentials(void) { static WCHAR userW[] = {'u','s','e','r',0}; @@ -2768,6 +2829,7 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; + test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_basic_authentication(si.port); diff --git a/include/winhttp.h b/include/winhttp.h index cf0da83..9247abf 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -19,6 +19,12 @@ #ifndef __WINE_WINHTTP_H #define __WINE_WINHTTP_H +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack4.h> +#endif + #define WINHTTPAPI #define BOOLAPI WINHTTPAPI BOOL WINAPI @@ -527,6 +533,14 @@ typedef struct DWORD dwMinorVersion; } HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; +#ifdef _WS2DEF_ +typedef struct +{ + DWORD cbSize; + SOCKADDR_STORAGE LocalAddress; + SOCKADDR_STORAGE RemoteAddress; +} WINHTTP_CONNECTION_INFO; +#endif #ifdef __cplusplus extern "C" { @@ -565,4 +579,6 @@ BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); } #endif +#include <poppack.h> + #endif /* __WINE_WINHTTP_H */

1 0

Jacek Caban : wininet: Use parsed status_code to test for CONTINUE HTTP response.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: c6005aabcdb76afb8b0bc5592171d84b0c9fd0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6005aabcdb76afb8b0bc5592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 11:46:22 2013 +0100 wininet: Use parsed status_code to test for CONTINUE HTTP response. --- dlls/wininet/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a3f68ae..d0ed459 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5680,7 +5680,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); do { - static const WCHAR szHundred[] = {'1','0','0',0}; /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ @@ -5716,7 +5715,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) TRACE("version [%s] status code [%s] status text [%s]\n", debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); - codeHundred = (!strcmpW(status_code, szHundred)); + codeHundred = request->status_code == HTTP_STATUS_CONTINUE; } else if (!codeHundred) {

1 0

Jacek Caban : mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3:: getElementsByTagName implementation.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 1d05cd515c168e45d38f344952b27b406ad07bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d05cd515c168e45d38f34495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:23 2013 +0100 mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3::getElementsByTagName implementation. --- dlls/mshtml/htmldoc3.c | 7 ++----- dlls/mshtml/tests/dom.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4b9b12e..de5cdab 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -566,9 +566,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, { HTMLDocument *This = impl_from_IHTMLDocument3(iface); nsIDOMNodeList *nslist; - nsAString id_str, ns_str; + nsAString id_str; nsresult nsres; - static const WCHAR str[] = {'*',0}; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); @@ -578,10 +577,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, } nsAString_InitDepend(&id_str, v); - nsAString_InitDepend(&ns_str, str); - nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->doc_node->nsdoc, &ns_str, &id_str, &nslist); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); nsAString_Finish(&id_str); - nsAString_Finish(&ns_str); if(FAILED(nsres)) { ERR("GetElementByName failed: %08x\n", nsres); return E_FAIL; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d2be89f..2e4e3d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6281,7 +6281,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - str = a2bstr("img"); + str = a2bstr("Img"); hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); SysFreeString(str);

1 0

Jacek Caban : mshtml: Use lazy allocation for connection points.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: af6c518e7d25f33aa80a5c4d8ac6add2fb0a8040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c518e7d25f33aa80a5c4d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:53 2013 +0100 mshtml: Use lazy allocation for connection points. --- dlls/mshtml/conpoint.c | 100 +++++++++++++++++++++++++++-------------- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlbody.c | 12 +++-- dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmldoc.c | 16 +++++-- dlls/mshtml/htmlelem.c | 11 ++++- dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlevent.c | 56 ++++++++++++------------ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 2 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 3 + dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 10 +++- dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextcont.c | 2 - dlls/mshtml/htmltextnode.c | 3 + dlls/mshtml/mshtml_private.h | 28 ++++++------ dlls/mshtml/mutation.c | 2 +- dlls/mshtml/persist.c | 2 +- 32 files changed, 174 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af6c518e7d25f33aa80a5…

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 support.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: d3e8d44e9c0535b8ff520917163cec9b5eae823f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e8d44e9c0535b8ff5209171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:15 2013 +0100 mshtml: Added HTMLElementEvents2 support. --- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/mshtml_private.h | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 02c1538..db4b8e7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1679,6 +1679,8 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve return S_OK; } +cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; + const cpc_entry_t HTMLElement_cpc[] = { HTMLELEMENT_CPC, {NULL} diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 19446ad..9ea1708 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -883,12 +883,20 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) return hres; } -static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, VARIANT *retv) +static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_obj, VARIANT *retv) { DISPPARAMS dp = {NULL,NULL,0,0}; + VARIANT event_arg; ULONG argerr; EXCEPINFO ei; + if(event_obj) { + V_VT(&event_arg) = VT_DISPATCH; + V_DISPATCH(&event_arg) = (IDispatch*)&event_obj->IHTMLEventObj_iface; + dp.rgvarg = &event_arg; + dp.cArgs = 1; + } + memset(&ei, 0, sizeof(ei)); return IDispatch_Invoke(disp, dispid, &IID_NULL, 0, DISPATCH_METHOD, &dp, retv, &ei, &argerr); } @@ -1019,7 +1027,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&v) = VT_EMPTY; TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, &v); + hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, + cp->data->pass_event_arg ? event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a2a9436..d0bb68e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -114,6 +114,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLUnknownElement) \ XDIID(DispHTMLWindow2) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLElementEvents2) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAttributeCollection) \ XIID(IHTMLAttributeCollection2) \ @@ -430,6 +431,7 @@ typedef enum { typedef struct _cp_static_data_t { tid_t tid; void (*on_advise)(IUnknown*,struct _cp_static_data_t*); + BOOL pass_event_arg; DWORD id_cnt; DISPID *ids; } cp_static_data_t; @@ -666,7 +668,8 @@ typedef struct { IHTMLElement3_tid, \ IHTMLElement4_tid -#define HTMLELEMENT_CPC {NULL} +extern cp_static_data_t HTMLElementEvents2_data; +#define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} extern const cpc_entry_t HTMLElement_cpc[]; typedef struct {

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 tests.
by Alexandre Julliard 15 Mar '13

15 Mar '13

Module: wine Branch: master Commit: 3c4e4ee3c0d04d2bf53cc4e50e635c40b1d25a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4e4ee3c0d04d2bf53cc4e50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:31 2013 +0100 mshtml: Added HTMLElementEvents2 tests. --- dlls/mshtml/tests/events.c | 74 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6d74f40..8e9d88c9 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -82,6 +82,7 @@ DEFINE_EXPECT(submit_onclick_cancel); DEFINE_EXPECT(submit_onclick_attached); DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); +DEFINE_EXPECT(elem2_cp_onclick); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -1239,6 +1240,31 @@ static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); } +#define test_cp_eventarg(a,b,c,d,e,f) _test_cp_eventarg(__LINE__,a,b,c,d,e,f) +static void _test_cp_eventarg(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +{ + IHTMLEventObj *event; + + ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); + ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); + ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); + ok_(__FILE__,line)(V_VT(vres) == VT_EMPTY, "V_VT(vres) = %d\n", V_VT(vres)); + ok_(__FILE__,line)(ei != NULL, "ei == NULL\n"); + ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); + + ok(V_VT(dp->rgvarg) == VT_DISPATCH, "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + ok(V_DISPATCH(dp->rgvarg) != NULL, "V_DISPATCH(dp->rgvarg) = %p\n", V_DISPATCH(dp->rgvarg)); + + event = _get_event_obj(line); + ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); + IHTMLEventObj_Release(event); +} + static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) @@ -1278,6 +1304,24 @@ static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMemb CONNECTION_POINT_OBJ(doccp_onclick_cancel, DIID_HTMLDocumentEvents); +static HRESULT WINAPI elem2_cp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(elem2_cp_onclick); + test_cp_eventarg(riid, wFlags, pdp, pVarResult, pei, puArgErr); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(elem2_cp, DIID_HTMLElementEvents2); + static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -1492,8 +1536,8 @@ static IDispatch EventDispatch = { &EventDispatchVtbl }; static void test_onclick(IHTMLDocument2 *doc) { + DWORD cp_cookie, elem2_cp_cookie; IHTMLElement *div, *body; - DWORD cp_cookie; VARIANT v; HRESULT hres; @@ -1638,6 +1682,34 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(doccp_onclick); CHECK_CALLED(invoke_onclick); + elem2_cp_cookie = register_cp((IUnknown*)div, &DIID_HTMLElementEvents2, (IUnknown*)&elem2_cp_obj); + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_disp); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(elem2_cp_onclick); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + SET_EXPECT(doc_onclick_attached); + SET_EXPECT(doccp_onclick); + SET_EXPECT(invoke_onclick); + + trace("click >>>\n"); + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + trace("click <<<\n"); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_disp); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(elem2_cp_onclick); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + CHECK_CALLED(doc_onclick_attached); + CHECK_CALLED(doccp_onclick); + CHECK_CALLED(invoke_onclick); + + unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); V_VT(&v) = VT_NULL;

1 0

Francois Gouget : testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: tools Branch: master Commit: ce43ff14cd99a98408a17b35eda843372b6789bb URL: http://source.winehq.org/git/tools.git/?a=commit;h=ce43ff14cd99a98408a17b35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 21:57:36 2013 +0100 testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified. --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 232e767..11c355f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = CreateJobs(); + my $Jobs = WineTestBot::Jobs::CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - ScheduleJobs(); + WineTestBot::Jobs::ScheduleJobs(); return undef; }

1 0

Alexandre Julliard : msvcrt: Synchronize spec files.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 799731f4b9e9495181e18a68eba16c9219db73fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=799731f4b9e9495181e18a68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:18:03 2013 +0100 msvcrt: Synchronize spec files. --- dlls/crtdll/crtdll.spec | 6 +- dlls/msvcirt/msvcirt.spec | 12 ++-- dlls/msvcr100/msvcr100.spec | 80 ++++++++++++++++---------------- dlls/msvcr110/msvcr110.spec | 110 +++++++++++++++++++++--------------------- dlls/msvcr70/msvcr70.spec | 68 +++++++++++++------------- dlls/msvcr71/msvcr71.spec | 68 +++++++++++++------------- dlls/msvcr80/msvcr80.spec | 30 ++++++------ dlls/msvcr90/msvcr90.spec | 80 ++++++++++++++++---------------- dlls/msvcrt20/msvcrt20.spec | 14 +++--- dlls/msvcrt40/msvcrt40.spec | 58 +++++++++++----------- dlls/msvcrtd/msvcrtd.spec | 62 ++++++++++++------------ tools/make_specfiles | 1 + 12 files changed, 295 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=799731f4b9e9495181e18…

1 0

Alexandre Julliard : ntdll: Copy some missing math functions from msvcrt.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 17be935568ed630f4a7a53c345dbe533ee61b1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=17be935568ed630f4a7a53c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:43:46 2013 +0100 ntdll: Copy some missing math functions from msvcrt. --- dlls/ntdll/misc.c | 129 ++++++++++++++++++++++++------------------------- dlls/ntdll/ntdll.spec | 8 ++-- 2 files changed, 67 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index fecd67e..c115c9c 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -53,72 +53,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) } /********************************************************************* - * _ftol (NTDLL.@) - * - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(void) -{ - /* don't just do DO_FPU("fistp",retval), because the rounding - * mode must also be set to "round towards zero"... */ - double fl; - POP_FPU(fl); - return (LONGLONG)fl; -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _ftol (NTDLL.@) - * - * FIXME - * Should be register function - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(double fl) -{ - FIXME("should be register function\n"); - return (LONGLONG)fl; -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _CIpow (NTDLL.@) - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(void) -{ - double x,y; - POP_FPU(y); - POP_FPU(x); - return pow(x,y); -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - - -/********************************************************************* - * _CIpow (NTDLL.@) - * - * FIXME - * Should be register function - * - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(double x,double y) -{ - FIXME("should be register function\n"); - return pow(x,y); -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* * wine_get_version (NTDLL.@) */ const char * CDECL NTDLL_wine_get_version(void) @@ -252,6 +186,69 @@ double CDECL NTDLL_tan( double d ) return tan( d ); } +#if defined(__GNUC__) && defined(__i386__) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/********************************************************************* + * _CIcos (NTDLL.@) + */ +double CDECL NTDLL__CIcos(void) +{ + FPU_DOUBLE(x); + return NTDLL_cos(x); +} + +/********************************************************************* + * _CIlog (NTDLL.@) + */ +double CDECL NTDLL__CIlog(void) +{ + FPU_DOUBLE(x); + return NTDLL_log(x); +} + +/********************************************************************* + * _CIpow (NTDLL.@) + */ +double CDECL NTDLL__CIpow(void) +{ + FPU_DOUBLES(x,y); + return NTDLL_pow(x,y); +} + +/********************************************************************* + * _CIsin (NTDLL.@) + */ +double CDECL NTDLL__CIsin(void) +{ + FPU_DOUBLE(x); + return NTDLL_sin(x); +} + +/********************************************************************* + * _CIsqrt (NTDLL.@) + */ +double CDECL NTDLL__CIsqrt(void) +{ + FPU_DOUBLE(x); + return NTDLL_sqrt(x); +} + +/********************************************************************* + * _ftol (NTDLL.@) + */ +LONGLONG CDECL NTDLL__ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + +#endif /* defined(__GNUC__) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 19ff8e4..d144986 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1240,11 +1240,11 @@ @ stub ZwWriteRequestData @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall ZwYieldExecution() NtYieldExecution -# @ stub _CIcos -# @ stub _CIlog +@ cdecl -private -arch=i386 _CIcos() NTDLL__CIcos +@ cdecl -private -arch=i386 _CIlog() NTDLL__CIlog @ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow -# @ stub _CIsin -# @ stub _CIsqrt +@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin +@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=x86_64 -norelay __chkstk() # @ stub __isascii

1 0