[SHELL32]

- Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole

svn path=/trunk/; revision=62968

diff --git a/reactos/dll/win32/shell32/shellole.cpp b/reactos/dll/win32/shell32/shellole.cpp
index ef9e56b..f39d1b5 100644 (file)
--- a/reactos/dll/win32/shell32/shellole.cpp
+++ b/reactos/dll/win32/shell32/shellole.cpp
@@ -710,3 +710,14 @@ EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCod
     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);
+}

diff --git a/reactos/dll/win32/shell32/stubs.cpp b/reactos/dll/win32/shell32/stubs.cpp
index 037f4ba..c1e0ae3 100644 (file)
--- a/reactos/dll/win32/shell32/stubs.cpp
+++ b/reactos/dll/win32/shell32/stubs.cpp
@@ -665,17 +665,6 @@ SHInvokePrinterCommandA(HWND hwnd,
     return FALSE;
 }
 
-/*
- * Unimplemented
- */
-EXTERN_C HRESULT
-WINAPI
-SHCreateQueryCancelAutoPlayMoniker(IMoniker **ppmoniker)
-{
-    FIXME("SHCreateQueryCancelAutoPlayMoniker() stub\n");
-    return E_FAIL;
-}
-
 /*
  * Unimplemented
  */
@@ -692,9 +681,9 @@ SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi)
  */
 EXTERN_C BOOL
 WINAPI
-SHChangeNotifySuspendResume(BOOL bSuspend, 
-                            LPITEMIDLIST pidl, 
-                            BOOL bRecursive, 
+SHChangeNotifySuspendResume(BOOL bSuspend,
+                            LPITEMIDLIST pidl,
+                            BOOL bRecursive,
                             DWORD dwReserved)
 {
     FIXME("SHChangeNotifySuspendResume() stub\n");

diff --git a/reactos/include/psdk/shlobj.h b/reactos/include/psdk/shlobj.h
index ec885fa..a013bd7 100644 (file)
--- a/reactos/include/psdk/shlobj.h
+++ b/reactos/include/psdk/shlobj.h
@@ -101,6 +101,7 @@ SHCoCreateInstance(
 
 HPSXA        WINAPI SHCreatePropSheetExtArray(_In_ HKEY, _In_opt_ LPCWSTR, UINT);
 HPSXA        WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*);
+HRESULT      WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker**);
 
 HRESULT
 WINAPI