May 2018 - Wine-commits - list.winehq.org

Hua Meng : msvcp: Add a stub of _Concurrent_vector_base_v4.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 7cba9cfe412d6df4afdaee46e0b94fd1b0e96a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cba9cfe412d6df4afdaee46… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Wed May 9 18:03:46 2018 +0200 msvcp: Add a stub of _Concurrent_vector_base_v4. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 48 ++++++------- dlls/msvcp100/msvcp100.spec | 48 ++++++------- dlls/msvcp110/msvcp110.spec | 72 +++++++++---------- dlls/msvcp120/msvcp120.spec | 72 +++++++++---------- dlls/msvcp120_app/msvcp120_app.spec | 72 +++++++++---------- dlls/msvcp90/misc.c | 134 ++++++++++++++++++++++++++++++++++++ 6 files changed, 290 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cba9cfe412d6df4afda…

1 0

Jacek Caban : urlmon: Use protocol handler' s IUnknown to query other interfaces in BindProtocol.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 5082e4df25dfd8bb558330557b324345d9637e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5082e4df25dfd8bb55833055… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:58:27 2018 +0200 urlmon: Use protocol handler's IUnknown to query other interfaces in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 3d332c2..38187e9 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -286,11 +286,11 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); - if(This->protocol) { + if(This->protocol_unk) { IWinInetInfo *inet_info; HRESULT hres; - hres = IInternetProtocol_QueryInterface(This->protocol, &IID_IWinInetInfo, (void**)&inet_info); + hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IWinInetInfo, (void**)&inet_info); if(SUCCEEDED(hres)) { *ppv = &This->IWinInetHttpInfo_iface; IWinInetInfo_Release(inet_info); @@ -299,11 +299,11 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); - if(This->protocol) { + if(This->protocol_unk) { IWinInetHttpInfo *http_info; HRESULT hres; - hres = IInternetProtocol_QueryInterface(This->protocol, &IID_IWinInetHttpInfo, (void**)&http_info); + hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IWinInetHttpInfo, (void**)&http_info); if(SUCCEEDED(hres)) { *ppv = &This->IWinInetHttpInfo_iface; IWinInetHttpInfo_Release(http_info); @@ -557,15 +557,18 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->protocol_unk = protocol_unk; This->protocol = protocol; + if(!protocol_unk) + protocol_unk = (IUnknown*)protocol; + set_binding_sink(This, pOIProtSink, pOIBindInfo); - hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { IInternetPriority_SetPriority(priority, This->priority); IInternetPriority_Release(priority); } - hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetProtocolEx, (void**)&protocolex); + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocolEx, (void**)&protocolex); if(SUCCEEDED(hres)) { hres = IInternetProtocolEx_StartEx(protocolex, pUri, &This->IInternetProtocolSink_iface, &This->IInternetBindInfo_iface, 0, NULL);

1 0

Jacek Caban : urlmon: Use COM aggregation for urlmon protocols in BindProtocol::StartEx.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 097811f2513e457ebf4afb1d2d21ab90b8684325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=097811f2513e457ebf4afb1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:58:49 2018 +0200 urlmon: Use COM aggregation for urlmon protocols in BindProtocol::StartEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/bindprot.c | 30 ++++++++++-------------------- dlls/urlmon/session.c | 2 +- dlls/urlmon/tests/url.c | 4 ++-- dlls/urlmon/urlmon_main.h | 3 +-- 5 files changed, 15 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 051b23f..543c482 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1510,7 +1510,7 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB ret->protocol = binding_ctx->protocol; IInternetProtocolEx_AddRef(&ret->protocol->IInternetProtocolEx_iface); }else { - hres = create_binding_protocol(TRUE, &ret->protocol); + hres = create_binding_protocol(&ret->protocol); if(FAILED(hres)) { WARN("Could not get protocol handler\n"); IBinding_Release(&ret->IBinding_iface); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 38187e9..87ec23b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -528,25 +528,16 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(FAILED(hres)) return hres; - if(This->from_urlmon) { - hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); - IClassFactory_Release(cf); - if(FAILED(hres)) - return hres; - protocol_unk = (IUnknown*)protocol; - IUnknown_AddRef(protocol_unk); - }else { - hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, - &IID_IUnknown, (void**)&protocol_unk); - IClassFactory_Release(cf); - if(FAILED(hres)) - return hres; + hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, + &IID_IUnknown, (void**)&protocol_unk); + IClassFactory_Release(cf); + if(FAILED(hres)) + return hres; - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); - if(FAILED(hres)) { - IUnknown_Release(protocol_unk); - return hres; - } + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(FAILED(hres)) { + IUnknown_Release(protocol_unk); + return hres; } } @@ -1508,7 +1499,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { BPServiceProvider_QueryService }; -HRESULT create_binding_protocol(BOOL from_urlmon, BindProtocol **protocol) +HRESULT create_binding_protocol(BindProtocol **protocol) { BindProtocol *ret = heap_alloc_zero(sizeof(BindProtocol)); @@ -1523,7 +1514,6 @@ HRESULT create_binding_protocol(BOOL from_urlmon, BindProtocol **protocol) ret->default_protocol_handler.IInternetProtocolSink_iface.lpVtbl = &InternetProtocolSinkHandlerVtbl; ret->ref = 1; - ret->from_urlmon = from_urlmon; ret->apartment_thread = GetCurrentThreadId(); ret->notif_hwnd = get_notif_hwnd(); ret->protocol_handler = &ret->default_protocol_handler.IInternetProtocol_iface; diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index e053f8b..dea1c9f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -439,7 +439,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface, if(pBC || pUnkOuter || ppUnk || dwOption) FIXME("Unsupported arguments\n"); - hres = create_binding_protocol(FALSE, &protocol); + hres = create_binding_protocol(&protocol); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index aa2f3e1..8da0fd8 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2402,8 +2402,8 @@ static HRESULT WINAPI ProtocolCF_CreateInstance(IClassFactory *iface, IUnknown * if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) return E_NOINTERFACE; - todo_wine ok(outer != NULL, "outer == NULL\n"); - todo_wine ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + ok(outer != NULL, "outer == NULL\n"); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = &Protocol; return S_OK; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 1d6faaa..57c74b3 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -195,7 +195,6 @@ typedef struct { BOOL reported_result; BOOL reported_mime; - BOOL from_urlmon; DWORD pi; DWORD bscf; @@ -216,7 +215,7 @@ typedef struct { BSTR display_uri; } BindProtocol; -HRESULT create_binding_protocol(BOOL,BindProtocol**) DECLSPEC_HIDDEN; +HRESULT create_binding_protocol(BindProtocol**) DECLSPEC_HIDDEN; void set_binding_sink(BindProtocol*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; typedef struct {

1 0

Jacek Caban : urlmon/tests: Added more protocol COM aggregation tests.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: fd2fb4a7a5842e40977f2d010caf1b587e688540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd2fb4a7a5842e40977f2d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:59:25 2018 +0200 urlmon/tests: Added more protocol COM aggregation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 118 ++++++++++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 34 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5a9e1f2..1c5ffaf 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1498,6 +1498,9 @@ static IInternetBindInfoVtbl bind_info_vtbl = { static IInternetBindInfo bind_info = { &bind_info_vtbl }; +static IUnknown *protocol_outer; +static ULONG protocol_outer_ref; + static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) { @@ -1507,12 +1510,12 @@ static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, static ULONG WINAPI InternetPriority_AddRef(IInternetPriority *iface) { - return 2; + return ++protocol_outer_ref; } static ULONG WINAPI InternetPriority_Release(IInternetPriority *iface) { - return 1; + return --protocol_outer_ref; } static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LONG nPriority) @@ -1541,12 +1544,12 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; static ULONG WINAPI Protocol_AddRef(IInternetProtocolEx *iface) { - return 2; + return ++protocol_outer_ref; } static ULONG WINAPI Protocol_Release(IInternetProtocolEx *iface) { - return 1; + return --protocol_outer_ref; } static HRESULT WINAPI Protocol_Abort(IInternetProtocolEx *iface, HRESULT hrReason, @@ -1586,39 +1589,15 @@ static HRESULT WINAPI Protocol_Seek(IInternetProtocolEx *iface, static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) { static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + static const IID unknown_iid2 = {0x5b7ebc0c,0xf630,0x4cea,{0x89,0xd3,0x5a,0xf0,0x38,0xed,0x05,0x5c}}; - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { - *ppv = iface; - return S_OK; - } - - if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) { - if(impl_protex) { - *ppv = iface; - return S_OK; - } - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_IInternetPriority, riid)) { + /* FIXME: Why is it calling here instead of outer IUnknown? */ + if(IsEqualGUID(riid, &IID_IInternetPriority)) { *ppv = &InternetPriority; + IInternetPriority_AddRef(&InternetPriority); return S_OK; } - - if(IsEqualGUID(&IID_IWinInetInfo, riid)) { - CHECK_EXPECT(QueryInterface_IWinInetInfo); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); - *ppv = NULL; - return E_NOINTERFACE; - } - - if(!IsEqualGUID(riid, &unknown_iid)) /* IE10 */ + if(!IsEqualGUID(riid, &unknown_iid) && !IsEqualGUID(riid, &unknown_iid2)) /* IE10 */ ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; @@ -2181,6 +2160,64 @@ static const IInternetProtocolExVtbl ProtocolVtbl = { }; static IInternetProtocolEx Protocol = { &ProtocolVtbl }; +static ULONG protocol_inner_ref; + +static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid)) { + trace("QI(IUnknown)\n"); + *ppv = iface; + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + trace("QI(InternetProtocol)\n"); + *ppv = &Protocol; + }else if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) { + trace("QI(InternetProtocolEx)\n"); + if(!impl_protex) { + *ppv = NULL; + return E_NOINTERFACE; + } + *ppv = &Protocol; + return S_OK; + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + trace("QI(InternetPriority)\n"); + *ppv = &InternetPriority; + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + trace("QI(IWinInetInfo)\n"); + CHECK_EXPECT(QueryInterface_IWinInetInfo); + *ppv = NULL; + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + trace("QI(IWinInetHttpInfo)\n"); + CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); + *ppv = NULL; + return E_NOINTERFACE; + }else { + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ProtocolUnk_AddRef(IUnknown *iface) +{ + return ++protocol_inner_ref; +} + +static ULONG WINAPI ProtocolUnk_Release(IUnknown *iface) +{ + return --protocol_inner_ref; +} + +static const IUnknownVtbl ProtocolUnkVtbl = { + ProtocolUnk_QueryInterface, + ProtocolUnk_AddRef, + ProtocolUnk_Release +}; + +static IUnknown ProtocolUnk = { &ProtocolUnkVtbl }; static HRESULT WINAPI MimeProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) { @@ -2472,7 +2509,9 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); - *ppv = &Protocol; + protocol_outer = pOuter; + *ppv = &ProtocolUnk; + IUnknown_AddRef(&ProtocolUnk); return S_OK; } @@ -3658,6 +3697,7 @@ static void test_CreateBinding(void) hres = IInternetSession_RegisterNameSpace(session, &ClassFactory, &IID_NULL, wsz_test, 0, NULL, 0); ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); + protocol_inner_ref = 0; hres = IInternetSession_CreateBinding(session, NULL, test_url, NULL, NULL, &protocol, 0); binding_protocol = protocol; ok(hres == S_OK, "CreateBinding failed: %08x\n", hres); @@ -3702,9 +3742,13 @@ static void test_CreateBinding(void) SET_EXPECT(SetPriority); SET_EXPECT(Start); + trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); ok(hres == S_OK, "Start failed: %08x\n", hres); + trace("Start <\n"); + + ok(protocol_inner_ref == 1, "protocol_inner_ref = %u\n", protocol_inner_ref); CHECK_CALLED(QueryService_InternetProtocol); CHECK_CALLED(CreateInstance); @@ -3754,6 +3798,9 @@ static void test_CreateBinding(void) ok(hres == S_OK, "Terminate failed: %08x\n", hres); CHECK_CALLED(Terminate); + ok(protocol_inner_ref == 1, "protocol_inner_ref = %u\n", protocol_inner_ref); + ok(protocol_outer_ref == 0, "protocol_outer_ref = %u\n", protocol_outer_ref); + SET_EXPECT(Continue); hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); ok(hres == S_OK, "Switch failed: %08x\n", hres); @@ -3784,6 +3831,9 @@ static void test_CreateBinding(void) IInternetBindInfo_Release(prot_bind_info); IInternetProtocol_Release(protocol); + ok(protocol_inner_ref == 0, "protocol_inner_ref = %u\n", protocol_inner_ref); + ok(protocol_outer_ref == 0, "protocol_outer_ref = %u\n", protocol_outer_ref); + hres = IInternetSession_CreateBinding(session, NULL, test_url, NULL, NULL, &protocol, 0); ok(hres == S_OK, "CreateBinding failed: %08x\n", hres); ok(protocol != NULL, "protocol == NULL\n");

1 0

Jacek Caban : urlmon: Support querying interfaces from aggregated handlers in BindProtocol.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 849fef0b82f1a9d933614d74191cbf8efda0e7c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=849fef0b82f1a9d933614d74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:58:59 2018 +0200 urlmon: Support querying interfaces from aggregated handlers in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 87ec23b..1e5ec14 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -309,6 +309,11 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE IWinInetHttpInfo_Release(http_info); } } + }else if(This->protocol_unk) { + HRESULT hres; + hres = IUnknown_QueryInterface(This->protocol_unk, riid, ppv); + TRACE("(%p) aggregated handler returned %08x for %s\n", This, hres, debugstr_guid(riid)); + return hres; }else { WARN("not supported interface %s\n", debugstr_guid(riid)); }

1 0

Jacek Caban : urlmon: Use COM aggregation for IWinInetInfo and IWinInetHttpInfo interfaces in BindProtocol.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: f8f7efd54861ccdfae35de5059abdeb0df5c8467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8f7efd54861ccdfae35de50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:59:16 2018 +0200 urlmon: Use COM aggregation for IWinInetInfo and IWinInetHttpInfo interfaces in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 74 ----------------------------------------------- dlls/urlmon/urlmon_main.h | 1 - 2 files changed, 75 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1e5ec14..5965244 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -283,32 +283,6 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); *ppv = &This->IInternetProtocolSink_iface; - }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { - TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); - - if(This->protocol_unk) { - IWinInetInfo *inet_info; - HRESULT hres; - - hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IWinInetInfo, (void**)&inet_info); - if(SUCCEEDED(hres)) { - *ppv = &This->IWinInetHttpInfo_iface; - IWinInetInfo_Release(inet_info); - } - } - }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); - - if(This->protocol_unk) { - IWinInetHttpInfo *http_info; - HRESULT hres; - - hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IWinInetHttpInfo, (void**)&http_info); - if(SUCCEEDED(hres)) { - *ppv = &This->IWinInetHttpInfo_iface; - IWinInetHttpInfo_Release(http_info); - } - } }else if(This->protocol_unk) { HRESULT hres; hres = IUnknown_QueryInterface(This->protocol_unk, riid, ppv); @@ -1413,53 +1387,6 @@ static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { BPInternetProtocolSink_ReportResult }; -static inline BindProtocol *impl_from_IWinInetHttpInfo(IWinInetHttpInfo *iface) -{ - return CONTAINING_RECORD(iface, BindProtocol, IWinInetHttpInfo_iface); -} - -static HRESULT WINAPI WinInetHttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) -{ - BindProtocol *This = impl_from_IWinInetHttpInfo(iface); - return IInternetProtocolEx_QueryInterface(&This->IInternetProtocolEx_iface, riid, ppv); -} - -static ULONG WINAPI WinInetHttpInfo_AddRef(IWinInetHttpInfo *iface) -{ - BindProtocol *This = impl_from_IWinInetHttpInfo(iface); - return IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); -} - -static ULONG WINAPI WinInetHttpInfo_Release(IWinInetHttpInfo *iface) -{ - BindProtocol *This = impl_from_IWinInetHttpInfo(iface); - return IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); -} - -static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, - void *pBuffer, DWORD *pcbBuffer) -{ - BindProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, - void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) -{ - BindProtocol *This = impl_from_IWinInetHttpInfo(iface); - FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - return E_NOTIMPL; -} - -static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { - WinInetHttpInfo_QueryInterface, - WinInetHttpInfo_AddRef, - WinInetHttpInfo_Release, - WinInetHttpInfo_QueryOption, - WinInetHttpInfo_QueryInfo -}; - static inline BindProtocol *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, BindProtocol, IServiceProvider_iface); @@ -1513,7 +1440,6 @@ HRESULT create_binding_protocol(BindProtocol **protocol) ret->IInternetPriority_iface.lpVtbl = &InternetPriorityVtbl; ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; ret->IInternetProtocolSink_iface.lpVtbl = &InternetProtocolSinkVtbl; - ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->default_protocol_handler.IInternetProtocol_iface.lpVtbl = &InternetProtocolHandlerVtbl; ret->default_protocol_handler.IInternetProtocolSink_iface.lpVtbl = &InternetProtocolSinkHandlerVtbl; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 57c74b3..39dbe2f 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -172,7 +172,6 @@ typedef struct { IInternetPriority IInternetPriority_iface; IServiceProvider IServiceProvider_iface; IInternetProtocolSink IInternetProtocolSink_iface; - IWinInetHttpInfo IWinInetHttpInfo_iface; LONG ref;

1 0

Jacek Caban : urlmon: Query for IWinInet[Http] Info on BindProtocol instead of protocol handler directly.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 040d41df2999b89817dd5aadc269bf00e143825b URL: https://source.winehq.org/git/wine.git/?a=commit;h=040d41df2999b89817dd5aad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 9 14:59:32 2018 +0200 urlmon: Query for IWinInet[Http]Info on BindProtocol instead of protocol handler directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 543c482..c2879b2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -798,16 +798,11 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); /* NOTE: This violidates COM rules, but tests prove that we should do it */ - if(!This->protocol->protocol_unk) - return E_NOINTERFACE; - - if(This->protocol->protocol_unk) { - hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetInfo, - (void**)&wininet_info); - if(SUCCEEDED(hres)) { - IWinInetInfo_Release(wininet_info); - *ppv = &This->IWinInetHttpInfo_iface; - } + hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, + &IID_IWinInetInfo, (void**)&wininet_info); + if(SUCCEEDED(hres)) { + IWinInetInfo_Release(wininet_info); + *ppv = &This->IWinInetHttpInfo_iface; } }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { IWinInetHttpInfo *http_info; @@ -816,13 +811,11 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); /* NOTE: This violidates COM rules, but tests prove that we should do it */ - if(This->protocol->protocol_unk) { - hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo, - (void**)&http_info); - if(SUCCEEDED(hres)) { - IWinInetHttpInfo_Release(http_info); - *ppv = &This->IWinInetHttpInfo_iface; - } + hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, + &IID_IWinInetHttpInfo, (void**)&http_info); + if(SUCCEEDED(hres)) { + IWinInetHttpInfo_Release(http_info); + *ppv = &This->IWinInetHttpInfo_iface; } } @@ -1328,11 +1321,8 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - if(!This->protocol->protocol_unk) - return E_FAIL; - - hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo, - (void**)&wininet_info); + hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, + &IID_IWinInetInfo, (void**)&wininet_info); if(FAILED(hres)) return E_FAIL; @@ -1350,11 +1340,8 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD d TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - if(!This->protocol->protocol_unk) - return E_FAIL; - - hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo, - (void**)&http_info); + hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, + &IID_IWinInetHttpInfo, (void**)&http_info); if(FAILED(hres)) return E_FAIL;

1 0

Piotr Caban : msvcr110: Try SNAME when matching locale.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 7122c9d41da7954acc51c5df3ac028ede95811e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7122c9d41da7954acc51c5df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 9 17:36:17 2018 +0200 msvcr110: Try SNAME when matching locale. Based on patch by Daniel Lehman. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 8 +- dlls/msvcrt/locale.c | 199 ++++++++++++++++++++++++++++++----------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +- 4 files changed, 155 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7122c9d41da7954acc51…

1 0

Fabian Maurer : wineconsole: When loading settings for an application, respect a 0 in FontSize.
by Alexandre Julliard 09 May '18

09 May '18

Module: wine Branch: master Commit: 37654ceba8cf4bf2d654f94d51c7551f9f52af5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=37654ceba8cf4bf2d654f94d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Apr 22 23:34:38 2018 +0200 wineconsole: When loading settings for an application, respect a 0 in FontSize. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 080431a..92c53a7 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { - cfg->cell_height = HIWORD(val); - cfg->cell_width = LOWORD(val); + int height = HIWORD(val); + int width = LOWORD(val); + /* A value of zero reflects the default settings */ + if (height != 0) + { + cfg->cell_height = height; + } + if (width != 0) + { + cfg->cell_width = width; + } } count = sizeof(val);

1 0

Francois Gouget : testbot: Detect and kill stuck task scripts.
by Alexandre Julliard 09 May '18

09 May '18

Module: tools Branch: master Commit: 3ce81c0c6cf9e9829608441ab943da0503492d1d URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ce81c0c6cf9e9829608441… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 9 02:45:31 2018 +0200 testbot: Detect and kill stuck task scripts. The tasks themselves have a timeout which the corresponding scripts enforce. However the scripts themselves may get stuck, typically due to network problems. When that happens they can end up blocking the whole TestBot. So make sure the TestBot engine itself can detect stuck scripts and take corrective action. Note that the detection is not very timely but will happen at the latest in the SafetyNet() function. This means there will be at most a 10 minutes delay. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 7 ++++++- testbot/bin/WineRunBuild.pl | 1 + testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 1 + testbot/ddl/update32.sql | 5 +++++ testbot/ddl/winetestbot.sql | 25 +++++++++++++------------ testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 17 ++++++++++------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 16 +++++++++++++++- testbot/lib/WineTestBot/Tasks.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 11 ++++++++--- testbot/web/admin/VMDetails.pl | 3 ++- 12 files changed, 90 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=3ce81c0c6cf9e982960…

1 0