December 2007 - Wine-commits

Jacek Caban : mshtml: Fixed ref counting.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 8d085920189a8ff75f8c1371bdb2211cd016f715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d085920189a8ff75f8c1371b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:22:55 2007 +0100 mshtml: Fixed ref counting. --- dlls/mshtml/htmlstylesheet.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 781cf63..236831e 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -254,8 +254,11 @@ static ULONG WINAPI HTMLStyleSheetsCollection_Release(IHTMLStyleSheetsCollection TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->nslist) + nsIDOMStyleSheetList_Release(This->nslist); heap_free(This); + } return ref; }

1 0

Jacek Caban : mshtml: Added HTMLTxtRange::Exec(IDM_INDENT) implementation.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: f5a8a450b2e0678770c35cbb42035a4d8bfe38e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a8a450b2e0678770c35cbb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:23:22 2007 +0100 mshtml: Added HTMLTxtRange::Exec(IDM_INDENT) implementation. --- dlls/mshtml/txtrange.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 7d046bb..d5e65b8 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winnls.h" #include "ole2.h" +#include "mshtmcid.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -1729,15 +1730,61 @@ static HRESULT WINAPI RangeCommandTarget_QueryStatus(IOleCommandTarget *iface, c return E_NOTIMPL; } +static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) +{ + nsIDOMDocumentFragment *fragment; + nsIDOMElement *blockquote_elem, *p_elem; + nsIDOMDocument *nsdoc; + nsIDOMNode *tmp; + nsAString tag_str; + + static const PRUnichar blockquoteW[] = {'B','L','O','C','K','Q','U','O','T','E',0}; + static const PRUnichar pW[] = {'P',0}; + + TRACE("(%p)->(%p %p)\n", This, in, out); + + nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + + nsAString_Init(&tag_str, blockquoteW); + nsIDOMDocument_CreateElement(nsdoc, &tag_str, &blockquote_elem); + nsAString_Finish(&tag_str); + + nsAString_Init(&tag_str, pW); + nsIDOMDocument_CreateElement(nsdoc, &tag_str, &p_elem); + nsAString_Finish(&tag_str); + + nsIDOMDocument_Release(nsdoc); + + nsIDOMRange_ExtractContents(This->nsrange, &fragment); + nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); + nsIDOMDocumentFragment_Release(fragment); + nsIDOMNode_Release(tmp); + + nsIDOMElement_AppendChild(blockquote_elem, (nsIDOMNode*)p_elem, &tmp); + nsIDOMElement_Release(p_elem); + nsIDOMNode_Release(tmp); + + nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)blockquote_elem); + nsIDOMElement_Release(blockquote_elem); + + return S_OK; +} + static HRESULT WINAPI RangeCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { HTMLTxtRange *This = OLECMDTRG_THIS(iface); + TRACE("(%p)->(%s %d %x %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); if(pguidCmdGroup && IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { - FIXME("Unsupported cmdid %d of CGID_MSHTML\n", nCmdID); + switch(nCmdID) { + case IDM_INDENT: + return exec_indent(This, pvaIn, pvaOut); + default: + FIXME("Unsupported cmdid %d of CGID_MSHTML\n", nCmdID); + } }else { FIXME("Unsupported cmd %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); }

1 0

Jacek Caban : mshtml: Added HTMLTxtRange::Exec(IDM_INDENT) test.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: e35e27de4ce490c2e33a5095d51b2f2983b6cb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e27de4ce490c2e33a5095d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:23:39 2007 +0100 mshtml: Added HTMLTxtRange::Exec(IDM_INDENT) test. --- dlls/mshtml/tests/dom.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5debead..cb7faa3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,6 +42,8 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table><tbody></tbody></table>" "</body></html>"; +static const char indent_test_str[] = + "<html><head><title>test</title></head><body>abc<br /><a href=\"about:blank\">123</a></body></html>"; static const WCHAR noneW[] = {'N','o','n','e',0}; @@ -1209,6 +1211,61 @@ static void test_elems(IHTMLDocument2 *doc) test_create_option_elem(doc); } +static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in, VARIANT *out) +{ + IOleCommandTarget *cmdtrg; + HRESULT hres; + + hres = IHTMLTxtRange_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "Could not get IOleCommandTarget interface: %08x\n", hres); + + hres = IOleCommandTarget_Exec(cmdtrg, grpid, cmdid, 0, in, out); + ok(hres == S_OK, "Exec failed: %08x\n", hres); + + IOleCommandTarget_Release(cmdtrg); +} + +static void test_indent(IHTMLDocument2 *doc) +{ + IHTMLElementCollection *col; + IHTMLTxtRange *range; + HRESULT hres; + + static const elem_type_t all_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_BR, + ET_A, + }; + + static const elem_type_t indent_types[] = { + ET_HTML, + ET_HEAD, + ET_TITLE, + ET_BODY, + ET_BLOCKQUOTE, + ET_P, + ET_BR, + ET_A, + }; + + hres = IHTMLDocument2_get_all(doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection(col, all_types, sizeof(all_types)/sizeof(all_types[0])); + IHTMLElementCollection_Release(col); + + range = test_create_body_range(doc); + test_exec((IUnknown*)range, &CGID_MSHTML, IDM_INDENT, NULL, NULL); + IHTMLTxtRange_Release(range); + + hres = IHTMLDocument2_get_all(doc, &col); + ok(hres == S_OK, "get_all failed: %08x\n", hres); + test_elem_collection(col, indent_types, sizeof(indent_types)/sizeof(indent_types[0])); + IHTMLElementCollection_Release(col); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -1387,6 +1444,7 @@ START_TEST(dom) run_domtest(doc_str2, test_txtrange); run_domtest(elem_test_str, test_elems); run_domtest(doc_blank, test_defaults); + run_domtest(indent_test_str, test_indent); CoUninitialize(); gecko_installer_workaround(FALSE);

1 0

Jacek Caban : hlink: Added IHttpNegotiate interface to ExtensionService.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: d371b8b5f0436f430cfed3ff19222630e35fe077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d371b8b5f0436f430cfed3ff1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 13:17:30 2007 +0100 hlink: Added IHttpNegotiate interface to ExtensionService. --- dlls/hlink/extserv.c | 79 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/hlink/tests/hlink.c | 51 ++++++++++++++++++++++++++++- 2 files changed, 125 insertions(+), 5 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index d2abf2e..b306d35 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -28,6 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); typedef struct { const IUnknownVtbl *lpIUnknownVtbl; const IAuthenticateVtbl *lpIAuthenticateVtbl; + const IHttpNegotiateVtbl *lpIHttpNegotiateVtbl; LONG ref; IUnknown *outer; @@ -35,10 +36,12 @@ typedef struct { HWND hwnd; LPWSTR username; LPWSTR password; + LPWSTR headers; } ExtensionService; #define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) +#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) #define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) @@ -54,6 +57,9 @@ static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, vo }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); *ppv = AUTHENTICATE(This); + }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { + TRACE("(%p)->(IID_IHttpNegotiate %p)\n", This, ppv); + *ppv = HTTPNEGOTIATE(This); } if(*ppv) { @@ -145,29 +151,96 @@ static const IAuthenticateVtbl AuthenticateVtbl = { Authenticate_Authenticate }; +#define HTTPNEGOTIATE_THIS(iface) DEFINE_THIS(ExtensionService, IHttpNegotiate, iface) + +static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, + LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + + TRACE("(%p)->(%s %s %x %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + pszAdditionalHeaders); + + if(!pszAdditionalHeaders) + return E_INVALIDARG; + + *pszAdditionalHeaders = hlink_co_strdupW(This->headers); + return S_OK; +} + +static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD dwResponseCode, + LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); + + *pszAdditionalRequestHeaders = NULL; + return S_OK; +} + +#undef HTTPNEGOTIATE_THIS + +static const IHttpNegotiateVtbl HttpNegotiateVtbl = { + HttpNegotiate_QueryInterface, + HttpNegotiate_AddRef, + HttpNegotiate_Release, + HttpNegotiate_BeginningTransaction, + HttpNegotiate_OnResponse +}; + HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, IUnknown *punkOuter, REFIID riid, void** ppv) { ExtensionService *ret; + int len = 0; HRESULT hres = S_OK; TRACE("%s %p %s %s %p %s %p\n",debugstr_w(pwzAdditionalHeaders), phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), punkOuter, debugstr_guid(riid), ppv); - if(pwzAdditionalHeaders) - FIXME("Unsupported pwzAdditionalHeaders\n"); - ret = hlink_alloc(sizeof(*ret)); ret->lpIUnknownVtbl = &ExtServUnkVtbl; ret->lpIAuthenticateVtbl = &AuthenticateVtbl; + ret->lpIHttpNegotiateVtbl = &HttpNegotiateVtbl; ret->ref = 1; ret->hwnd = phwnd; ret->username = hlink_strdupW(pszUsername); ret->password = hlink_strdupW(pszPassword); + if(pwzAdditionalHeaders) + len = strlenW(pwzAdditionalHeaders); + + if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { + static const WCHAR endlW[] = {'\r','\n',0}; + ret->headers = hlink_alloc(len*sizeof(WCHAR) + sizeof(endlW)); + memcpy(ret->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); + memcpy(ret->headers+len, endlW, sizeof(endlW)); + }else { + ret->headers = hlink_strdupW(pwzAdditionalHeaders); + } if(!punkOuter) { ret->outer = EXTSERVUNK(ret); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 4a59f63..06d1ee8 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -28,6 +28,15 @@ #include "wine/test.h" +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + if(!str) + return "(null)"; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static void test_HlinkIsShortcut(void) { int i; @@ -346,12 +355,15 @@ static void test_special_reference(void) static void test_HlinkCreateExtensionServices(void) { IAuthenticate *authenticate; - LPWSTR password, username; + IHttpNegotiate *http_negotiate; + LPWSTR password, username, headers; HWND hwnd; HRESULT hres; static const WCHAR usernameW[] = {'u','s','e','r',0}; static const WCHAR passwordW[] = {'p','a','s','s',0}; + static const WCHAR headersW[] = {'h','e','a','d','e','r','s',0}; + static const WCHAR headersexW[] = {'h','e','a','d','e','r','s','\r','\n',0}; hres = HlinkCreateExtensionServices(NULL, NULL, NULL, NULL, NULL, &IID_IAuthenticate, (void**)&authenticate); @@ -366,10 +378,29 @@ static void test_HlinkCreateExtensionServices(void) ok(!username, "username != NULL\n"); ok(!password, "password != NULL\n"); + hres = IAuthenticate_QueryInterface(authenticate, &IID_IHttpNegotiate, (void**)&http_negotiate); + ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); + + headers = (void*)0xdeadbeef; + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, (void*)0xdeadbeef, (void*)0xdeadbeef, + 0, &headers); + ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); + ok(headers == NULL, "headers != NULL\n"); + + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, (void*)0xdeadbeef, (void*)0xdeadbeef, + 0, NULL); + ok(hres == E_INVALIDARG, "BeginningTransaction failed: %08x, expected E_INVALIDARG\n", hres); + + headers = (void*)0xdeadbeef; + hres = IHttpNegotiate_OnResponse(http_negotiate, 200, (void*)0xdeadbeef, (void*)0xdeadbeef, &headers); + ok(hres == S_OK, "OnResponse failed: %08x\n", hres); + ok(headers == NULL, "headers != NULL\n"); + + IHttpNegotiate_Release(http_negotiate); IAuthenticate_Release(authenticate); - hres = HlinkCreateExtensionServices(NULL, (HWND)0xfefefefe, usernameW, passwordW, + hres = HlinkCreateExtensionServices(headersW, (HWND)0xfefefefe, usernameW, passwordW, NULL, &IID_IAuthenticate, (void**)&authenticate); ok(hres == S_OK, "HlinkCreateExtensionServices failed: %08x\n", hres); ok(authenticate != NULL, "HlinkCreateExtensionServices returned NULL\n"); @@ -391,6 +422,22 @@ static void test_HlinkCreateExtensionServices(void) ok(password == (void*)0xdeadbeef, "password = %p\n", password); ok(hwnd == (void*)0xdeadbeef, "hwnd = %p\n", hwnd); + hres = IAuthenticate_QueryInterface(authenticate, &IID_IHttpNegotiate, (void**)&http_negotiate); + ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); + + headers = (void*)0xdeadbeef; + hres = IHttpNegotiate_BeginningTransaction(http_negotiate, (void*)0xdeadbeef, (void*)0xdeadbeef, + 0, &headers); + ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); + ok(!lstrcmpW(headers, headersexW), "unexpected headers \"%s\"\n", debugstr_w(headers)); + CoTaskMemFree(headers); + + headers = (void*)0xdeadbeef; + hres = IHttpNegotiate_OnResponse(http_negotiate, 200, (void*)0xdeadbeef, (void*)0xdeadbeef, &headers); + ok(hres == S_OK, "OnResponse failed: %08x\n", hres); + ok(headers == NULL, "unexpected headers \"%s\"\n", debugstr_w(headers)); + + IHttpNegotiate_Release(http_negotiate); IAuthenticate_Release(authenticate); }

1 0

Jacek Caban : mshtml: Added more DOM tests.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: da39170029471c40f8645de6f4cad2525edb1809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da39170029471c40f8645de6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:22:15 2007 +0100 mshtml: Added more DOM tests. --- dlls/mshtml/tests/dom.c | 173 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 132 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da39170029471c40f8645…

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheet::get_rules implementation.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 4ac1ba130a5fa54c2facabed3db949da3c20c94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac1ba130a5fa54c2facabed3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:22:30 2007 +0100 mshtml: Added IHTMLStyleSheet::get_rules implementation. --- dlls/mshtml/htmlstylesheet.c | 159 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsiface.idl | 28 +++++++- dlls/mshtml/tests/dom.c | 18 +++++ 3 files changed, 199 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index bc42ee4..b4c5a87 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -52,8 +52,148 @@ typedef struct { nsIDOMStyleSheetList *nslist; } HTMLStyleSheetsCollection; -#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl); -#define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl); +typedef struct { + const IHTMLStyleSheetRulesCollectionVtbl *lpHTMLStyleSheetRulesCollectionVtbl; + + LONG ref; + + nsIDOMCSSRuleList *nslist; +} HTMLStyleSheetRulesCollection; + +#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl); +#define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl); +#define HTMLSTYLERULESCOL(x) ((IHTMLStyleSheetRulesCollection*) &(x)->lpHTMLStyleSheetRulesCollectionVtbl) + +#define HTMLSTYLERULESCOL_THIS(iface) \ + DEFINE_THIS(HTMLStyleSheetRulesCollection, HTMLStyleSheetRulesCollection, iface) + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleSheetRulesCollection *iface, + REFIID riid, void **ppv) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = HTMLSTYLERULESCOL(This); + }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { + TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); + *ppv = HTMLSTYLERULESCOL(This); + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLStyleSheetRulesCollection_AddRef(IHTMLStyleSheetRulesCollection *iface) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLStyleSheetRulesCollection_Release(IHTMLStyleSheetRulesCollection *iface) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->nslist) + nsIDOMCSSRuleList_Release(This->nslist); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfoCount( + IHTMLStyleSheetRulesCollection *iface, UINT *pctinfo) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetTypeInfo(IHTMLStyleSheetRulesCollection *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_GetIDsOfNames(IHTMLStyleSheetRulesCollection *iface, + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_Invoke(IHTMLStyleSheetRulesCollection *iface, + DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRulesCollection *iface, + long *p) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface, + long index, IHTMLStyleSheetRule **ppHTMLStyleSheetRule) +{ + HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); + FIXME("(%p)->(%ld %p)\n", This, index, ppHTMLStyleSheetRule); + return E_NOTIMPL; +} + +#undef HTMLSTYLERULECOL_THIS + +static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = { + HTMLStyleSheetRulesCollection_QueryInterface, + HTMLStyleSheetRulesCollection_AddRef, + HTMLStyleSheetRulesCollection_Release, + HTMLStyleSheetRulesCollection_GetTypeInfoCount, + HTMLStyleSheetRulesCollection_GetTypeInfo, + HTMLStyleSheetRulesCollection_GetIDsOfNames, + HTMLStyleSheetRulesCollection_Invoke, + HTMLStyleSheetRulesCollection_get_length, + HTMLStyleSheetRulesCollection_item +}; + +static IHTMLStyleSheetRulesCollection *HTMLStyleSheetRulesCollection_Create(nsIDOMCSSRuleList *nslist) +{ + HTMLStyleSheetRulesCollection *ret; + + ret = heap_alloc(sizeof(*ret)); + ret->lpHTMLStyleSheetRulesCollectionVtbl = &HTMLStyleSheetRulesCollectionVtbl; + ret->ref = 1; + ret->nslist = nslist; + + if(nslist) + nsIDOMCSSRuleList_AddRef(nslist); + + return HTMLSTYLERULESCOL(ret); +} #define HTMLSTYLESHEETSCOL_THIS(iface) \ DEFINE_THIS(HTMLStyleSheetsCollection, HTMLStyleSheetsCollection, iface) @@ -468,8 +608,19 @@ static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface, IHTMLStyleSheetRulesCollection **p) { HTMLStyleSheet *This = HTMLSTYLESHEET_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMCSSRuleList *nslist = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* Gecko has buggy security checks and GetCssRules will fail. We have a correct + * implementation and it will work when the bug will be fixed in Gecko. */ + nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); + if(NS_FAILED(nsres)) + WARN("GetCssRules failed: %08x\n", nsres); + + *p = HTMLStyleSheetRulesCollection_Create(nslist); + return S_OK; } static const IHTMLStyleSheetVtbl HTMLStyleSheetVtbl = { diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8f2876c..26258ee 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -81,6 +81,7 @@ interface nsIOutputStream; interface nsIEditorObserver; interface nsIEditActionListener; interface nsIDocumentStateListener; +interface nsIDOMCSSStyleSheet; interface IMoniker; @@ -116,7 +117,6 @@ typedef nsISupports nsIDOMHTMLOptionsCollection; typedef nsISupports nsIDOMHTMLCollection; typedef nsISupports nsIWebProgressListener; typedef nsISupports nsIDOMCSSValue; -typedef nsISupports nsIDOMCSSRule; typedef nsISupports nsIPrintSession; typedef nsISupports nsIControllerCommandTable; typedef nsISupports nsIPrincipal; @@ -124,7 +124,6 @@ typedef nsISupports nsIAtom; typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; typedef nsISupports nsIDOMMediaList; -typedef nsISupports nsIDOMCSSRuleList; [ object, @@ -553,6 +552,20 @@ interface nsIUploadChannel : nsISupports [ object, + uuid(a6cf90c1-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMCSSRule : nsISupports +{ + nsresult GetType(PRUint16 *aType); + nsresult GetCssText(nsAString *aCssText); + nsresult SetCssText(const nsAString *aCssText); + nsresult GetParentStyleSheet(nsIDOMCSSStyleSheet **aParentStyleSheet); + nsresult GetParentRule(nsIDOMCSSRule **aParentRule); +} + +[ + object, uuid(a6cf90be-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] @@ -573,6 +586,17 @@ interface nsIDOMCSSStyleDeclaration : nsISupports [ object, + uuid(a6cf90c0-15b3-11d2-932e-00805f8add32) + /* FROZEN */ +] +interface nsIDOMCSSRuleList : nsISupports +{ + nsresult GetLength(PRUint32 *aLength); + nsresult Item(PRUint32 index, nsIDOMCSSRule **_retval); +} + +[ + object, uuid(a6cf9080-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f1511de..5debead 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1084,6 +1084,23 @@ static void test_defaults(IHTMLDocument2 *doc) test_default_selection(doc); } +static void test_stylesheet(IDispatch *disp) +{ + IHTMLStyleSheetRulesCollection *col = NULL; + IHTMLStyleSheet *stylesheet; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLStyleSheet, (void**)&stylesheet); + ok(hres == S_OK, "Could not get IHTMLStyleSheet: %08x\n", hres); + + hres = IHTMLStyleSheet_get_rules(stylesheet, &col); + ok(hres == S_OK, "get_rules failed: %08x\n", hres); + ok(col != NULL, "col == NULL\n"); + + IHTMLStyleSheetRulesCollection_Release(col); + IHTMLStyleSheet_Release(stylesheet); +} + static void test_stylesheets(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *col = NULL; @@ -1107,6 +1124,7 @@ static void test_stylesheets(IHTMLDocument2 *doc) ok(hres == S_OK, "item failed: %08x\n", hres); ok(V_VT(&res) == VT_DISPATCH, "V_VT(res) = %d\n", V_VT(&res)); ok(V_DISPATCH(&res) != NULL, "V_DISPATCH(&res) == NULL\n"); + test_stylesheet(V_DISPATCH(&res)); VariantClear(&res); V_VT(&res) = VT_I4;

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheetRulesCollection:: get_length implementation.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 23393756dd0b79a0dc753ff89b289f530ff10f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23393756dd0b79a0dc753ff89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 12:22:44 2007 +0100 mshtml: Added IHTMLStyleSheetRulesCollection::get_length implementation. --- dlls/mshtml/htmlstylesheet.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b4c5a87..781cf63 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -154,8 +154,20 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_get_length(IHTMLStyleSheetRu long *p) { HTMLStyleSheetRulesCollection *This = HTMLSTYLERULESCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint32 len = 0; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->nslist) { + nsresult nsres; + + nsres = nsIDOMCSSRuleList_GetLength(This->nslist, &len); + if(NS_FAILED(nsres)) + ERR("GetLength failed: %08x\n", nsres); + } + + *p = len; + return S_OK; } static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCollection *iface,

1 0

Roy Shea : include: Added bitsmsg.h header.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 68b55594a07b6a2ba47ed98b0799968e1cfb9681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b55594a07b6a2ba47ed98b0… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Dec 5 18:22:24 2007 -0800 include: Added bitsmsg.h header. --- include/Makefile.in | 1 + include/bitsmsg.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c3e2582..932a56d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -84,6 +84,7 @@ SRCDIR_INCLUDES = \ basetsd.h \ basetyps.h \ bcrypt.h \ + bitsmsg.h \ cderr.h \ cfgmgr32.h \ cguid.h \ diff --git a/include/bitsmsg.h b/include/bitsmsg.h new file mode 100644 index 0000000..3c8b70b --- /dev/null +++ b/include/bitsmsg.h @@ -0,0 +1,81 @@ +/* + * Standard return values that may be generated by BITS + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_BITMSG_H__ +#define __WINE_BITMSG_H__ + +#define BG_S_PARTIAL_COMPLETE 0x00200017 +#define BG_S_UNABLE_TO_DELETE_FILES 0x0020001A +#define BG_S_OVERRIDDEN_BY_POLICY 0x00200055 + +#define BG_E_HTTP_ERROR_400 0x80190190 +#define BG_E_HTTP_ERROR_401 0x80190191 +#define BG_E_HTTP_ERROR_404 0x80190194 +#define BG_E_HTTP_ERROR_407 0x80190197 +#define BG_E_HTTP_ERROR_414 0x8019019E +#define BG_E_HTTP_ERROR_501 0x801901F5 +#define BG_E_HTTP_ERROR_503 0x801901F7 +#define BG_E_HTTP_ERROR_504 0x801901F8 +#define BG_E_HTTP_ERROR_505 0x801901F9 + +#define BG_E_NOT_FOUND 0x80200001 +#define BG_E_INVALID_STATE 0x80200002 +#define BG_E_EMPTY 0x80200003 +#define BG_E_FILE_NOT_AVAILABLE 0x80200004 +#define BG_E_PROTOCOL_NOT_AVAILABLE 0x80200005 +#define BG_E_DESTINATION_LOCKED 0x8020000D +#define BG_E_VOLUME_CHANGED 0x8020000E +#define BG_E_ERROR_INFORMATION_UNAVAILABLE 0x8020000F +#define BG_E_NETWORK_DISCONNECTED 0x80200010 +#define BG_E_MISSING_FILE_SIZE 0x80200011 +#define BG_E_INSUFFICIENT_HTTP_SUPPORT 0x80200012 +#define BG_E_INSUFFICIENT_RANGE_SUPPORT 0x80200013 +#define BG_E_REMOTE_NOT_SUPPORTED 0x80200014 +#define BG_E_NEW_OWNER_DIFF_MAPPING 0x80200015 +#define BG_E_NEW_OWNER_NO_FILE_ACCESS 0x80200016 +#define BG_E_PROXY_LIST_TOO_LARGE 0x80200018 +#define BG_E_PROXY_BYPASS_LIST_TOO_LARGE 0x80200019 +#define BG_E_TOO_MANY_FILES 0x8020001C +#define BG_E_LOCAL_FILE_CHANGED 0x8020001D +#define BG_E_TOO_LARGE 0x80200020 +#define BG_E_STRING_TOO_LONG 0x80200021 +#define BG_E_CLIENT_SERVER_PROTOCOL_MISMATCH 0x80200022 +#define BG_E_SERVER_EXECUTE_ENABLED 0x80200023 +#define BG_E_USERNAME_TOO_LARGE 0x80200025 +#define BG_E_PASSWORD_TOO_LARGE 0x80200026 +#define BG_E_INVALID_AUTH_TARGET 0x80200027 +#define BG_E_INVALID_AUTH_SCHEME 0x80200028 +#define BG_E_INVALID_RANGE 0x8020002B +#define BG_E_OVERLAPPING_RANGES 0x8020002C +#define BG_E_BLOCKED_BY_POLICY 0x8020003E +#define BG_E_INVALID_PROXY_INFO 0x8020003F +#define BG_E_INVALID_CREDENTIALS 0x80200040 +#define BG_E_RECORD_DELETED 0x80200042 +#define BG_E_UPNP_ERROR 0x80200045 +#define BG_E_PEERCACHING_DISABLED 0x80200047 +#define BG_E_BUSYCACHERECORD 0x80200048 +#define BG_E_TOO_MANY_JOBS_PER_USER 0x80200049 +#define BG_E_TOO_MANY_JOBS_PER_MACHINE 0x80200050 +#define BG_E_TOO_MANY_FILES_IN_JOB 0x80200051 +#define BG_E_TOO_MANY_RANGES_IN_FILE 0x80200052 +#define BG_E_VALIDATION_FAILED 0x80200053 +#define BG_E_MAXDOWNLOAD_TIMEOUT 0x80200054 + +#endif /* #ifndef __WINE_BITMSG_H__ */

1 0

Roy Shea : include: Added IDL file for BITS.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: a63f3e6a11925baec514f45b3ab660ad5c544156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63f3e6a11925baec514f45b3… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Wed Dec 5 18:22:40 2007 -0800 include: Added IDL file for BITS. --- .gitignore | 1 + include/Makefile.in | 1 + include/bits.idl | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 413 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a63f3e6a11925baec514f…

1 0

Peter Oberndorfer : comctl32: EnumMRUListA/ W fix getting list size by negative item pos.
by Alexandre Julliard 06 Dec '07

06 Dec '07

Module: wine Branch: master Commit: 429d0d3eb330562648f5d0b609101e5252d0ddbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=429d0d3eb330562648f5d0b60… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Dec 5 20:10:55 2007 +0100 comctl32: EnumMRUListA/W fix getting list size by negative item pos. --- dlls/comctl32/comctl32undoc.c | 4 ++-- dlls/comctl32/tests/mru.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 6f434a6..8ada782 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -834,8 +834,8 @@ INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, const WINEMRUITEM *witem; INT desired, datasize; - if (nItemPos >= mp->cursize) return -1; if ((nItemPos < 0) || !lpBuffer) return mp->cursize; + if (nItemPos >= mp->cursize) return -1; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); @@ -860,8 +860,8 @@ INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, INT desired, datasize; DWORD lenA; - if (nItemPos >= mp->cursize) return -1; if ((nItemPos < 0) || !lpBuffer) return mp->cursize; + if (nItemPos >= mp->cursize) return -1; desired = mp->realMRU[nItemPos]; desired -= 'a'; TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index bfcc385..5201a95 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -288,7 +288,6 @@ static void test_MRUListA(void) iRet = pEnumMRUList(hMRU, 0, NULL, 0); ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); - todo_wine{ /* negative item pos = get list size */ iRet = pEnumMRUList(hMRU, -1, NULL, 0); ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); @@ -304,7 +303,6 @@ static void test_MRUListA(void) /* negative item pos = get list size */ iRet = pEnumMRUList(hMRU, -5, buffer, 255); ok(iRet == 3, "EnumMRUList expected %d, got %d\n", LIST_SIZE, iRet); - } /* check entry 0 */ buffer[0] = 0;

1 0