December 2010 - Wine-commits

Alexandre Julliard : devenum: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 7092313b2a3a25533a1b27e37cf6f6527784a273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7092313b2a3a25533a1b27e37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 14:44:19 2010 +0100 devenum: Convert dll registration to the IRegistrar mechanism. --- dlls/devenum/Makefile.in | 2 + dlls/devenum/devenum_classes.idl | 90 ++++++++++++++++ dlls/devenum/devenum_main.c | 218 +------------------------------------- 3 files changed, 96 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7092313b2a3a25533a1b2…

1 0

Alexandre Julliard : infosoft: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 79bab49904d870f23d74da46665164484b5ee831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bab49904d870f23d74da466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 7 14:50:56 2010 +0100 infosoft: Convert dll registration to the IRegistrar mechanism. --- .gitignore | 1 + dlls/infosoft/Makefile.in | 3 ++ dlls/infosoft/infosoft.idl | 26 +++++++++++++++++++++ dlls/infosoft/infosoft_main.c | 50 +++++++++------------------------------- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index dd74759..a981f92 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h +dlls/infosoft/infosoft.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 36c4a02..f6af67c 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -6,4 +6,7 @@ C_SRCS = \ infosoft_main.c \ wordbreaker.c +IDL_H_SRCS = infosoft.idl +IDL_R_SRCS = infosoft.idl + @MAKE_DLL_RULES@ diff --git a/dlls/infosoft/infosoft.idl b/dlls/infosoft/infosoft.idl new file mode 100644 index 0000000..2891617 --- /dev/null +++ b/dlls/infosoft/infosoft.idl @@ -0,0 +1,26 @@ +/* + * COM Classes for infosoft + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +[ + helpstring("Neutral Word Breaker"), + threading(both), + uuid(369647e0-17b0-11ce-9950-00aa004bbb1f) +] +coclass wb_Neutral { interface IWordBreaker; } diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index a177dfd..619eca2 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -28,16 +28,17 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" +#include "rpcproxy.h" #include "indexsrv.h" #include "initguid.h" +#include "infosoft.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(infosoft); -DEFINE_GUID(CLSID_wb_Neutral,0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); +static HINSTANCE instance; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -46,6 +47,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: @@ -155,46 +157,18 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -static HRESULT add_key_val( LPCSTR key, LPCSTR valname, LPCSTR value ) -{ - HKEY hkey; - - if (RegCreateKeyA( HKEY_CLASSES_ROOT, key, &hkey ) != ERROR_SUCCESS) return E_FAIL; - RegSetValueA( hkey, valname, REG_SZ, value, strlen( value ) + 1 ); - RegCloseKey( hkey ); - return S_OK; -} - -static HRESULT add_wordbreaker_clsid( LPCSTR lang, const CLSID *id) -{ - CHAR key[100], val[50]; - - strcpy(key, "CLSID\\"); - sprintf(key+6, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7]); - sprintf(val, "%s Word Breaker", lang); - add_key_val( key, NULL, val ); - strcat(key, "\\InProcServer32"); - add_key_val( key, NULL, "infosoft.dll" ); - add_key_val( key, "ThreadingModel", "Both" ); - return S_OK; -} - -#define ADD_BREAKER(name) add_wordbreaker_clsid( #name, &CLSID_wb_##name ) - -static HRESULT add_content_index_keys(void) +/*********************************************************************** + * DllRegisterServer (INFOSOFT.@) + */ +HRESULT WINAPI DllRegisterServer(void) { - ADD_BREAKER(Neutral); /* in query.dll on Windows */ - return S_OK; + return __wine_register_resources( instance, NULL ); } /*********************************************************************** - * DllRegisterServer (INFOSOFT.@) + * DllUnregisterServer (INFOSOFT.@) */ -HRESULT WINAPI DllRegisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { - add_content_index_keys(); - return S_OK; + return __wine_unregister_resources( instance, NULL ); }

1 0

Jacek Caban : appwiz.cpl: Added Gecko installer based on mshtml code.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 280ec3999735add7ee5a8391ea6a9515f7525db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280ec3999735add7ee5a8391e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 19:25:01 2010 +0100 appwiz.cpl: Added Gecko installer based on mshtml code. --- dlls/appwiz.cpl/En.rc | 22 ++ dlls/appwiz.cpl/Makefile.in | 4 +- dlls/appwiz.cpl/addons.c | 503 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.c | 19 ++- dlls/appwiz.cpl/appwiz.h | 36 +++ dlls/appwiz.cpl/res.h | 7 + 6 files changed, 589 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=280ec3999735add7ee5a8…

1 0

Jacek Caban : appwiz.cpl: Added translations from mshtml.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: cc361eefcef4e1fe0f15ecbf1aae65bcde1e6ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc361eefcef4e1fe0f15ecbf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 19:25:28 2010 +0100 appwiz.cpl: Added translations from mshtml. --- dlls/appwiz.cpl/Bg.rc | 41 +++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Da.rc | 22 +++++++++++++++++++++ dlls/appwiz.cpl/De.rc | 25 ++++++++++++++++++++++- dlls/appwiz.cpl/Es.rc | 6 +++++ dlls/appwiz.cpl/Fi.rc | 29 +++++++++++++++++++++++++++ dlls/appwiz.cpl/Fr.rc | 24 ++++++++++++++++++++++ dlls/appwiz.cpl/He.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Hu.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/It.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Ja.rc | 22 +++++++++++++++++++++ dlls/appwiz.cpl/Ko.rc | 2 +- dlls/appwiz.cpl/Lt.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Makefile.in | 3 ++ dlls/appwiz.cpl/Nl.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/No.rc | 22 ++++++++++++++++++++- dlls/appwiz.cpl/Pl.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Pt.rc | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Ro.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/Ru.rc | 23 ++++++++++++++++++++++ dlls/appwiz.cpl/Si.rc | 21 ++++++++++++++++++++ dlls/appwiz.cpl/Sr.rc | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Tr.rc | 41 +++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Uk.rc | 20 +++++++++++++++++++ dlls/appwiz.cpl/Zh.rc | 38 ++++++++++++++++++++++++++++++++++++ 24 files changed, 571 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc361eefcef4e1fe0f15e…

1 0

Jacek Caban : mshtml: Use wineaddon.cpl to install Gecko.
by Alexandre Julliard 07 Dec '10

07 Dec '10

1 0

Andrew Nguyen : shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 2f302cfe0be98d5d542d9b17fbd1de3763f32a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f302cfe0be98d5d542d9b17f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:12:01 2010 -0600 shdocvw/tests: Avoid using a freed IUniformResourceLocatorA variable. Spotted with Valgrind. --- dlls/shdocvw/tests/intshcut.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 56efdba..dbfb4d6 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -241,7 +241,7 @@ static void test_ReadAndWriteProperties(void) LPSTR url = NULL; /* Now read that .url file back in. */ - hr = urlAFromFile->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPersistFile, (void **) &pf); ok(hr == S_OK, "Failed to get the IPersistFile for reading. hr=0x%x\n", hr); hr = IPersistFile_Load(pf, fileNameW, 0); @@ -249,11 +249,11 @@ static void test_ReadAndWriteProperties(void) IPersistFile_Release(pf); - hr = urlA->lpVtbl->GetURL(urlAFromFile, &url); + hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); - hr = urlA->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); + hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); @@ -270,7 +270,7 @@ static void test_ReadAndWriteProperties(void) PropVariantClear(&pvread[1]); IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); - urlA->lpVtbl->Release(urlA); + urlAFromFile->lpVtbl->Release(urlAFromFile); DeleteFileW(fileNameW); } else

1 0

Andrew Nguyen : shdocvw: Avoid a double free in PersistFile_Load.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 1c5101506821591488755c72be89c37a176a5f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5101506821591488755c72b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Dec 7 03:12:29 2010 -0600 shdocvw: Avoid a double free in PersistFile_Load. Spotted with Valgrind. --- dlls/shdocvw/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index e400f0d..e209e04 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -526,7 +526,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); } - CoTaskMemFree(iconfile); + CoTaskMemFree(iconindexstring); } IPropertyStorage_Release(pPropStg);

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in DownloadBSC.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: b74af4aa0fac1270a6ab361b08e00d8f7a3ff3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74af4aa0fac1270a6ab361b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:10 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in DownloadBSC. --- dlls/urlmon/download.c | 69 +++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index cc49849..9759e71 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -22,8 +22,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { - const IBindStatusCallbackVtbl *lpBindStatusCallbackVtbl; - const IServiceProviderVtbl *lpServiceProviderVtbl; + IBindStatusCallback IBindStatusCallback_iface; + IServiceProvider IServiceProvider_iface; LONG ref; @@ -32,27 +32,32 @@ typedef struct { LPWSTR cache_file; } DownloadBSC; -#define STATUSCLB(x) ((IBindStatusCallback*) &(x)->lpBindStatusCallbackVtbl) -#define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) +static inline DownloadBSC *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, DownloadBSC, IBindStatusCallback_iface); +} -#define STATUSCLB_THIS(iface) DEFINE_THIS(DownloadBSC, BindStatusCallback, iface) +static inline DownloadBSC *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, DownloadBSC, IServiceProvider_iface); +} static HRESULT WINAPI DownloadBSC_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = STATUSCLB(This); + *ppv = &This->IBindStatusCallback_iface; }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { TRACE("(%p)->(IID_IBindStatusCallback, %p)\n", This, ppv); - *ppv = STATUSCLB(This); + *ppv = &This->IBindStatusCallback_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider, %p)\n", This, ppv); - *ppv = SERVPROV(This); + *ppv = &This->IServiceProvider_iface; } if(*ppv) { @@ -66,7 +71,7 @@ static HRESULT WINAPI DownloadBSC_QueryInterface(IBindStatusCallback *iface, static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); @@ -76,7 +81,7 @@ static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface) static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %d\n", This, ref); @@ -95,7 +100,7 @@ static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pbind) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); @@ -107,14 +112,14 @@ static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%p)\n", This, pnPriority); return E_NOTIMPL; } static HRESULT WINAPI DownloadBSC_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%d)\n", This, reserved); return E_NOTIMPL; } @@ -133,7 +138,7 @@ static HRESULT on_progress(DownloadBSC *This, ULONG progress, ULONG progress_max static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); HRESULT hres = S_OK; TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, @@ -167,7 +172,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); @@ -192,7 +197,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_GetBindInfo(IBindStatusCallback *iface, DWORD *grfBINDF, BINDINFO *pbindinfo) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); DWORD bindf = 0; TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); @@ -216,7 +221,7 @@ static HRESULT WINAPI DownloadBSC_GetBindInfo(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, DWORD dwSize, FORMATETC *pformatetc, STGMEDIUM *pstgmed) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); @@ -226,13 +231,11 @@ static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface, static HRESULT WINAPI DownloadBSC_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { - DownloadBSC *This = STATUSCLB_THIS(iface); + DownloadBSC *This = impl_from_IBindStatusCallback(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); return E_NOTIMPL; } -#undef STATUSCLB_THIS - static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { DownloadBSC_QueryInterface, DownloadBSC_AddRef, @@ -247,31 +250,29 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { DownloadBSC_OnObjectAvailable }; -#define SERVPROV_THIS(iface) DEFINE_THIS(DownloadBSC, ServiceProvider, iface) - static HRESULT WINAPI DwlServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_QueryInterface(STATUSCLB(This), riid, ppv); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); } static ULONG WINAPI DwlServiceProvider_AddRef(IServiceProvider *iface) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_AddRef(STATUSCLB(This)); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); } static ULONG WINAPI DwlServiceProvider_Release(IServiceProvider *iface) { - DownloadBSC *This = SERVPROV_THIS(iface); - return IBindStatusCallback_Release(STATUSCLB(This)); + DownloadBSC *This = impl_from_IServiceProvider(iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); } static HRESULT WINAPI DwlServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - DownloadBSC *This = SERVPROV_THIS(iface); + DownloadBSC *This = impl_from_IServiceProvider(iface); IServiceProvider *serv_prov; HRESULT hres; @@ -294,8 +295,6 @@ static HRESULT WINAPI DwlServiceProvider_QueryService(IServiceProvider *iface, return E_NOINTERFACE; } -#undef SERVPROV_THIS - static const IServiceProviderVtbl ServiceProviderVtbl = { DwlServiceProvider_QueryInterface, DwlServiceProvider_AddRef, @@ -307,8 +306,8 @@ static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_na { DownloadBSC *ret = heap_alloc(sizeof(*ret)); - ret->lpBindStatusCallbackVtbl = &BindStatusCallbackVtbl; - ret->lpServiceProviderVtbl = &ServiceProviderVtbl; + ret->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; + ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; ret->ref = 1; ret->file_name = heap_strdupW(file_name); ret->cache_file = NULL; @@ -317,7 +316,7 @@ static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_na IBindStatusCallback_AddRef(callback); ret->callback = callback; - *ret_callback = STATUSCLB(ret); + *ret_callback = &ret->IBindStatusCallback_iface; return S_OK; }

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in FtpProtocol.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 4d3c6278b41ac3538c50b40a0b3198e539d432f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3c6278b41ac3538c50b40a0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:06 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in FtpProtocol. --- dlls/urlmon/ftp.c | 125 +++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d3c6278b41ac3538c50b…

1 0

Michael Stefaniuc : urlmon: Use ifaces instead of vtbl pointers in HttpProtocol.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 4252552399198275d865e4b3fbc8bcf50459be62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4252552399198275d865e4b3f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:19 2010 +0100 urlmon: Use ifaces instead of vtbl pointers in HttpProtocol. --- dlls/urlmon/http.c | 126 ++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4252552399198275d865e…

1 0