November 2010 - Wine-Commits

Jacek Caban : mshtml: Don't overwrite custom UI handler in SetClientSite.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: ee875f362d72867cea759559c5ff2f01b67e3727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee875f362d72867cea759559c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:18:18 2010 +0100 mshtml: Don't overwrite custom UI handler in SetClientSite. --- dlls/mshtml/oleobj.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index eab76bf..419d9aa 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -94,7 +94,6 @@ static void update_hostinfo(HTMLDocumentObj *This, DOCHOSTUIINFO *hostinfo) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { HTMLDocument *This = OLEOBJ_THIS(iface); - IDocHostUIHandler *pDocHostUIHandler = NULL; IOleCommandTarget *cmdtrg = NULL; IOleWindow *ole_window; BOOL hostui_setup; @@ -113,7 +112,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->usermode = UNKNOWN_USERMODE; } - if(This->doc_obj->hostui) { + if(This->doc_obj->hostui && !This->doc_obj->custom_hostui) { IDocHostUIHandler_Release(This->doc_obj->hostui); This->doc_obj->hostui = NULL; } @@ -128,17 +127,24 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hostui_setup = This->doc_obj->hostui_setup; - hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); - if(SUCCEEDED(hres)) { + if(!This->doc_obj->hostui) { + IDocHostUIHandler *uihandler; + + This->doc_obj->custom_hostui = FALSE; + + hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&uihandler); + if(SUCCEEDED(hres)) + This->doc_obj->hostui = uihandler; + } + + if(This->doc_obj->hostui) { DOCHOSTUIINFO hostinfo; LPOLESTR key_path = NULL, override_key_path = NULL; - IDocHostUIHandler2 *pDocHostUIHandler2; - - This->doc_obj->hostui = pDocHostUIHandler; + IDocHostUIHandler2 *uihandler2; memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); hostinfo.cbSize = sizeof(DOCHOSTUIINFO); - hres = IDocHostUIHandler_GetHostInfo(pDocHostUIHandler, &hostinfo); + hres = IDocHostUIHandler_GetHostInfo(This->doc_obj->hostui, &hostinfo); if(SUCCEEDED(hres)) { TRACE("hostinfo = {%u %08x %08x %s %s}\n", hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, @@ -148,7 +154,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } if(!hostui_setup) { - hres = IDocHostUIHandler_GetOptionKeyPath(pDocHostUIHandler, &key_path, 0); + hres = IDocHostUIHandler_GetOptionKeyPath(This->doc_obj->hostui, &key_path, 0); if(hres == S_OK && key_path) { if(key_path[0]) { /* FIXME: use key_path */ @@ -157,10 +163,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite CoTaskMemFree(key_path); } - hres = IDocHostUIHandler_QueryInterface(pDocHostUIHandler, &IID_IDocHostUIHandler2, - (void**)&pDocHostUIHandler2); + hres = IDocHostUIHandler_QueryInterface(This->doc_obj->hostui, &IID_IDocHostUIHandler2, + (void**)&uihandler2); if(SUCCEEDED(hres)) { - hres = IDocHostUIHandler2_GetOverrideKeyPath(pDocHostUIHandler2, &override_key_path, 0); + hres = IDocHostUIHandler2_GetOverrideKeyPath(uihandler2, &override_key_path, 0); if(hres == S_OK && override_key_path && override_key_path[0]) { if(override_key_path[0]) { /*FIXME: use override_key_path */ @@ -168,13 +174,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite } CoTaskMemFree(override_key_path); } - IDocHostUIHandler2_Release(pDocHostUIHandler2); + IDocHostUIHandler2_Release(uihandler2); } This->doc_obj->hostui_setup = TRUE; } - }else { - This->doc_obj->hostui = NULL; } /* Native calls here GetWindow. What is it for?

1 0

Thomas Mullaly : include: Added basic header for strsafe.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 4e07082eda63480dfa6557c6f48b34cf05f51ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e07082eda63480dfa6557c6f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Nov 17 18:27:30 2010 -0500 include: Added basic header for strsafe. --- include/Makefile.in | 1 + include/strsafe.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index e7c75ee..ae0e842 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -474,6 +474,7 @@ SRCDIR_INCLUDES = \ sspi.h \ sti.h \ storage.h \ + strsafe.h \ svrapi.h \ t2embapi.h \ tapi.h \ diff --git a/include/strsafe.h b/include/strsafe.h new file mode 100644 index 0000000..2beb53f --- /dev/null +++ b/include/strsafe.h @@ -0,0 +1,32 @@ +/* + * Copyright 2010 Thomas Mullaly + * + * 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_STRSAFE_H +#define __WINE_STRSAFE_H + +#include <stdio.h> +#include <string.h> +#include <stdarg.h> + +/* Windows version includes this header. */ +/* #include <specstring.h> */ + +#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) +#define STRSAFE_E_INVALID_PARAM ((HRESULT)0x80070075L) +#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) + +#endif

1 0

Thomas Mullaly : urlmon: Implementation for PARSE_FRIENDLY in CoInternetParseIUri.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 6d996f32a58cedc05a759a303e8b2b75be19e2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d996f32a58cedc05a759a303… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Nov 27 17:49:25 2010 -0500 urlmon: Implementation for PARSE_FRIENDLY in CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 6 +++++- dlls/urlmon/uri.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 83a335b..dfeed9b 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5921,7 +5921,11 @@ static const uri_parse_test uri_parse_tests[] = { {"http://google.com/test/../",Uri_CREATE_NO_CANONICALIZE,PARSE_CANONICALIZE,URL_NO_META,"http://google.com/test/../",S_OK,FALSE}, {"http://google.com/test/../",Uri_CREATE_NO_CANONICALIZE,PARSE_CANONICALIZE,0,"http://google.com/",S_OK,FALSE}, {"zip://google.com/test/../",Uri_CREATE_NO_CANONICALIZE,PARSE_CANONICALIZE,0,"zip://google.com/",S_OK,FALSE}, - {"file:///c:/test/../test",Uri_CREATE_NO_CANONICALIZE,PARSE_CANONICALIZE,URL_DONT_SIMPLIFY,"file:///c:/test/../test",S_OK,FALSE} + {"file:///c:/test/../test",Uri_CREATE_NO_CANONICALIZE,PARSE_CANONICALIZE,URL_DONT_SIMPLIFY,"file:///c:/test/../test",S_OK,FALSE}, + + /* PARSE_FRIENDLY tests. */ + {"http://test(a)google.com/test#test",0,PARSE_FRIENDLY,0,"http://google.com/test#test",S_OK,FALSE}, + {"zip://test(a)google.com/test",0,PARSE_FRIENDLY,0,"zip://test(a)google.com/test",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a0a1a54..64eaba2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6186,6 +6186,34 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, return S_OK; } +static HRESULT parse_friendly(IUri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + HRESULT hr; + DWORD display_len; + BSTR display; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_DISPLAY_URI, &display_len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = display_len; + if(display_len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetDisplayUri(uri, &display); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, display, (display_len+1)*sizeof(WCHAR)); + SysFreeString(display); + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6217,6 +6245,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_canonicalize(uri, dwFlags, pwzResult, cchResult, pcchResult); break; + case PARSE_FRIENDLY: + hr = parse_friendly(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Jacek Caban : mshtml.idl: Added param element's interfaces declaration.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: bf228d4a84bdc28d48c171747c889dfa5b02486e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf228d4a84bdc28d48c171747… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:19:03 2010 +0100 mshtml.idl: Added param element's interfaces declaration. --- include/mshtmdid.h | 12 +++++ include/mshtml.idl | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 1 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index d4f4201..1e9ab77 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2553,6 +2553,18 @@ #define DISPID_IHTMLOBJECTELEMENT4_IE8_CODEBASE DISPID_IE8_OBJECT+1 #define DISPID_IHTMLOBJECTELEMENT4_IE8_DATA DISPID_IE8_OBJECT+2 +/* IHTMLParamElement */ +#define DISPID_IHTMLPARAMELEMENT_NAME DISPID_PARAM+1 +#define DISPID_IHTMLPARAMELEMENT_VALUE DISPID_PARAM+2 +#define DISPID_IHTMLPARAMELEMENT_TYPE DISPID_PARAM+3 +#define DISPID_IHTMLPARAMELEMENT_VALUETYPE DISPID_PARAM+4 + +/* IHTMLParamElement2 */ +#define DISPID_IHTMLPARAMELEMENT2_NAME DISPID_PARAM+1 +#define DISPID_IHTMLPARAMELEMENT2_TYPE DISPID_PARAM+3 +#define DISPID_IHTMLPARAMELEMENT2_VALUE DISPID_PARAM+2 +#define DISPID_IHTMLPARAMELEMENT2_IE8_VALUETYPE DISPID_IE8_PARAM + /* IHTMLFrameBase */ #define DISPID_IHTMLFRAMEBASE_SRC DISPID_FRAMESITE+0 #define DISPID_IHTMLFRAMEBASE_NAME STDPROPID_XOBJ_NAME diff --git a/include/mshtml.idl b/include/mshtml.idl index d04494a..0269b66 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15058,7 +15058,79 @@ interface IHTMLObjectElement : IDispatch } /***************************************************************************** - * DispHTMLObjectElement interface + * IHTMLParamElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f83d-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLParamElement : IDispatch +{ + [propput, id(DISPID_IHTMLPARAMELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_VALUE), displaybind, bindable] + HRESULT value([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_TYPE), displaybind, bindable] + HRESULT type([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT_VALUETYPE), displaybind, bindable] + HRESULT valueType([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_VALUETYPE), displaybind, bindable] + HRESULT valueType([retval, out] BSTR *p); +} + +/***************************************************************************** + * IHTMLParamElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510444-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLParamElement2 : IDispatch +{ + [propput, id(DISPID_IHTMLPARAMELEMENT2_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT2_NAME), displaybind, bindable] + HRESULT name([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT2_TYPE), displaybind, bindable] + HRESULT type([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT2_TYPE), displaybind, bindable] + HRESULT type([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT2_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT2_VALUE), displaybind, bindable] + HRESULT value([retval, out] BSTR *p); + + [propput, id(DISPID_IHTMLPARAMELEMENT2_IE8_VALUETYPE)] + HRESULT valueType([in] BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT2_IE8_VALUETYPE)] + HRESULT valueType([retval, out] BSTR *p); +} + +/***************************************************************************** + * DispHTMLObjectElement dispinterface */ [ hidden, @@ -15227,6 +15299,50 @@ methods: } /***************************************************************************** + * DispHTMLParamElement dispinterface + */ +[ + hidden, + uuid(3050f590-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLParamElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLPARAMELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLPARAMELEMENT_VALUE), displaybind, bindable] + void value(BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_VALUE), displaybind, bindable] + BSTR value(); + + [propput, id(DISPID_IHTMLPARAMELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propput, id(DISPID_IHTMLPARAMELEMENT_VALUETYPE), displaybind, bindable] + void valueType(BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT_VALUETYPE), displaybind, bindable] + BSTR valueType(); + + [propput, id(DISPID_IHTMLPARAMELEMENT2_IE8_VALUETYPE)] + void ie8_valueType(BSTR v); + + [propget, id(DISPID_IHTMLPARAMELEMENT2_IE8_VALUETYPE)] + BSTR ie8_valueType(); +} + +/***************************************************************************** * IHTMLFrameBase interface */ [

1 0

Thomas Mullaly : urlmon: Added stub for CoInternetParseIUri.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: bc71921f36978d7cbea7142a8b1ff52b519b716b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc71921f36978d7cbea7142a8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Nov 14 17:16:10 2010 -0500 urlmon: Added stub for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 38 +++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 580dfa3..81053de 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -68,6 +68,7 @@ static HRESULT (WINAPI *pCreateIUriBuilder)(IUri*, DWORD, DWORD_PTR, IUriBuilder static HRESULT (WINAPI *pCoInternetCombineIUri)(IUri*,IUri*,DWORD,IUri**,DWORD_PTR); static HRESULT (WINAPI *pCoInternetGetSession)(DWORD,IInternetSession**,DWORD); static HRESULT (WINAPI *pCoInternetCombineUrlEx)(IUri*,LPCWSTR,DWORD,IUri**,DWORD_PTR); +static HRESULT (WINAPI *pCoInternetParseIUri)(IUri*,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD_PTR); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -9441,6 +9442,57 @@ static void test_CoInternetCombineUrlEx_Pluggable(void) { if(base) IUri_Release(base); } +static void test_CoInternetParseIUri_InvalidArgs(void) { + HRESULT hr; + IUri *uri = NULL; + WCHAR tmp[3]; + DWORD result = -1; + + hr = pCoInternetParseIUri(NULL, PARSE_CANONICALIZE, 0, tmp, 3, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = -1; + hr = pCoInternetParseIUri(uri, PARSE_CANONICALIZE, 0, NULL, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + + hr = pCoInternetParseIUri(uri, PARSE_CANONICALIZE, 0, tmp, 3, NULL, 0); + ok(hr == E_POINTER, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + result = -1; + hr = pCoInternetParseIUri(uri, PARSE_SECURITY_URL, 0, tmp, 3, &result, 0); + ok(hr == E_FAIL, "Error: CoInternetParseIUri returned 0x%08x expected 0x%08x.\n", + hr, E_FAIL); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + + result = -1; + hr = pCoInternetParseIUri(uri, PARSE_MIME, 0, tmp, 3, &result, 0); + ok(hr == E_FAIL, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_FAIL); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + + result = -1; + hr = pCoInternetParseIUri(uri, PARSE_SERVER, 0, tmp, 3, &result, 0); + ok(hr == E_FAIL, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_FAIL); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + + result = -1; + hr = pCoInternetParseIUri(uri, PARSE_SECURITY_DOMAIN, 0, tmp, 3, &result, 0); + ok(hr == E_FAIL, "Error: CoInternetParseIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_FAIL); + ok(!result, "Error: Expected 'result' to be 0, but was %d.\n", result); + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -9451,6 +9503,7 @@ START_TEST(uri) { pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); pCoInternetCombineIUri = (void*) GetProcAddress(hurlmon, "CoInternetCombineIUri"); pCoInternetCombineUrlEx = (void*) GetProcAddress(hurlmon, "CoInternetCombineUrlEx"); + pCoInternetParseIUri = (void*) GetProcAddress(hurlmon, "CoInternetParseIUri"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -9529,6 +9582,9 @@ START_TEST(uri) { trace("test CoInternetCombineUrlEx...\n"); test_CoInternetCombineUrlEx(); + trace("test CoInternetParseIUri Invalid Args...\n"); + test_CoInternetParseIUri_InvalidArgs(); + register_protocols(); trace("test CoInternetCombineIUri pluggable...\n"); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 61140c0..cad7c98 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6080,3 +6080,41 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW IUri_Release(relative); return hr; } + +/*********************************************************************** + * CoInternetParseIUri (urlmon.@) + */ +HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD dwFlags, + LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, + DWORD_PTR dwReserved) +{ + HRESULT hr; + + TRACE("(%p %d %x %p %d %p %x)\n", pIUri, ParseAction, dwFlags, pwzResult, + cchResult, pcchResult, (DWORD)dwReserved); + + if(!pcchResult) + return E_POINTER; + + if(!pwzResult || !pIUri) { + *pcchResult = 0; + return E_INVALIDARG; + } + + switch(ParseAction) { + case PARSE_SECURITY_URL: + case PARSE_MIME: + case PARSE_SERVER: + case PARSE_SECURITY_DOMAIN: + *pcchResult = 0; + hr = E_FAIL; + break; + default: + *pcchResult = 0; + hr = E_NOTIMPL; + FIXME("(%p %d %x %p %d %p %x) Partial stub.\n", pIUri, ParseAction, dwFlags, + pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + } + + return hr; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index a4173d7..9d3de3a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -21,6 +21,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetIsFeatureEnabled(long long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) +@ stdcall CoInternetParseIUri(ptr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long) @ stub CompareSecurityIds diff --git a/include/urlmon.idl b/include/urlmon.idl index 7a92e21..d1eee68 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1935,6 +1935,7 @@ cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCombineIUri(IUri*,IUri*,DWORD,IUri**,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetParseIUri(IUri*,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR,LPWSTR*,PSUACTION,DWORD);")

1 0

Thomas Mullaly : urlmon: Added implementation for PARSE_CANONICALIZE in CoInternetParseIUri.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 8cf81d912f33c9d5b40d6969aea398f5568df359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf81d912f33c9d5b40d6969a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Nov 15 16:51:56 2010 -0500 urlmon: Added implementation for PARSE_CANONICALIZE in CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 88 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cf81d912f33c9d5b40d6…

1 0

Jacek Caban : mshtml: Added IHTMLStyle::padding property implementation.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 991104b97f6999ca9978c088b2f8c710ea6a93c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991104b97f6999ca9978c088b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:18:48 2010 +0100 mshtml: Added IHTMLStyle::padding property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index cb86b79..6bd74ad 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -129,6 +129,8 @@ static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; +static const WCHAR attrPadding[] = + {'p','a','d','d','i','n','g',0}; static const WCHAR attrPaddingBottom[] = {'p','a','d','d','i','n','g','-','b','o','t','t','o','m',0}; static const WCHAR attrPaddingLeft[] = @@ -213,6 +215,7 @@ static const struct{ {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, + {attrPadding, DISPID_IHTMLSTYLE_PADDING}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, {attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT}, @@ -1416,15 +1419,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_PADDING, v, 0); } static HRESULT WINAPI HTMLStyle_get_padding(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_PADDING, p); } static HRESULT WINAPI HTMLStyle_put_border(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 7168eec..3d1f018 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -82,6 +82,7 @@ typedef enum { STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, + STYLEID_PADDING, STYLEID_PADDING_BOTTOM, STYLEID_PADDING_LEFT, STYLEID_PADDING_RIGHT, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8cf678a..e3b932c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4976,6 +4976,22 @@ static void test_default_style(IHTMLStyle *style) ok(!V_BSTR(&v), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + /* padding */ + hres = IHTMLStyle_get_padding(style, &str); + ok(hres == S_OK, "get_padding failed: %08x\n", hres); + ok(!str, "padding = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("1"); + hres = IHTMLStyle_put_padding(style, str); + ok(hres == S_OK, "put_padding failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_padding(style, &str); + ok(hres == S_OK, "get_padding failed: %08x\n", hres); + ok(!strcmp_wa(str, "1px"), "padding = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* PaddingLeft */ hres = IHTMLStyle_get_paddingLeft(style, &vDefault); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added SetUIHandler tests.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: f82668f23e39f380b71f7cde80b9aaf756159e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82668f23e39f380b71f7cde8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:18:35 2010 +0100 mshtml: Added SetUIHandler tests. --- dlls/mshtml/tests/htmldoc.c | 111 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 104 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f82668f23e39f380b71f7…

1 0

Jacek Caban : mshtml: Added ICustomDoc::SetUIHandler implementation.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 0863625bcc763e3e53aa061551e200510f6d77e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0863625bcc763e3e53aa06155… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 29 00:18:01 2010 +0100 mshtml: Added ICustomDoc::SetUIHandler implementation. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f0b7056..803ded3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2087,6 +2087,8 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) IAdviseSink_Release(This->view_sink); if(This->client) IOleObject_SetClientSite(OLEOBJ(&This->basedoc), NULL); + if(This->hostui) + ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL); if(This->in_place_active) IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(&This->basedoc)); if(This->ipsite) @@ -2114,8 +2116,31 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) { HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, pUIHandler); - return E_NOTIMPL; + IOleCommandTarget *cmdtrg; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pUIHandler); + + if(This->custom_hostui && This->hostui == pUIHandler) + return S_OK; + + This->custom_hostui = TRUE; + + if(This->hostui) + IDocHostUIHandler_Release(This->hostui); + if(pUIHandler) + IDocHostUIHandler_AddRef(pUIHandler); + This->hostui = pUIHandler; + if(!pUIHandler) + return S_OK; + + hres = IDocHostUIHandler_QueryInterface(pUIHandler, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + FIXME("custom UI handler supports IOleCommandTarget\n"); + IOleCommandTarget_Release(cmdtrg); + } + + return S_OK; } #undef CUSTOMDOC_THIS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5af4247..a14ce01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -411,6 +411,7 @@ struct HTMLDocumentObj { IOleClientSite *client; IDocHostUIHandler *hostui; + BOOL custom_hostui; IOleInPlaceSite *ipsite; IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window;

1 0

Ken Thomases : msxml3: Fix building on Leopard.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: a6b38409be3053e0489e24463d7306b8d0eb5fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b38409be3053e0489e24463… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 26 17:35:20 2010 -0600 msxml3: Fix building on Leopard. --- dlls/msxml3/msxml_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 0e7971e..ddb3f1c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -169,8 +169,8 @@ extern void schemasInit(void); extern void schemasCleanup(void); #ifndef HAVE_XMLFIRSTELEMENTCHILD - static inline xmlNodePtr xmlFirstElementChild(xmlNodePtr parent) - { +static inline xmlNodePtr wine_xmlFirstElementChild(xmlNodePtr parent) +{ xmlNodePtr child; for (child = parent->children; child != NULL; child = child->next) if (child->type == XML_ELEMENT_NODE) @@ -178,6 +178,7 @@ extern void schemasCleanup(void); return child; } +#define xmlFirstElementChild wine_xmlFirstElementChild #endif /* constructors */

1 0