November 2010 - Wine-commits

Jacek Caban : urlmon: Make get_protocol_handler IUri-based.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: fcc1dd01f759e5862ac7beafeda6c0759e2e802f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc1dd01f759e5862ac7beafe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:37:35 2010 +0100 urlmon: Make get_protocol_handler IUri-based. --- dlls/urlmon/bindprot.c | 9 +-------- dlls/urlmon/session.c | 29 ++++++++++++++++------------- dlls/urlmon/urlmon_main.h | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 4acef40..68e1dec 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -541,15 +541,8 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(!protocol) { IClassFactory *cf; IUnknown *unk; - BSTR raw_uri; - /* FIXME: Avoid GetRawUri here */ - hres = IUri_GetRawUri(pUri, &raw_uri); - if(FAILED(hres)) - return hres; - - hres = get_protocol_handler(raw_uri, &clsid, &urlmon_protocol, &cf); - SysFreeString(raw_uri); + hres = get_protocol_handler(pUri, &clsid, &urlmon_protocol, &cf); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 4c9281a..72a3e2a 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -236,23 +236,22 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) return ret; } -HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, BOOL *urlmon_protocol, IClassFactory **ret) +HRESULT get_protocol_handler(IUri *uri, CLSID *clsid, BOOL *urlmon_protocol, IClassFactory **ret) { name_space *ns; - WCHAR schema[64]; - DWORD schema_len; + BSTR scheme; HRESULT hres; *ret = NULL; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); - if(FAILED(hres) || !schema_len) - return schema_len ? hres : MK_E_SYNTAX; + /* FIXME: Avoid GetSchemeName call for known schemes */ + hres = IUri_GetSchemeName(uri, &scheme); + if(FAILED(hres)) + return hres; EnterCriticalSection(&session_cs); - ns = find_name_space(schema); + ns = find_name_space(scheme); if(ns) { *ret = ns->cf; IClassFactory_AddRef(*ret); @@ -264,12 +263,16 @@ HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, BOOL *urlmon_protocol, I LeaveCriticalSection(&session_cs); - if(*ret) - return S_OK; + if(*ret) { + hres = S_OK; + }else { + if(urlmon_protocol) + *urlmon_protocol = FALSE; + hres = get_protocol_cf(scheme, SysStringLen(scheme), clsid, ret); + } - if(urlmon_protocol) - *urlmon_protocol = FALSE; - return get_protocol_cf(schema, schema_len, clsid, ret); + SysFreeString(scheme); + return hres; } IInternetProtocol *get_mime_filter(LPCWSTR mime) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 239182e..2d719cb 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -66,7 +66,7 @@ static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_ref #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) IInternetProtocolInfo *get_protocol_info(LPCWSTR); -HRESULT get_protocol_handler(LPCWSTR,CLSID*,BOOL*,IClassFactory**); +HRESULT get_protocol_handler(IUri*,CLSID*,BOOL*,IClassFactory**); IInternetProtocol *get_mime_filter(LPCWSTR); BOOL is_registered_protocol(LPCWSTR); void register_urlmon_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL);

1 0

Jacek Caban : urlmon: Make Binding object IUri-based.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 29692adf40eb0ca9daad8665ca168688475b64af URL: http://source.winehq.org/git/wine.git/?a=commit;h=29692adf40eb0ca9daad8665c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:38:06 2010 +0100 urlmon: Make Binding object IUri-based. --- dlls/urlmon/binding.c | 75 ++++++++++++++++++++------------------------- dlls/urlmon/umon.c | 21 +++++++++++- dlls/urlmon/urlmon_main.h | 4 +- 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index c27213a..699bf98 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -18,6 +18,7 @@ #include "urlmon_main.h" #include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -889,10 +890,9 @@ static ULONG WINAPI Binding_Release(IBinding *iface) ReleaseBindInfo(&This->bindinfo); This->section.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->section); + SysFreeString(This->url); heap_free(This->mime); heap_free(This->redirect_url); - heap_free(This->url); - heap_free(This); URLMON_UnlockModule(); @@ -1264,7 +1264,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, return hres; } case BINDSTRING_URL: { - DWORD size = (strlenW(This->url)+1) * sizeof(WCHAR); + DWORD size = (SysStringLen(This->url)+1) * sizeof(WCHAR); if(!ppwzStr || !pcElFetched) return E_INVALIDARG; @@ -1399,42 +1399,29 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) return hres; } -static BOOL is_urlmon_protocol(LPCWSTR url) -{ - static const WCHAR wszCdl[] = {'c','d','l'}; - static const WCHAR wszFile[] = {'f','i','l','e'}; - static const WCHAR wszFtp[] = {'f','t','p'}; - static const WCHAR wszGopher[] = {'g','o','p','h','e','r'}; - static const WCHAR wszHttp[] = {'h','t','t','p'}; - static const WCHAR wszHttps[] = {'h','t','t','p','s'}; - static const WCHAR wszMk[] = {'m','k'}; - - static const struct { - LPCWSTR scheme; - int len; - } protocol_list[] = { - {wszCdl, sizeof(wszCdl) /sizeof(WCHAR)}, - {wszFile, sizeof(wszFile) /sizeof(WCHAR)}, - {wszFtp, sizeof(wszFtp) /sizeof(WCHAR)}, - {wszGopher, sizeof(wszGopher)/sizeof(WCHAR)}, - {wszHttp, sizeof(wszHttp) /sizeof(WCHAR)}, - {wszHttps, sizeof(wszHttps) /sizeof(WCHAR)}, - {wszMk, sizeof(wszMk) /sizeof(WCHAR)} - }; - - unsigned int i; - int len = lstrlenW(url); +static BOOL is_urlmon_protocol(IUri *uri) +{ + DWORD scheme; + HRESULT hres; - for(i=0; i < sizeof(protocol_list)/sizeof(protocol_list[0]); i++) { - if(len >= protocol_list[i].len - && !memcmp(url, protocol_list[i].scheme, protocol_list[i].len*sizeof(WCHAR))) - return TRUE; + hres = IUri_GetScheme(uri, &scheme); + if(FAILED(hres)) + return FALSE; + + switch(scheme) { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_MK: + return TRUE; } return FALSE; } -static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, +static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBindCtx *pbc, BOOL to_obj, REFIID riid, Binding **binding) { Binding *ret; @@ -1512,11 +1499,15 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, if(!(ret->bindf & BINDF_ASYNCHRONOUS)) { ret->bindf |= BINDF_NEEDFILE; ret->use_cache_file = TRUE; - }else if(!is_urlmon_protocol(url)) { + }else if(!is_urlmon_protocol(uri)) { ret->bindf |= BINDF_NEEDFILE; } - ret->url = heap_strdupW(url); + hres = IUri_GetDisplayUri(uri, &ret->url); + if(FAILED(hres)) { + IBinding_Release(BINDING(ret)); + return hres; + } if(binding_ctx) { ret->stgmed_buf = binding_ctx->stgmed_buf; @@ -1543,14 +1534,14 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, return S_OK; } -static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, IBindCtx *pbc, +static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBindCtx *pbc, BOOL to_obj, REFIID riid, Binding **ret) { Binding *binding = NULL; HRESULT hres; MSG msg; - hres = Binding_Create(mon, binding_ctx, url, pbc, to_obj, riid, &binding); + hres = Binding_Create(mon, binding_ctx, uri, pbc, to_obj, riid, &binding); if(FAILED(hres)) return hres; @@ -1569,7 +1560,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, BSCF_FIRSTDATANOTIFICATION | (binding_ctx->download_state == END_DOWNLOAD ? BSCF_LASTDATANOTIFICATION : 0), 0, 0); }else { - hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), + hres = IInternetProtocolEx_StartEx(binding->protocol, uri, PROTSINK(binding), BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); TRACE("start ret %08x\n", hres); @@ -1595,7 +1586,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I return S_OK; } -HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +HRESULT bind_to_storage(IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) { Binding *binding = NULL, *binding_ctx; HRESULT hres; @@ -1604,7 +1595,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) binding_ctx = get_bctx_binding(pbc); - hres = start_binding(NULL, binding_ctx, url, pbc, FALSE, riid, &binding); + hres = start_binding(NULL, binding_ctx, uri, pbc, FALSE, riid, &binding); if(binding_ctx) IBinding_Release(BINDING(binding_ctx)); if(FAILED(hres)) @@ -1626,14 +1617,14 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) return hres; } -HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) +HRESULT bind_to_object(IMoniker *mon, IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) { Binding *binding; HRESULT hres; *ppv = NULL; - hres = start_binding(mon, NULL, url, pbc, TRUE, riid, &binding); + hres = start_binding(mon, NULL, uri, pbc, TRUE, riid, &binding); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index fea7b21..fbb00a4 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -200,6 +200,7 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM { URLMoniker *This = MONIKER_THIS(iface); IRunningObjectTable *obj_tbl; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p,%p,%s,%p): stub\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppv); @@ -210,20 +211,36 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM IRunningObjectTable_Release(obj_tbl); } - return bind_to_object(iface, This->URLName, pbc, riid, ppv); + hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = bind_to_object(iface, uri, pbc, riid, ppv); + + IUri_Release(uri); + return hres; } static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, void **ppvObject) { URLMoniker *This = MONIKER_THIS(iface); + IUri *uri; + HRESULT hres; TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); if(pmkToLeft) FIXME("Unsupported pmkToLeft\n"); - return bind_to_storage(This->URLName, pbc, riid, ppvObject); + hres = CreateUri(This->URLName, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = bind_to_storage(uri, pbc, riid, ppvObject); + + IUri_Release(uri); + return hres; } static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 2d719cb..ea33f15 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -74,8 +74,8 @@ HINTERNET get_internet_session(IInternetBindInfo*); LPWSTR get_useragent(void); void free_session(void); -HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); -HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); +HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**); +HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv); HRESULT create_binding_protocol(BOOL,IInternetProtocolEx**); void set_binding_sink(IInternetProtocolEx*,IInternetProtocolSink*,IInternetBindInfo*);

1 0

Detlef Riekenberg : ntdll: Add semi stub for TokenElevationType in NtQueryInformationToken.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 48f3335ffaf86bcfca7bd2149d8beef5846fe336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f3335ffaf86bcfca7bd2149… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 14 19:04:55 2010 +0100 ntdll: Add semi stub for TokenElevationType in NtQueryInformationToken. --- dlls/ntdll/nt.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 13beb74..ba4202f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -269,7 +269,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenSandBoxInert */ 0, /* TokenAuditPolicy */ 0, /* TokenOrigin */ - 0, /* TokenElevationType */ + sizeof(TOKEN_ELEVATION_TYPE), /* TokenElevationType */ 0, /* TokenLinkedToken */ sizeof(TOKEN_ELEVATION), /* TokenElevation */ 0, /* TokenHasRestrictions */ @@ -507,6 +507,13 @@ NTSTATUS WINAPI NtQueryInformationToken( } SERVER_END_REQ; break; + case TokenElevationType: + { + TOKEN_ELEVATION_TYPE *elevation_type = tokeninfo; + FIXME("QueryInformationToken( ..., TokenElevationType, ...) semi-stub\n"); + *elevation_type = TokenElevationTypeFull; + } + break; case TokenElevation: { TOKEN_ELEVATION *elevation = tokeninfo;

1 0

Thomas Mullaly : urlmon: Added stub for CoInternetCombineUrlEx.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 4d9d4b10e0a8833cf981bcef90ff04cb529b7673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9d4b10e0a8833cf981bcef9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Nov 10 22:31:35 2010 -0500 urlmon: Added stub for CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 25 +++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 8c4fd38..c06c4cd 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -67,6 +67,7 @@ static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_P 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 const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -9285,6 +9286,39 @@ static void test_CoInternetCombineIUri_Pluggable(void) { unregister_protocols(); } +static void test_CoInternetCombineUrlEx(void) { + HRESULT hr; + IUri *base, *result; + + base = NULL; + hr = pCreateUri(http_urlW, 0, 0, &base); + ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineUrlEx(base, NULL, 0, &result, 0); + ok(hr == E_UNEXPECTED, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n", + hr, E_UNEXPECTED); + ok(!result, "Error: Expected 'result' to be NULL was %p instead.\n", result); + } + + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineUrlEx(NULL, http_urlW, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n", + hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be NULL, but was %p instead.\n", result); + + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineUrlEx(NULL, NULL, 0, &result, 0); + ok(hr == E_UNEXPECTED, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n", + hr, E_UNEXPECTED); + ok(!result, "Error: Expected 'result' to be NULL, but was %p instead.\n", result); + + hr = pCoInternetCombineUrlEx(base, http_urlW, 0, NULL, 0); + ok(hr == E_POINTER, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + if(base) IUri_Release(base); +} + START_TEST(uri) { HMODULE hurlmon; @@ -9294,6 +9328,7 @@ START_TEST(uri) { pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); pCoInternetCombineIUri = (void*) GetProcAddress(hurlmon, "CoInternetCombineIUri"); + pCoInternetCombineUrlEx = (void*) GetProcAddress(hurlmon, "CoInternetCombineUrlEx"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -9369,6 +9404,9 @@ START_TEST(uri) { trace("test CoInternetCombineIUri...\n"); test_CoInternetCombineIUri(); + trace("test CoInternetCombineUrlEx...\n"); + test_CoInternetCombineUrlEx(); + trace("test CoInternetCombineIUri pluggable...\n"); test_CoInternetCombineIUri_Pluggable(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6ed71e1..518c6d0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6009,3 +6009,28 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d return combine_uri(base, relative, dwCombineFlags, ppCombinedUri); } + +/*********************************************************************** + * CoInternetCombineUrlEx (urlmon.@) + */ +HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, + IUri **ppCombinedUri, DWORD_PTR dwReserved) +{ + TRACE("(%p %s %x %p %x) stub\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + ppCombinedUri, (DWORD)dwReserved); + + if(!ppCombinedUri) + return E_POINTER; + + if(!pwzRelativeUrl) { + *ppCombinedUri = NULL; + return E_UNEXPECTED; + } + + if(!pBaseUri) { + *ppCombinedUri = NULL; + return E_INVALIDARG; + } + + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index ff1adea..a4173d7 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -11,6 +11,7 @@ @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) +@ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) @ stdcall CoInternetCombineIUri(ptr ptr long ptr long) @ stdcall CoInternetCreateSecurityManager(ptr ptr long) diff --git a/include/urlmon.idl b/include/urlmon.idl index e50975d..7a92e21 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1930,6 +1930,7 @@ cpp_quote("HRESULT WINAPI CreateAsyncBindCtx(DWORD, IBindStatusCallback*, IEnumF cpp_quote("HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx*,DWORD,IBindStatusCallback*,IEnumFORMATETC*,IBindCtx**,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCreateSecurityManager(IServiceProvider*,IInternetSecurityManager**,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetCombineUrlEx(IUri*,LPCWSTR,DWORD,IUri**,DWORD_PTR);") 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);")

1 0

Thomas Mullaly : urlmon: Implemented CoInternetCombineUrlEx.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 90738c3464ed829450e3be427890709c14cd0ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=90738c3464ed829450e3be427… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Nov 12 18:30:16 2010 -0500 urlmon: Implemented CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 114 ++++++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/uri.c | 38 ++++++++++++++-- 2 files changed, 138 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90738c3464ed829450e3b…

1 0

Thomas Mullaly : urlmon: Added pluggable protocol support to CoInternetCombineUrlEx.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 41c58b5a2a6ec3d164aad195a1807d0c1f8ff08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c58b5a2a6ec3d164aad195a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Nov 12 18:52:05 2010 -0500 urlmon: Added pluggable protocol support to CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 43 +++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/uri.c | 16 ++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7a148f3..d27d4ed 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -9255,8 +9255,6 @@ static void test_CoInternetCombineIUri_Pluggable(void) { HRESULT hr; IUri *base = NULL; - register_protocols(); - hr = pCreateUri(combine_baseW, 0, 0, &base); ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); if(SUCCEEDED(hr)) { @@ -9290,8 +9288,6 @@ static void test_CoInternetCombineIUri_Pluggable(void) { if(relative) IUri_Release(relative); } if(base) IUri_Release(base); - - unregister_protocols(); } static void test_CoInternetCombineUrlEx(void) { @@ -9413,6 +9409,38 @@ static void test_CoInternetCombineUrlEx(void) { } } +static void test_CoInternetCombineUrlEx_Pluggable(void) { + HRESULT hr; + IUri *base = NULL; + + hr = pCreateUri(combine_baseW, 0, 0, &base); + ok(SUCCEEDED(hr), "Error: CreateUri returned 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + IUri *result = NULL; + + SET_EXPECT(CombineUrl); + + hr = pCoInternetCombineUrlEx(base, combine_relativeW, URL_DONT_SIMPLIFY|URL_FILE_USE_PATHURL|URL_DONT_UNESCAPE_EXTRA_INFO, + &result, 0); + ok(hr == S_OK, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + + CHECK_CALLED(CombineUrl); + + if(SUCCEEDED(hr)) { + BSTR received = NULL; + hr = IUri_GetAbsoluteUri(result, &received); + ok(hr == S_OK, "Error: Expected S_OK, but got 0x%08x instead.\n", hr); + if(SUCCEEDED(hr)) { + ok(!lstrcmpW(combine_resultW, received), "Error: Expected %s, but got %s.\n", + wine_dbgstr_w(combine_resultW), wine_dbgstr_w(received)); + } + SysFreeString(received); + } + if(result) IUri_Release(result); + } + if(base) IUri_Release(base); +} + START_TEST(uri) { HMODULE hurlmon; @@ -9501,6 +9529,13 @@ START_TEST(uri) { trace("test CoInternetCombineUrlEx...\n"); test_CoInternetCombineUrlEx(); + register_protocols(); + trace("test CoInternetCombineIUri pluggable...\n"); test_CoInternetCombineIUri_Pluggable(); + + trace("test CoInternetCombineUrlEx Pluggable...\n"); + test_CoInternetCombineUrlEx_Pluggable(); + + unregister_protocols(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 22829fa..61140c0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6028,6 +6028,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW IUri *relative; Uri *base; HRESULT hr; + IInternetProtocolInfo *info; TRACE("(%p %s %x %p %x) stub\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); @@ -6053,6 +6054,21 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW return E_NOTIMPL; } + info = get_protocol_info(base->canon_uri); + if(info) { + WCHAR result[INTERNET_MAX_URL_LENGTH+1]; + DWORD result_len = 0; + + hr = IInternetProtocolInfo_CombineUrl(info, base->canon_uri, pwzRelativeUrl, dwCombineFlags, + result, INTERNET_MAX_URL_LENGTH+1, &result_len, 0); + IInternetProtocolInfo_Release(info); + if(SUCCEEDED(hr)) { + hr = CreateUri(result, Uri_CREATE_ALLOW_RELATIVE, 0, ppCombinedUri); + if(SUCCEEDED(hr)) + return hr; + } + } + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL;

1 0

Austin English : msiexec: Add a manpage.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 97d11dbf596b120a256659ba0fd164bae654ba3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d11dbf596b120a256659ba0… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 14 03:37:22 2010 -0800 msiexec: Add a manpage. --- .gitignore | 1 + programs/msiexec/Makefile.in | 12 +++++ programs/msiexec/msiexec.man.in | 104 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6085e68..945c830 100644 --- a/.gitignore +++ b/.gitignore @@ -260,6 +260,7 @@ loader/wine.fr.man loader/wine.man loader/wine64 programs/Makeprog.rules +programs/msiexec/msiexec.man programs/rpcss/epm.h programs/rpcss/epm_s.c programs/rpcss/irot.h diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index f3eee0d..63026b6 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -9,6 +9,18 @@ C_SRCS = \ RC_SRCS = rsrc.rc +MANPAGES = msiexec.man + SVG_SRCS = msiexec.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) msiexec.man $(DESTDIR)$(mandir)/man$(prog_manext)/msiexec.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/msiexec.$(prog_manext) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in new file mode 100644 index 0000000..780839f --- /dev/null +++ b/programs/msiexec/msiexec.man.in @@ -0,0 +1,104 @@ +.TH MSIEXEC 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +msiexec \- Wine MSI Installer +.SH SYNOPSIS +.BR "msiexec "\fIcommand\fR " \fI{required parameter}\fR \fI[optional parameter]\fR"... +.SH DESCRIPTION +.B msiexec +is the Wine MSI installer, which is command line +compatible with its Microsoft Windows counterpart. +.SH INSTALL OPTIONS +.IP "\fl/i {package|productcode} [property=foobar]\fR" +Install {package|productcode} with property=foobar. +.IP "\fl/a {package|productcode} [property=foobar]\fR" +Install {package|productcode} in administrator (network) mode. +.IP "\fx/x {package|productcode} [property=foobar]\fR" +Uninstall {package|productcode} with property=foobar. +.IP "\fx/uninstall {package|productcode} [property=foobar]\fR" +Same as /x. +.SH REPAIR OPTIONS +.IP "\fl/f [p|o|e|d|c|a|u|m|s|v] {package|productcode}\fR" +Repair an installation. Default options are \'omus\' +.IP "\flp\fR" +Reinstall the file if it is missing. +.IP "\flo\fR" +Reinstall the file if it is missing or if any older version is installed. +.IP "\fle\fR" +Reinstall the file if it is missing, or if the installed version is equal or older. +.IP "\fld\fR" +Reinstall the file if it is missing or a different version is installed. +.IP "\flc\fR" +Reinstall the file if it is missing or the checksum does not match. +.IP "\fla\fR" +Reinstall all files. +.IP "\flu\fR" +Rewrite all required user registry entries. +.IP "\flm\fR" +Rewrite all required machine registry entries. +.IP "\fls\fR" +Overwrite any conflicting shortcuts. +.IP "\flv\fR" +Recache the local installation package from the source installation package. +.SH PATCHING +.IP "\fx/p {patch} [property=foobar]\fR" +Apply {patch}. This should not be used with any of the above options. +.SH UI CONTOL +.IP "\fx/q{|n|b|r|f}\fR" +These options allow changing the behavior of the UI when installing MSI packages. +.IP "\fx/q\fR" +Show no UI. +.IP "\fx/qn\fR" +Same as /q. +.IP "\fx/qb\fR" +Show a basic UI. +.IP "\fx/qr\fR" +Shows a reduced user UI. +.IP "\fx/qf\fR" +Shows a full UI. +.SH LOGGING +.IP "\fl/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] {logfile}\fR" +Enable logging to {logfile}. Defaults are \'iwearmo\'. +.IP "\fl*\fR" +Enable all logging options except \'v\' and \'x\'. +.IP "\fli\fR" +Log status messages. +.IP "\flw\fR" +Log nonfatal warnings. +.IP "\fle\fR" +Log all error messages. +.IP "\fla\fR" +Log start of actions. +.IP "\flr\fR" +Log action specifc records. +.IP "\flu\fR" +Log user requests. +.IP "\flc\fR" +Log initial UI parameters. +.IP "\flm\fR" +Log out of memory errors. +.IP "\flo\fR" +Log out of diskspace messages. +.IP "\flp \fR" +Log terminal properties. +.IP "\flv \fR" +Verbose logging. +.IP "\flx \fR" +Log extra debugging messages. +.IP "\fl+ \fR" +Append logging to existing file. +.IP "\fl! \fR" +Flush each line to log. +.SH OTHER OPTIONS +.IP "\fx/h\fR" +Show help. +.IP "\fx/j[u|m] {package|productcode} [/t transform] [/g languageid] \fR" +Advertise {package} optionally with /t {transform} and /g {languageid}. +.IP "\fx/y\fR" +Register MSI service. +.IP "\fx/z\fR" +Unregister MSI service. +.IP "\fx/?\fR" +Same as /h. + +.SH "SEE ALSO" +.BR wine(1),

1 0

Jacek Caban : urlmon: Don' t forward Start call to protocol handler in BindProtocol.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 8c634443d001d42e7fbf246108b37a51da736d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c634443d001d42e7fbf24610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 15 12:36:01 2010 +0100 urlmon: Don't forward Start call to protocol handler in BindProtocol. --- dlls/urlmon/bindprot.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 3b07809..956b6a5 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -408,16 +408,21 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU DWORD grfPI, HANDLE_PTR dwReserved) { BindProtocol *This = PROTOCOL_THIS(iface); + IUri *uri; + HRESULT hres; TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - if(This->protocol_handler != (IInternetProtocol*)PROTOCOLHANDLER(This)) { - FIXME("This->protocol_handler != PROTOCOLHANDLER(This)\n"); - return E_FAIL; - } + hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = IInternetProtocolEx_StartEx(PROTOCOLEX(This), uri, pOIProtSink, pOIBindInfo, + grfPI, (HANDLE*)dwReserved); - return IInternetProtocolEx_Start(PROTOCOLHANDLER(This), szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved); + IUri_Release(uri); + return hres; } static HRESULT WINAPI BindProtocol_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData) @@ -591,22 +596,8 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocolEx *iface, LPCWSTR IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) { - BindProtocol *This = PROTOCOLHANDLER_THIS(iface); - IUri *uri; - HRESULT hres; - - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, - pOIBindInfo, grfPI, dwReserved); - - hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); - if(FAILED(hres)) - return hres; - - hres = IInternetProtocolEx_StartEx(PROTOCOLHANDLER(This), uri, pOIProtSink, pOIBindInfo, - grfPI, (HANDLE*)dwReserved); - - IUri_Release(uri); - return hres; + ERR("Should not be called\n"); + return E_NOTIMPL; } static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData)

1 0

Cheer Xiao : wordpad: Update Simplified Chinese translation.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: 5ee61dd51da2a9028716d9dd11cd5c60ea0cca2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee61dd51da2a9028716d9dd1… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:58 2010 +0800 wordpad: Update Simplified Chinese translation. --- programs/wordpad/Zh.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index cd13c71..b2689fa 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -61,7 +61,7 @@ BEGIN MENUITEM SEPARATOR POPUP "其他(&X)" BEGIN - MENUITEM "选中信息(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "选中信息(&I)", ID_EDIT_SELECTIONINFO /* 准确性待议 */ MENUITEM "文字格式(&F)", ID_EDIT_CHARFORMAT MENUITEM "默认格式(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "段落格式(&H)", ID_EDIT_PARAFORMAT @@ -118,7 +118,7 @@ BEGIN BEGIN MENUITEM "黑色", ID_COLOR_BLACK /* 未找到“标准译名表” */ MENUITEM "栗色", ID_COLOR_MAROON - MENUITEM "调和绿", ID_COLOR_GREEN + MENUITEM "绿色", ID_COLOR_GREEN MENUITEM "橄榄色" ID_COLOR_OLIVE MENUITEM "藏青" ID_COLOR_NAVY MENUITEM "紫色" ID_COLOR_PURPLE @@ -126,7 +126,7 @@ BEGIN MENUITEM "灰色" ID_COLOR_GRAY MENUITEM "银色" ID_COLOR_SILVER MENUITEM "红色" ID_COLOR_RED - MENUITEM "绿色" ID_COLOR_LIME + MENUITEM "青柠色" ID_COLOR_LIME MENUITEM "黄色" ID_COLOR_YELLOW MENUITEM "蓝色" ID_COLOR_BLUE MENUITEM "洋红" ID_COLOR_FUCHSIA /* =magenta? */

1 0

Cheer Xiao : shell32: Update Simplified Chinese translation.
by Alexandre Julliard 15 Nov '10

15 Nov '10

Module: wine Branch: master Commit: f73654a24bd577a92e7192cafc1e38f91e4efbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73654a24bd577a92e7192caf… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:19:18 2010 +0800 shell32: Update Simplified Chinese translation. --- dlls/shell32/shell32_Zh.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index 9bc21c9..83c5c0e 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -280,14 +280,36 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Music" IDS_COMMON_PICTURES "Pictures" IDS_COMMON_VIDEO "Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CONTACTS "Contacts" + IDS_LINKS "Links" + IDS_PHOTO_ALBUMS "Pictures\\Slide Shows" + IDS_PLAYLISTS "Music\\Playlists" + IDS_PUBLIC_DOWNLOADS "Downloads" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "Music\\Sample Music" + IDS_SAMPLE_PICTURES "Pictures\\Sample Pictures" + IDS_SAMPLE_PLAYLISTS "Music\\Sample Playlists" + IDS_SAMPLE_VIDEOS "Videos\\Sample Videos" + IDS_SAVED_GAMES "Saved Games" + IDS_SAVED_SEARCHES "Searches" + IDS_USER_PROFILES "Users" + IDS_COMMON_OEM_LINKS "OEM Links" + IDS_DOCUMENTS "Documents" + IDS_DOWNLOADS "Downloads" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" + IDS_NEWFOLDER "新文件夹" /**/

1 0