December 2010 - Wine-commits

Henri Verbeet : wined3d: Explicitly pass gl_info to shader_arb_generate_pshader().
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: cd30e9562cfba5eedb20b027415e3852e315df1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd30e9562cfba5eedb20b0274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:04 2010 +0100 wined3d: Explicitly pass gl_info to shader_arb_generate_pshader(). --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3a8f758..483d253 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3488,12 +3488,12 @@ static void init_ps_input(const IWineD3DPixelShaderImpl *This, const struct arb_ } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct wined3d_shader_buffer *buffer, +static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, + const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) { const struct wined3d_shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - const struct wined3d_gl_info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; const local_constant *lconst; GLuint retval; char fragcolor[16]; @@ -4233,6 +4233,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl *shader, const struct arb_ps_compile_args *args) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)shader->baseShader.device; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; UINT i; DWORD new_size; struct arb_ps_compiled_shader *new_array; @@ -4242,7 +4243,6 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * if (!shader->baseShader.backend_data) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct shader_arb_priv *priv = device->shader_priv; shader->baseShader.backend_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); @@ -4304,8 +4304,8 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * return 0; } - ret = shader_arb_generate_pshader(shader, &buffer, args, - &shader_data->gl_shaders[shader_data->num_gl_shaders]); + ret = shader_arb_generate_pshader(shader, gl_info, &buffer, args, + &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret;

1 0

Louis Lenders : Add stubbed wmic.exe.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 4b281b2b81a6ad95a1a8a4e444dd9fc0ad7aab29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b281b2b81a6ad95a1a8a4e44… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Dec 6 23:04:20 2010 +0100 Add stubbed wmic.exe. --- configure | 1 + configure.ac | 1 + programs/wmic/Makefile.in | 8 ++++++++ programs/wmic/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ea28639..5ab08b2 100755 --- a/configure +++ b/configure @@ -15390,6 +15390,7 @@ wine_fn_config_program winhelp.exe16 enable_win16 install wine_fn_config_program winhlp32 enable_winhlp32 install wine_fn_config_program winoldap.mod16 enable_win16 install wine_fn_config_program winver enable_winver install +wine_fn_config_program wmic enable_wmic install wine_fn_config_program wordpad enable_wordpad install wine_fn_config_program write enable_write install wine_fn_config_program wscript enable_wscript install diff --git a/configure.ac b/configure.ac index bb3237d..8ad460d 100644 --- a/configure.ac +++ b/configure.ac @@ -2912,6 +2912,7 @@ WINE_CONFIG_PROGRAM(winhelp.exe16,install,enable_win16) WINE_CONFIG_PROGRAM(winhlp32,install) WINE_CONFIG_PROGRAM(winoldap.mod16,install,enable_win16) WINE_CONFIG_PROGRAM(winver,install) +WINE_CONFIG_PROGRAM(wmic,install) WINE_CONFIG_PROGRAM(wordpad,install) WINE_CONFIG_PROGRAM(write,install) WINE_CONFIG_PROGRAM(wscript,install) diff --git a/programs/wmic/Makefile.in b/programs/wmic/Makefile.in new file mode 100644 index 0000000..4bef274 --- /dev/null +++ b/programs/wmic/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = wmic.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/wmic/main.c b/programs/wmic/main.c new file mode 100644 index 0000000..ba37017 --- /dev/null +++ b/programs/wmic/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmic); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Andrew Bogott : winemenubuilder: Include icons in .url menus.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 6197866dc06f1c576b6cb652ba41ee6ad601aec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6197866dc06f1c576b6cb652b… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Thu Nov 25 00:34:35 2010 -0600 winemenubuilder: Include icons in .url menus. --- programs/winemenubuilder/winemenubuilder.c | 34 +++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 324aab8..78d6bd6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2620,7 +2620,7 @@ cleanup: static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link, BOOL bWait ) { - char *link_name = NULL; + char *link_name = NULL, *icon_name = NULL; DWORD csidl = -1; LPWSTR urlPath; char *escaped_urlPath = NULL; @@ -2629,6 +2629,10 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link BOOL ret = TRUE; int r = -1; char *unix_link = NULL; + IPropertySetStorage *pPropSetStg; + IPropertyStorage *pPropStg; + PROPSPEC ps[2]; + PROPVARIANT pv[2]; if ( !link ) { @@ -2671,6 +2675,29 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link goto cleanup; } + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; + + hr = url->lpVtbl->QueryInterface(url, &IID_IPropertySetStorage, (void **) &pPropSetStg); + if (SUCCEEDED(hr)) + { + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStg); + if (SUCCEEDED(hr)) + { + hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); + if (SUCCEEDED(hr)) + { + icon_name = extract_icon( pv[0].pwszVal, pv[1].iVal, NULL, bWait ); + + WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].pwszVal), pv[1].iVal, icon_name); + } + IPropertyStorage_Release(pPropStg); + } + IPropertySetStorage_Release(pPropSetStg); + } + hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) ) { @@ -2689,20 +2716,21 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + r = !write_desktop_entry(NULL, location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); } } else - r = !write_menu_entry(unix_link, link_name, "winebrowser", escaped_urlPath, NULL, NULL, NULL); + r = !write_menu_entry(unix_link, link_name, "winebrowser", escaped_urlPath, NULL, NULL, icon_name); ret = (r != 0); ReleaseSemaphore(hSem, 1, NULL); cleanup: if (hSem) CloseHandle(hSem); + HeapFree( GetProcessHeap(), 0, icon_name ); HeapFree(GetProcessHeap(), 0, link_name); CoTaskMemFree( urlPath ); HeapFree(GetProcessHeap(), 0, escaped_urlPath);

1 0

Thomas Mullaly : include: Added IUriBuilderFactory interface definition.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 2182d7733342c204b04b53ab7d6b51a1f0ad20b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2182d7733342c204b04b53ab7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Dec 5 20:51:23 2010 -0500 include: Added IUriBuilderFactory interface definition. --- include/urlmon.idl | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d1eee68..ec0354f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1829,6 +1829,28 @@ interface IUriBuilder: IUnknown cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") /***************************************************************************** + * IUriBuilderFactory interface + */ +[ + local, + object, + uuid(e982ce48-0b96-440c-bc37-0c869b27a29e), + pointer_default(unique) +] +interface IUriBuilderFactory : IUnknown +{ + HRESULT CreateInitializedIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); + + HRESULT CreateIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); +}; + +/***************************************************************************** * IInternetProtocolEx interface */ [

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilderFactory interface.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 875f1e939c84f565fc22ef8665f9e61dc001f3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875f1e939c84f565fc22ef866… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Dec 6 17:50:37 2010 -0500 urlmon: Implemented IUriBuilderFactory interface. --- dlls/urlmon/tests/uri.c | 93 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 119 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 206 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=875f1e939c84f565fc22e…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 0d2f29a0105d3decd47ee97f63927e95f895e6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2f29a0105d3decd47ee97f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:16 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj. --- dlls/mshtml/htmlevent.c | 87 +++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d2f29a0105d3decd47ee…

1 0

Andrew Bogott : shdocvw: Add tests for IPersistFile on an internet shortcut .
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 23aa460722f53c00d06a7eb0f581c4c46510e05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=23aa460722f53c00d06a7eb0f… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 24 15:56:08 2010 -0600 shdocvw: Add tests for IPersistFile on an internet shortcut. --- dlls/shdocvw/tests/intshcut.c | 67 ++++++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 5245d9f..56efdba 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -177,27 +177,28 @@ static void test_ReadAndWriteProperties(void) { HRESULT hr; IUniformResourceLocatorA *urlA; - IPropertySetStorage *pPropSetStg; + IUniformResourceLocatorA *urlAFromFile; + WCHAR fileNameW[] = {'C',':','/','w','i','n','d','o','w','s','/','t','e','m','p','/','t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; + WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + int iconIndex = 7; + char testurl[] = "http://some/bogus/url.html"; + PROPSPEC ps[2]; + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); if (hr == S_OK) { - WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; - int iconIndex = 7; + IPersistFile *pf; IPropertyStorage *pPropStgWrite; - IPropertyStorage *pPropStgRead; - PROPSPEC ps[2]; + IPropertySetStorage *pPropSetStg; PROPVARIANT pv[2]; - PROPVARIANT pvread[2]; - ps[0].ulKind = PRSPEC_PROPID; - ps[0].propid = PID_IS_ICONFILE; - ps[1].ulKind = PRSPEC_PROPID; - ps[1].propid = PID_IS_ICONINDEX; pv[0].vt = VT_LPWSTR; pv[0].pwszVal = (void *) iconPath; pv[1].vt = VT_I4; pv[1].iVal = iconIndex; - hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); @@ -212,6 +213,49 @@ static void test_ReadAndWriteProperties(void) pPropStgWrite->lpVtbl->Release(pPropStgWrite); + /* We need to set a URL -- IPersistFile refuses to save without one. */ + hr = urlA->lpVtbl->SetURL(urlA, testurl, 0); + ok(hr == S_OK, "Failed to set a URL. hr=0x%x\n", hr); + + /* Write this shortcut out to a file so that we can test reading it in again. */ + hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPersistFile, (void **) &pf); + ok(hr == S_OK, "Failed to get the IPersistFile for writing. hr=0x%x\n", hr); + + hr = IPersistFile_Save(pf, fileNameW, TRUE); + ok(hr == S_OK, "Failed to save via IPersistFile. hr=0x%x\n", hr); + + IPersistFile_Release(pf); + urlA->lpVtbl->Release(urlA); + IPropertySetStorage_Release(pPropSetStg); + } + else + skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr); + + hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlAFromFile); + if (hr == S_OK) + { + IPropertySetStorage *pPropSetStg; + IPropertyStorage *pPropStgRead; + PROPVARIANT pvread[2]; + IPersistFile *pf; + LPSTR url = NULL; + + /* Now read that .url file back in. */ + hr = urlAFromFile->lpVtbl->QueryInterface(urlA, &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); + ok(hr == S_OK, "Failed to load via IPersistFile. hr=0x%x\n", hr); + IPersistFile_Release(pf); + + + hr = urlA->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); + 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); ok(hr == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hr); @@ -227,6 +271,7 @@ static void test_ReadAndWriteProperties(void) IPropertyStorage_Release(pPropStgRead); IPropertySetStorage_Release(pPropSetStg); urlA->lpVtbl->Release(urlA); + DeleteFileW(fileNameW); } else skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr);

1 0

Andrew Eikum : shell32: Correctly construct the PIDL given to SHChangeNotify in AddFolder.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 0a55ec2c9e1dc5fd0b99ad1202fd7849b0187808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a55ec2c9e1dc5fd0b99ad120… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 3 11:50:12 2010 -0600 shell32: Correctly construct the PIDL given to SHChangeNotify in AddFolder. --- dlls/shell32/shfldr_fs.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 850424d..084dffd 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1232,12 +1232,34 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, bRes = CreateDirectoryW (wszNewDir, NULL); if (bRes) { - SHChangeNotify (SHCNE_MKDIR, SHCNF_PATHW, wszNewDir, NULL); + LPITEMIDLIST relPidl; - hres = S_OK; + lstrcpyW(wszNewDir, pwszName); + + hres = IShellFolder_ParseDisplayName((IShellFolder*)&This->lpvtblShellFolder, + hwnd, NULL, wszNewDir, NULL, &relPidl, NULL); + + if (SUCCEEDED(hres)) { + LPITEMIDLIST fullPidl; + + fullPidl = ILCombine(This->pidlRoot, relPidl); + + if (fullPidl) { + SHChangeNotify(SHCNE_MKDIR, SHCNF_IDLIST, fullPidl, NULL); + ILFree(fullPidl); + + if (ppidlOut) + *ppidlOut = relPidl; + else + ILFree(relPidl); + } else { + WARN("failed to combine %s into a full PIDL\n", wine_dbgstr_w(pwszName)); + ILFree(relPidl); + } + + } else + WARN("failed to parse %s into a PIDL\n", wine_dbgstr_w(pwszName)); - if (ppidlOut) - hres = _ILCreateFromPathW(wszNewDir, ppidlOut); } else { WCHAR wszText[128 + MAX_PATH]; WCHAR wszTempText[128];

1 0

Jacek Caban : mshtml: Added PluginHost' s IServiceProvider stub implementation.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: c12d9ff8d7f1209fb76b405113b278407de57337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12d9ff8d7f1209fb76b40511… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 18:51:20 2010 +0100 mshtml: Added PluginHost's IServiceProvider stub implementation. --- dlls/mshtml/pluginhost.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 1 + dlls/mshtml/tests/activex.c | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index f652b82..e7f39d8 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -129,6 +129,9 @@ static HRESULT WINAPI PHClientSite_QueryInterface(IOleClientSite *iface, REFIID }else if(IsEqualGUID(&IID_IBindHost, riid)) { TRACE("(%p)->(IID_IBindHost %p)\n", This, ppv); *ppv = &This->IBindHost_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; }else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -691,6 +694,43 @@ static const IBindHostVtbl BindHostVtbl = { PHBindHost_MonikerBindToObject }; +static inline PluginHost *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, PluginHost, IServiceProvider_iface); +} + +static HRESULT WINAPI PHServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); +} + +static ULONG WINAPI PHServiceProvider_AddRef(IServiceProvider *iface) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI PHServiceProvider_Release(IServiceProvider *iface) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) +{ + PluginHost *This = impl_from_IServiceProvider(iface); + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + PHServiceProvider_QueryInterface, + PHServiceProvider_AddRef, + PHServiceProvider_Release, + PHServiceProvider_QueryService +}; + HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -706,6 +746,7 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) host->IOleInPlaceSiteEx_iface.lpVtbl = &OleInPlaceSiteExVtbl; host->IOleControlSite_iface.lpVtbl = &OleControlSiteVtbl; host->IBindHost_iface.lpVtbl = &BindHostVtbl; + host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 2e87ea3..2b66696 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -26,6 +26,7 @@ typedef struct { IOleInPlaceSiteEx IOleInPlaceSiteEx_iface; IOleControlSite IOleControlSite_iface; IBindHost IBindHost_iface; + IServiceProvider IServiceProvider_iface; LONG ref; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 51a6b84..9984ae0 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -98,6 +98,7 @@ static const REFIID pluginhost_iids[] = { &IID_IOleInPlaceSiteEx, &IID_IOleControlSite, &IID_IBindHost, + &IID_IServiceProvider, NULL };

1 0

Maarten Lankhorst : quartz: Remove default clock if the providing filter is removed from filtergraph.
by Alexandre Julliard 06 Dec '10

06 Dec '10

Module: wine Branch: master Commit: 804a9d14c96ae14634a26a0d095119105b43deb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804a9d14c96ae14634a26a0d0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 6 14:16:41 2010 +0100 quartz: Remove default clock if the providing filter is removed from filtergraph. --- dlls/quartz/filtergraph.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ef398cb..50a045e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -184,6 +184,7 @@ typedef struct _IFilterGraphImpl { int filterCapacity; LONG nameIndex; IReferenceClock *refClock; + IBaseFilter *refClockProvider; EventsQueue evqueue; HANDLE hEventCompletion; int CompletionStatus; @@ -484,6 +485,12 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IEnumPins *penumpins = NULL; FILTER_STATE state; + if (This->defaultclock && This->refClockProvider == pFilter) + { + IMediaFilter_SetSyncSource((IMediaFilter*)&This->IMediaFilter_vtbl, NULL); + This->defaultclock = 1; + } + TRACE("Removing filter %s\n", debugstr_w(This->pFilterNames[i])); IBaseFilter_GetState(pFilter, 0, &state); if (state == State_Running) @@ -781,7 +788,12 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) { } if (!pClock) + { hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pClock); + This->refClockProvider = NULL; + } + else + This->refClockProvider = This->ppFiltersInGraph[i]; if (SUCCEEDED(hr)) { @@ -5485,6 +5497,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->notif.disabled = FALSE; fimpl->nRenderers = 0; fimpl->EcCompleteCount = 0; + fimpl->refClockProvider = NULL; fimpl->state = State_Stopped; EventsQueue_Init(&fimpl->evqueue); InitializeCriticalSection(&fimpl->cs);

1 0