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

Aric Stewart : winebus: Properly identify SDL joysticks index when hot-plugged.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 5631402651ba39a1990b7668bf8dc58c71302308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5631402651ba39a1990b7668… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 8 10:57:29 2018 -0500 winebus: Properly identify SDL joysticks index when hot-plugged. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e666d04..03e7cb3 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -817,7 +817,7 @@ static void try_add_device(SDL_JoystickID index) if (map_controllers && pSDL_IsGameController(index)) controller = pSDL_GameControllerOpen(index); - id = index; + id = pSDL_JoystickInstanceID(joystick); if (controller) { vid = VID_MICROSOFT; @@ -846,7 +846,7 @@ static void try_add_device(SDL_JoystickID index) if (controller) { TRACE("Found sdl game controller %i (vid %04x, pid %04x, version %u, serial %s)\n", - index, vid, pid, version, debugstr_w(serial)); + id, vid, pid, version, debugstr_w(serial)); is_xbox_gamepad = TRUE; } else @@ -854,14 +854,14 @@ static void try_add_device(SDL_JoystickID index) int button_count, axis_count; TRACE("Found sdl device %i (vid %04x, pid %04x, version %u, serial %s)\n", - index, vid, pid, version, debugstr_w(serial)); + id, vid, pid, version, debugstr_w(serial)); axis_count = pSDL_JoystickNumAxes(joystick); button_count = pSDL_JoystickNumAxes(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); } - device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, version, 0, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, version, id, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private)); if (device) { @@ -885,7 +885,7 @@ static void try_add_device(SDL_JoystickID index) } else { - WARN("Ignoring device %i\n", index); + WARN("Ignoring device %i\n", id); } }

1 0

Jacek Caban : urlmon: Don' t store IWinInetHttpInfo reference in BindProtocol.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 73fd4b09aeda2240e3ad8c9a11f25e491e74bb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73fd4b09aeda2240e3ad8c9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:11 2018 +0200 urlmon: Don't store IWinInetHttpInfo reference in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 31 ++++++++++++++++++++++++------- dlls/urlmon/bindprot.c | 5 ----- dlls/urlmon/urlmon_main.h | 1 - 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 88b3c1c..ea3b81c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -800,12 +800,20 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void *ppv = &This->IWinInetHttpInfo_iface; }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { - TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + IWinInetHttpInfo *http_info; + HRESULT hres; - if(!This->protocol->wininet_http_info) - return E_NOINTERFACE; + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); - *ppv = &This->IWinInetHttpInfo_iface; + /* 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; + } + } } if(*ppv) { @@ -1318,13 +1326,22 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD d void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { Binding *This = impl_from_IWinInetHttpInfo(iface); + IWinInetHttpInfo *http_info; + HRESULT hres; + TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); - if(!This->protocol->wininet_http_info) + if(!This->protocol->protocol_unk) + return E_FAIL; + + hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo, + (void**)&http_info); + if(FAILED(hres)) return E_FAIL; - return IWinInetHttpInfo_QueryInfo(This->protocol->wininet_http_info, - dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + hres = IWinInetHttpInfo_QueryInfo(http_info, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + IWinInetHttpInfo_Release(http_info); + return hres; } static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 6ee9dbc..eeab3d5 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -334,10 +334,6 @@ static void release_protocol_handler(BindProtocol *This) IWinInetInfo_Release(This->wininet_info); This->wininet_info = NULL; } - if(This->wininet_http_info) { - IWinInetHttpInfo_Release(This->wininet_http_info); - This->wininet_http_info = NULL; - } if(This->protocol_unk) { IUnknown_Release(This->protocol_unk); This->protocol_unk = NULL; @@ -568,7 +564,6 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(urlmon_protocol) { IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&This->wininet_http_info); } set_binding_sink(This, pOIProtSink, pOIBindInfo); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index a22d952..b708921 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -179,7 +179,6 @@ typedef struct { IUnknown *protocol_unk; IInternetProtocol *protocol; IWinInetInfo *wininet_info; - IWinInetHttpInfo *wininet_http_info; IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink;

1 0

Louis Lenders : atmlib: Add stub dll.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 7f955f22d317cad1e7d5323179e9a0ee635c9768 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f955f22d317cad1e7d53231… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue May 8 13:48:20 2018 +0200 atmlib: Add stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/atmlib/Makefile.in | 4 +++ dlls/atmlib/atmlib.spec | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/atmlib/main.c | 47 ++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+) diff --git a/configure b/configure index 50badb7..30d53da 100755 --- a/configure +++ b/configure @@ -1107,6 +1107,7 @@ enable_atl100 enable_atl110 enable_atl80 enable_atl90 +enable_atmlib enable_authz enable_avicap32 enable_avifil32 @@ -18423,6 +18424,7 @@ wine_fn_config_makefile dlls/atl110 enable_atl110 wine_fn_config_makefile dlls/atl80 enable_atl80 wine_fn_config_makefile dlls/atl80/tests enable_tests wine_fn_config_makefile dlls/atl90 enable_atl90 +wine_fn_config_makefile dlls/atmlib enable_atmlib wine_fn_config_makefile dlls/authz enable_authz wine_fn_config_makefile dlls/avicap32 enable_avicap32 wine_fn_config_makefile dlls/avifil32 enable_avifil32 diff --git a/configure.ac b/configure.ac index c5e222d..54c31d8 100644 --- a/configure.ac +++ b/configure.ac @@ -3043,6 +3043,7 @@ WINE_CONFIG_MAKEFILE(dlls/atl110) WINE_CONFIG_MAKEFILE(dlls/atl80) WINE_CONFIG_MAKEFILE(dlls/atl80/tests) WINE_CONFIG_MAKEFILE(dlls/atl90) +WINE_CONFIG_MAKEFILE(dlls/atmlib) WINE_CONFIG_MAKEFILE(dlls/authz) WINE_CONFIG_MAKEFILE(dlls/avicap32) WINE_CONFIG_MAKEFILE(dlls/avifil32) diff --git a/dlls/atmlib/Makefile.in b/dlls/atmlib/Makefile.in new file mode 100644 index 0000000..904cbbb --- /dev/null +++ b/dlls/atmlib/Makefile.in @@ -0,0 +1,4 @@ +MODULE = atmlib.dll + +C_SRCS = \ + main.c diff --git a/dlls/atmlib/atmlib.spec b/dlls/atmlib/atmlib.spec new file mode 100644 index 0000000..387486d --- /dev/null +++ b/dlls/atmlib/atmlib.spec @@ -0,0 +1,76 @@ +@ stub ATMAddFont +@ stub ATMAddFontA +@ stub ATMAddFontEx +@ stub ATMAddFontExA +@ stub ATMAddFontExW +@ stub ATMAddFontW +@ stub ATMBBoxBaseXYShowText +@ stub ATMBBoxBaseXYShowTextA +@ stub ATMBBoxBaseXYShowTextW +@ stub ATMBeginFontChange +@ stub ATMClient +@ stub ATMEndFontChange +@ stub ATMEnumFonts +@ stub ATMEnumFontsA +@ stub ATMEnumFontsW +@ stub ATMEnumMMFonts +@ stub ATMEnumMMFontsA +@ stub ATMEnumMMFontsW +@ stub ATMFinish +@ stub ATMFontAvailable +@ stub ATMFontAvailableA +@ stub ATMFontAvailableW +@ stub ATMFontSelected +@ stub ATMFontStatus +@ stub ATMFontStatusA +@ stub ATMFontStatusW +@ stub ATMForceFontChange +@ stub ATMGetBuildStr +@ stub ATMGetBuildStrA +@ stub ATMGetBuildStrW +@ stub ATMGetFontBBox +@ stub ATMGetFontInfo +@ stub ATMGetFontInfoA +@ stub ATMGetFontInfoW +@ stub ATMGetFontPaths +@ stub ATMGetFontPathsA +@ stub ATMGetFontPathsW +@ stub ATMGetGlyphList +@ stub ATMGetGlyphListA +@ stub ATMGetGlyphListW +@ stub ATMGetMenuName +@ stub ATMGetMenuNameA +@ stub ATMGetMenuNameW +@ stub ATMGetNtmFields +@ stub ATMGetNtmFieldsA +@ stub ATMGetNtmFieldsW +@ stub ATMGetOutline +@ stub ATMGetOutlineA +@ stub ATMGetOutlineW +@ stub ATMGetPostScriptName +@ stub ATMGetPostScriptNameA +@ stub ATMGetPostScriptNameW +@ stub ATMGetVersion +@ stub ATMGetVersionEx +@ stub ATMGetVersionExA +@ stub ATMGetVersionExW +@ stub ATMInstallSubstFontA +@ stub ATMInstallSubstFontW +@ stub ATMMakePFM +@ stub ATMMakePFMA +@ stub ATMMakePFMW +@ stub ATMMakePSS +@ stub ATMMakePSSA +@ stub ATMMakePSSW +@ stdcall ATMProperlyLoaded() +@ stub ATMRemoveFont +@ stub ATMRemoveFontA +@ stub ATMRemoveFontW +@ stub ATMRemoveSubstFontA +@ stub ATMRemoveSubstFontW +@ stub ATMSelectEncoding +@ stub ATMSelectObject +@ stub ATMSetFlags +@ stub ATMXYShowText +@ stub ATMXYShowTextA +@ stub ATMXYShowTextW diff --git a/dlls/atmlib/main.c b/dlls/atmlib/main.c new file mode 100644 index 0000000..0baca00 --- /dev/null +++ b/dlls/atmlib/main.c @@ -0,0 +1,47 @@ +/* + * Copyright 2018 Louis Lenders + * + * 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 + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atmlib); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} + +BOOL WINAPI ATMProperlyLoaded(void) +{ + FIXME("stub\n"); + return FALSE; +}

1 0

Jacek Caban : urlmon: Added support for COM aggregation of file protocol handler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 74989b6e4166a4f171672375c2e19092e8068764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74989b6e4166a4f171672375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:27 2018 +0200 urlmon: Added support for COM aggregation of file protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/file.c | 59 ++++++++++++++++++++++++++++++++-------- dlls/urlmon/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 28 +++++++++++++------ 3 files changed, 133 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index bba7be1..9e7f3cf 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -25,9 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { + IUnknown IUnknown_outer; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; + IUnknown *outer; + HANDLE file; ULONG size; LONG priority; @@ -35,6 +38,11 @@ typedef struct { LONG ref; } FileProtocol; +static inline FileProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, FileProtocol, IUnknown_outer); +} + static inline FileProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) { return CONTAINING_RECORD(iface, FileProtocol, IInternetProtocolEx_iface); @@ -45,14 +53,14 @@ static inline FileProtocol *impl_from_IInternetPriority(IInternetPriority *iface return CONTAINING_RECORD(iface, FileProtocol, IInternetPriority_iface); } -static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI FileProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - FileProtocol *This = impl_from_IInternetProtocolEx(iface); + FileProtocol *This = impl_from_IUnknown(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocolEx_iface; + *ppv = &This->IUnknown_outer; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -68,7 +76,7 @@ static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocolEx *iface, RE } if(*ppv) { - IInternetProtocolEx_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } @@ -76,17 +84,17 @@ static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocolEx *iface, RE return E_NOINTERFACE; } -static ULONG WINAPI FileProtocol_AddRef(IInternetProtocolEx *iface) +static ULONG WINAPI FileProtocolUnk_AddRef(IUnknown *iface) { - FileProtocol *This = impl_from_IInternetProtocolEx(iface); + FileProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI FileProtocol_Release(IInternetProtocolEx *iface) +static ULONG WINAPI FileProtocolUnk_Release(IUnknown *iface) { - FileProtocol *This = impl_from_IInternetProtocolEx(iface); + FileProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -102,6 +110,33 @@ static ULONG WINAPI FileProtocol_Release(IInternetProtocolEx *iface) return ref; } +static const IUnknownVtbl FileProtocolUnkVtbl = { + FileProtocolUnk_QueryInterface, + FileProtocolUnk_AddRef, + FileProtocolUnk_Release +}; + +static HRESULT WINAPI FileProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +{ + FileProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI FileProtocol_AddRef(IInternetProtocolEx *iface) +{ + FileProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI FileProtocol_Release(IInternetProtocolEx *iface) +{ + FileProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_Release(This->outer); +} + static HRESULT WINAPI FileProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) @@ -383,22 +418,24 @@ static const IInternetPriorityVtbl FilePriorityVtbl = { FilePriority_GetPriority }; -HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj) { FileProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppobj); URLMON_LockModule(); ret = heap_alloc(sizeof(FileProtocol)); + ret->IUnknown_outer.lpVtbl = &FileProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FileProtocolExVtbl; ret->IInternetPriority_iface.lpVtbl = &FilePriorityVtbl; ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1; + ret->outer = outer ? outer : (IUnknown*)&ret->IUnknown_outer; - *ppobj = &ret->IInternetProtocolEx_iface; + *ppobj = &ret->IUnknown_outer; return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index c153119..f3710fc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -125,6 +125,7 @@ DEFINE_EXPECT(MimeFilter_Continue); DEFINE_EXPECT(Stream_Seek); DEFINE_EXPECT(Stream_Read); DEFINE_EXPECT(Redirect); +DEFINE_EXPECT(outer_QI_test); static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR index_url[] = @@ -3964,6 +3965,68 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) IInternetSession_Release(session); } +static const IID outer_test_iid = {0xabcabc00,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(protocol) { HMODULE hurlmon; @@ -4037,5 +4100,7 @@ START_TEST(protocol) CloseHandle(event_continue); CloseHandle(event_continue_done); + test_com_aggregation(&CLSID_FileProtocol); + OleUninitialize(); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index c4f1cec..5968a6c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -303,19 +303,31 @@ static ULONG WINAPI CF_Release(IClassFactory *iface) } -static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) { ClassFactory *This = impl_from_IClassFactory(iface); + IUnknown *unk; HRESULT hres; - LPUNKNOWN punk; - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + TRACE("(%p)->(%p %s %p)\n", This, outer, debugstr_guid(riid), ppv); - *ppobj = NULL; - if(SUCCEEDED(hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk))) { - hres = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); + if(outer && !IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = This->pfnCreateInstance(outer, (void**)&unk); + if(FAILED(hres)) { + *ppv = NULL; + return hres; + } + + if(!IsEqualGUID(riid, &IID_IUnknown)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + }else { + *ppv = unk; } return hres; }

1 0

Jacek Caban : urlmon: Release protocol handler in BindProtocol::Terminate.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 114b07054313a0c0259bdebb4b5bffd9e943e764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=114b07054313a0c0259bdebb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:22 2018 +0200 urlmon: Release protocol handler in BindProtocol::Terminate. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 35 ++++++++++++++++++++++++++++++++--- dlls/urlmon/tests/protocol.c | 10 ++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 4b8069f..3d332c2 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -681,13 +681,24 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = impl_from_IInternetProtocol(iface); + IInternetProtocol *protocol; HRESULT hres; TRACE("(%p)->(%p)\n", This, pProtocolData); - hres = IInternetProtocol_Continue(This->protocol, pProtocolData); + /* FIXME: This should not be needed. */ + if(!This->protocol && This->protocol_unk) { + hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(FAILED(hres)) + return E_FAIL; + }else { + IInternetProtocol_AddRef(protocol = This->protocol); + } + + hres = IInternetProtocol_Continue(protocol, pProtocolData); heap_free(pProtocolData); + IInternetProtocol_Release(protocol); return hres; } @@ -716,7 +727,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD /* This may get released in Terminate call. */ IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); - IInternetProtocol_Terminate(This->protocol, 0); + if(This->protocol) { + IInternetProtocol_Terminate(This->protocol, 0); + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } set_binding_sink(This, NULL, NULL); @@ -772,14 +787,28 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, } if(read < cb) { + IInternetProtocol *protocol; ULONG cread = 0; + /* FIXME: We shouldn't need it, but out binding code currently depends on it. */ + if(!This->protocol && This->protocol_unk) { + hres = IUnknown_QueryInterface(This->protocol_unk, &IID_IInternetProtocol, + (void**)&protocol); + if(FAILED(hres)) + return E_ABORT; + }else { + protocol = This->protocol; + } + if(is_apartment_thread(This)) This->continue_call++; - hres = IInternetProtocol_Read(This->protocol, (BYTE*)pv+read, cb-read, &cread); + hres = IInternetProtocol_Read(protocol, (BYTE*)pv+read, cb-read, &cread); if(is_apartment_thread(This)) This->continue_call--; read += cread; + + if(!This->protocol) + IInternetProtocol_Release(protocol); } *pcbRead = read; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 4ca4327..c153119 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3758,6 +3758,16 @@ static void test_CreateBinding(void) ok(hres == S_OK, "Switch failed: %08x\n", hres); CHECK_CALLED(Continue); + SET_EXPECT(Read); + read = 0xdeadbeef; + hres = IInternetProtocol_Read(protocol, expect_pv = buf, sizeof(buf), &read); + todo_wine + ok(hres == E_ABORT, "Read failed: %08x\n", hres); + todo_wine + ok(read == 0, "read = %d\n", read); + todo_wine + CHECK_NOT_CALLED(Read); + hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = emptyW); ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres);

1 0

Jacek Caban : urlmon: Don't store IWinInetInfo reference in BindProtocol.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 03183590bfddfa634f97525d95bef1f3a5eec883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03183590bfddfa634f97525d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:17 2018 +0200 urlmon: Don't store IWinInetInfo reference in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/binding.c | 29 ++++++++++++++++++++++++----- dlls/urlmon/bindprot.c | 11 +---------- dlls/urlmon/session.c | 13 ++----------- dlls/urlmon/urlmon_main.h | 3 +-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ea3b81c..051b23f 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -792,13 +792,23 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + IWinInetInfo *wininet_info; + HRESULT hres; + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); /* NOTE: This violidates COM rules, but tests prove that we should do it */ - if(!This->protocol->wininet_info) + if(!This->protocol->protocol_unk) return E_NOINTERFACE; - *ppv = &This->IWinInetHttpInfo_iface; + 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; + } + } }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { IWinInetHttpInfo *http_info; HRESULT hres; @@ -1313,13 +1323,22 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD void *pBuffer, DWORD *pcbBuffer) { Binding *This = impl_from_IWinInetHttpInfo(iface); + IWinInetInfo *wininet_info; + HRESULT hres; + TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); - if(!This->protocol->wininet_info) + if(!This->protocol->protocol_unk) return E_FAIL; - return IWinInetInfo_QueryOption(This->protocol->wininet_info, - dwOption, pBuffer, pcbBuffer); + hres = IUnknown_QueryInterface(This->protocol->protocol_unk, &IID_IWinInetHttpInfo, + (void**)&wininet_info); + if(FAILED(hres)) + return E_FAIL; + + hres = IWinInetInfo_QueryOption(wininet_info, dwOption, pBuffer, pcbBuffer); + IWinInetInfo_Release(wininet_info); + return hres; } static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index eeab3d5..4b8069f 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -330,10 +330,6 @@ static ULONG WINAPI BindProtocol_AddRef(IInternetProtocolEx *iface) static void release_protocol_handler(BindProtocol *This) { - if(This->wininet_info) { - IWinInetInfo_Release(This->wininet_info); - This->wininet_info = NULL; - } if(This->protocol_unk) { IUnknown_Release(This->protocol_unk); This->protocol_unk = NULL; @@ -497,7 +493,6 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolEx *protocolex; IInternetPriority *priority; IServiceProvider *service_provider; - BOOL urlmon_protocol = FALSE; CLSID clsid = IID_NULL; IUnknown *protocol_unk = NULL; LPOLESTR clsid_str; @@ -529,7 +524,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(!protocol) { IClassFactory *cf; - hres = get_protocol_handler(pUri, &clsid, &urlmon_protocol, &cf); + hres = get_protocol_handler(pUri, &clsid, &cf); if(FAILED(hres)) return hres; @@ -562,10 +557,6 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr This->protocol_unk = protocol_unk; This->protocol = protocol; - if(urlmon_protocol) { - IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - } - set_binding_sink(This, pOIProtSink, pOIBindInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 1df483f..e053f8b 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -219,7 +219,7 @@ IInternetProtocolInfo *get_protocol_info(LPCWSTR url) return ret; } -HRESULT get_protocol_handler(IUri *uri, CLSID *clsid, BOOL *urlmon_protocol, IClassFactory **ret) +HRESULT get_protocol_handler(IUri *uri, CLSID *clsid, IClassFactory **ret) { name_space *ns; BSTR scheme; @@ -240,20 +240,11 @@ HRESULT get_protocol_handler(IUri *uri, CLSID *clsid, BOOL *urlmon_protocol, ICl IClassFactory_AddRef(*ret); if(clsid) *clsid = ns->clsid; - if(urlmon_protocol) - *urlmon_protocol = ns->urlmon; } LeaveCriticalSection(&session_cs); - if(*ret) { - hres = S_OK; - }else { - if(urlmon_protocol) - *urlmon_protocol = FALSE; - hres = get_protocol_cf(scheme, SysStringLen(scheme), clsid, ret); - } - + hres = *ret ? S_OK : get_protocol_cf(scheme, SysStringLen(scheme), clsid, ret); SysFreeString(scheme); return hres; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index b708921..1d6faaa 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 extern HINSTANCE urlmon_instance; IInternetProtocolInfo *get_protocol_info(LPCWSTR) DECLSPEC_HIDDEN; -HRESULT get_protocol_handler(IUri*,CLSID*,BOOL*,IClassFactory**) DECLSPEC_HIDDEN; +HRESULT get_protocol_handler(IUri*,CLSID*,IClassFactory**) DECLSPEC_HIDDEN; IInternetProtocol *get_mime_filter(LPCWSTR) DECLSPEC_HIDDEN; BOOL is_registered_protocol(LPCWSTR) DECLSPEC_HIDDEN; HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN; @@ -178,7 +178,6 @@ typedef struct { IUnknown *protocol_unk; IInternetProtocol *protocol; - IWinInetInfo *wininet_info; IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink;

1 0

Jacek Caban : urlmon: Added support for COM aggregation to ftp protocol handler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 44a9940256189bac618bf0c062f10597691cbcb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a9940256189bac618bf0c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:36 2018 +0200 urlmon: Added support for COM aggregation to ftp protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/ftp.c | 71 ++++++++++++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index da1efe2..aef4a6c 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -28,13 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; + IUnknown IUnknown_outer; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; LONG ref; + IUnknown *outer; } FtpProtocol; +static inline FtpProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_outer); +} + static inline FtpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) { return CONTAINING_RECORD(iface, FtpProtocol, IInternetProtocolEx_iface); @@ -115,14 +122,13 @@ static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_on_error }; -static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI FtpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + FtpProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocolEx_iface; + *ppv = &This->IUnknown_outer; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -141,28 +147,27 @@ static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REF }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); *ppv = &This->IWinInetHttpInfo_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocolEx_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI FtpProtocol_AddRef(IInternetProtocolEx *iface) +static ULONG WINAPI FtpProtocolUnk_AddRef(IUnknown *iface) { - FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + FtpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface) +static ULONG WINAPI FtpProtocolUnk_Release(IUnknown *iface) { - FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + FtpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -177,6 +182,33 @@ static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface) return ref; } +static const IUnknownVtbl FtpProtocolUnkVtbl = { + FtpProtocolUnk_QueryInterface, + FtpProtocolUnk_AddRef, + FtpProtocolUnk_Release +}; + +static HRESULT WINAPI FtpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI FtpProtocol_AddRef(IInternetProtocolEx *iface) +{ + FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI FtpProtocol_Release(IInternetProtocolEx *iface) +{ + FtpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_Release(This->outer); +} + static HRESULT WINAPI FtpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) @@ -416,23 +448,24 @@ static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { HttpInfo_QueryInfo }; -HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT FtpProtocol_Construct(IUnknown *outer, void **ppv) { FtpProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); URLMON_LockModule(); ret = heap_alloc_zero(sizeof(FtpProtocol)); ret->base.vtbl = &AsyncProtocolVtbl; + ret->IUnknown_outer.lpVtbl = &FtpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &FtpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &FtpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_outer; - *ppobj = &ret->IInternetProtocolEx_iface; - + *ppv = &ret->IUnknown_outer; return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 233a2c0..043724b 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -4103,6 +4103,7 @@ START_TEST(protocol) test_com_aggregation(&CLSID_FileProtocol); test_com_aggregation(&CLSID_HttpProtocol); test_com_aggregation(&CLSID_HttpSProtocol); + test_com_aggregation(&CLSID_FtpProtocol); OleUninitialize(); }

1 0

Jacek Caban : urlmon: Added support for COM aggregation to http protocol handler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 8eeac660526df74bab983c3ac1503d879e501629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eeac660526df74bab983c3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:32 2018 +0200 urlmon: Added support for COM aggregation to http protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 80 +++++++++++++++++++++++++++++++------------- dlls/urlmon/tests/protocol.c | 2 ++ 2 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 9cc6117..5fcbd54 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; + IUnknown IUnknown_outer; IInternetProtocolEx IInternetProtocolEx_iface; IInternetPriority IInternetPriority_iface; IWinInetHttpInfo IWinInetHttpInfo_iface; @@ -41,8 +42,14 @@ typedef struct { WCHAR *full_header; LONG ref; + IUnknown *outer; } HttpProtocol; +static inline HttpProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_outer); +} + static inline HttpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) { return CONTAINING_RECORD(iface, HttpProtocol, IInternetProtocolEx_iface); @@ -624,14 +631,13 @@ static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_on_error }; -static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI HttpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + HttpProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocolEx_iface; + *ppv = &This->IUnknown_outer; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -650,28 +656,27 @@ static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, RE }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); *ppv = &This->IWinInetHttpInfo_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocolEx_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI HttpProtocol_AddRef(IInternetProtocolEx *iface) +static ULONG WINAPI HttpProtocolUnk_AddRef(IUnknown *iface) { - HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + HttpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI HttpProtocol_Release(IInternetProtocolEx *iface) +static ULONG WINAPI HttpProtocolUnk_Release(IUnknown *iface) { - HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + HttpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -686,6 +691,33 @@ static ULONG WINAPI HttpProtocol_Release(IInternetProtocolEx *iface) return ref; } +static const IUnknownVtbl HttpProtocolUnkVtbl = { + HttpProtocolUnk_QueryInterface, + HttpProtocolUnk_AddRef, + HttpProtocolUnk_Release +}; + +static HRESULT WINAPI HttpProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +{ + HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI HttpProtocol_AddRef(IInternetProtocolEx *iface) +{ + HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI HttpProtocol_Release(IInternetProtocolEx *iface) +{ + HttpProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_Release(This->outer); +} + static HRESULT WINAPI HttpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) @@ -926,7 +958,7 @@ static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { HttpInfo_QueryInfo }; -static HRESULT create_http_protocol(BOOL https, void **ppobj) +static HRESULT create_http_protocol(BOOL https, IUnknown *outer, void **ppobj) { HttpProtocol *ret; @@ -935,29 +967,31 @@ static HRESULT create_http_protocol(BOOL https, void **ppobj) return E_OUTOFMEMORY; ret->base.vtbl = &AsyncProtocolVtbl; + ret->IUnknown_outer.lpVtbl = &HttpProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &HttpProtocolVtbl; ret->IInternetPriority_iface.lpVtbl = &HttpPriorityVtbl; ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl; ret->https = https; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_outer; - *ppobj = &ret->IInternetProtocolEx_iface; + *ppobj = &ret->IUnknown_outer; URLMON_LockModule(); return S_OK; } -HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT HttpProtocol_Construct(IUnknown *outer, void **ppv) { - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); - return create_http_protocol(FALSE, ppobj); + return create_http_protocol(FALSE, outer, ppv); } -HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT HttpSProtocol_Construct(IUnknown *outer, void **ppv) { - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); - return create_http_protocol(TRUE, ppobj); + return create_http_protocol(TRUE, outer, ppv); } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f3710fc..233a2c0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -4101,6 +4101,8 @@ START_TEST(protocol) CloseHandle(event_continue_done); test_com_aggregation(&CLSID_FileProtocol); + test_com_aggregation(&CLSID_HttpProtocol); + test_com_aggregation(&CLSID_HttpSProtocol); OleUninitialize(); }

1 0

Jacek Caban : urlmon: Added support for COM aggregation to mk protocol handler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 17574518d698f127167164238d998769e148f0c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17574518d698f12716716423… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:41 2018 +0200 urlmon: Added support for COM aggregation to mk protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/mk.c | 73 ++++++++++++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 1 + 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 984f381..d73a00c 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -25,26 +25,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { + IUnknown IUnknown_outer; IInternetProtocolEx IInternetProtocolEx_iface; LONG ref; + IUnknown *outer; IStream *stream; } MkProtocol; +static inline MkProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, MkProtocol, IUnknown_outer); +} + static inline MkProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface) { return CONTAINING_RECORD(iface, MkProtocol, IInternetProtocolEx_iface); } -static HRESULT WINAPI MkProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +static HRESULT WINAPI MkProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - MkProtocol *This = impl_from_IInternetProtocolEx(iface); + MkProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocolEx_iface; + *ppv = &This->IUnknown_outer; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; @@ -54,28 +60,27 @@ static HRESULT WINAPI MkProtocol_QueryInterface(IInternetProtocolEx *iface, REFI }else if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) { TRACE("(%p)->(IID_IInternetProtocolEx %p)\n", This, ppv); *ppv = &This->IInternetProtocolEx_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocolEx_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI MkProtocol_AddRef(IInternetProtocolEx *iface) +static ULONG WINAPI MkProtocolUnk_AddRef(IUnknown *iface) { - MkProtocol *This = impl_from_IInternetProtocolEx(iface); + MkProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI MkProtocol_Release(IInternetProtocolEx *iface) +static ULONG WINAPI MkProtocolUnk_Release(IUnknown *iface) { - MkProtocol *This = impl_from_IInternetProtocolEx(iface); + MkProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -92,6 +97,33 @@ static ULONG WINAPI MkProtocol_Release(IInternetProtocolEx *iface) return ref; } +static const IUnknownVtbl MkProtocolUnkVtbl = { + MkProtocolUnk_QueryInterface, + MkProtocolUnk_AddRef, + MkProtocolUnk_Release +}; + +static HRESULT WINAPI MkProtocol_QueryInterface(IInternetProtocolEx *iface, REFIID riid, void **ppv) +{ + MkProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI MkProtocol_AddRef(IInternetProtocolEx *iface) +{ + MkProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI MkProtocol_Release(IInternetProtocolEx *iface) +{ + MkProtocol *This = impl_from_IInternetProtocolEx(iface); + TRACE("(%p)\n", This); + return IUnknown_Release(This->outer); +} + static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres, DWORD dwError) { IInternetProtocolSink_ReportResult(sink, hres, dwError, NULL); @@ -330,24 +362,25 @@ static const IInternetProtocolExVtbl MkProtocolVtbl = { MkProtocol_StartEx }; -HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT MkProtocol_Construct(IUnknown *outer, void **ppv) { MkProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); URLMON_LockModule(); ret = heap_alloc(sizeof(MkProtocol)); + ret->IUnknown_outer.lpVtbl = &MkProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &MkProtocolVtbl; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_outer; ret->stream = NULL; /* NOTE: - * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid. + * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid and no outer. */ - *ppobj = &ret->IInternetProtocolEx_iface; - + *ppv = &ret->IUnknown_outer; return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 043724b..5a9e1f2 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -4104,6 +4104,7 @@ START_TEST(protocol) test_com_aggregation(&CLSID_HttpProtocol); test_com_aggregation(&CLSID_HttpSProtocol); test_com_aggregation(&CLSID_FtpProtocol); + test_com_aggregation(&CLSID_MkProtocol); OleUninitialize(); }

1 0

Jacek Caban : urlmon: Store aggregated protocol handler IUnknown in BindProtocol.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 357da1e8a605c00e5d4fb9edbc2bbfe1d53524a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=357da1e8a605c00e5d4fb9ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 8 18:18:06 2018 +0200 urlmon: Store aggregated protocol handler IUnknown in BindProtocol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 18 +++++++++++++----- dlls/urlmon/urlmon_main.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 47c972b..6ee9dbc 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -338,6 +338,10 @@ static void release_protocol_handler(BindProtocol *This) IWinInetHttpInfo_Release(This->wininet_http_info); This->wininet_http_info = NULL; } + if(This->protocol_unk) { + IUnknown_Release(This->protocol_unk); + This->protocol_unk = NULL; + } if(This->protocol) { IInternetProtocol_Release(This->protocol); This->protocol = NULL; @@ -499,6 +503,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IServiceProvider *service_provider; BOOL urlmon_protocol = FALSE; CLSID clsid = IID_NULL; + IUnknown *protocol_unk = NULL; LPOLESTR clsid_str; HRESULT hres; @@ -527,7 +532,6 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(!protocol) { IClassFactory *cf; - IUnknown *unk; hres = get_protocol_handler(pUri, &clsid, &urlmon_protocol, &cf); if(FAILED(hres)) @@ -538,17 +542,20 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr 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**)&unk); + &IID_IUnknown, (void**)&protocol_unk); IClassFactory_Release(cf); if(FAILED(hres)) return hres; - hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&protocol); - IUnknown_Release(unk); - if(FAILED(hres)) + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(FAILED(hres)) { + IUnknown_Release(protocol_unk); return hres; + } } } @@ -556,6 +563,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_PROTOCOLCLASSID, clsid_str); CoTaskMemFree(clsid_str); + This->protocol_unk = protocol_unk; This->protocol = protocol; if(urlmon_protocol) { diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index a4a1c78..a22d952 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -176,6 +176,7 @@ typedef struct { LONG ref; + IUnknown *protocol_unk; IInternetProtocol *protocol; IWinInetInfo *wininet_info; IWinInetHttpInfo *wininet_http_info;

1 0