Author: tfaber Date: Fri Apr 25 21:24:53 2014 New Revision: 62968
URL: http://svn.reactos.org/svn/reactos?rev=62968&view=rev Log: [SHELL32] - Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole
Modified: trunk/reactos/dll/win32/shell32/shellole.cpp trunk/reactos/dll/win32/shell32/stubs.cpp trunk/reactos/include/psdk/shlobj.h
Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -710,3 +710,14 @@ hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); return hres; } + +/************************************************************************* + * SHCreateQueryCancelAutoPlayMoniker [SHELL32.@] + */ +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) +{ + TRACE("%p\n", moniker); + + if (!moniker) return E_INVALIDARG; + return CreateClassMoniker(CLSID_QueryCancelAutoPlay, moniker); +}
Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cpp... ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -668,17 +668,6 @@ /* * Unimplemented */ -EXTERN_C HRESULT -WINAPI -SHCreateQueryCancelAutoPlayMoniker(IMoniker **ppmoniker) -{ - FIXME("SHCreateQueryCancelAutoPlayMoniker() stub\n"); - return E_FAIL; -} - -/* - * Unimplemented - */ EXTERN_C BOOL WINAPI SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi) @@ -692,9 +681,9 @@ */ EXTERN_C BOOL WINAPI -SHChangeNotifySuspendResume(BOOL bSuspend, - LPITEMIDLIST pidl, - BOOL bRecursive, +SHChangeNotifySuspendResume(BOOL bSuspend, + LPITEMIDLIST pidl, + BOOL bRecursive, DWORD dwReserved) { FIXME("SHChangeNotifySuspendResume() stub\n");
Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=6... ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -101,6 +101,7 @@
HPSXA WINAPI SHCreatePropSheetExtArray(_In_ HKEY, _In_opt_ LPCWSTR, UINT); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker**);
HRESULT WINAPI