Commit 72ecbb06 authored by Alexandre Julliard's avatar Alexandre Julliard

SHCoCreateInstance is now documented (spotted by Francois Gouget).

Its first argument should be a Unicode string.
parent 30a520e2
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "ole2.h" #include "ole2.h"
#include "shellapi.h" #include "shellapi.h"
#include "shlobj.h"
#include "vfw.h" #include "vfw.h"
#include "msacm.h" #include "msacm.h"
...@@ -42,11 +43,6 @@ ...@@ -42,11 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(avifile); WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/***********************************************************************
* copied from dlls/shell32/undocshell.h
*/
HRESULT WINAPI SHCoCreateInstance(LPCSTR lpszClsid,REFCLSID rClsid,
LPUNKNOWN pUnkOuter,REFIID riid,LPVOID *ppv);
/*********************************************************************** /***********************************************************************
* for AVIBuildFilterW -- uses fixed size table * for AVIBuildFilterW -- uses fixed size table
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
99 stdcall SetAppStartingCursor (long long) 99 stdcall SetAppStartingCursor (long long)
100 stdcall SHRestricted(long) 100 stdcall SHRestricted(long)
102 stdcall SHCoCreateInstance(ptr ptr long ptr ptr) 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr)
103 stdcall SignalFileOpen(long) 103 stdcall SignalFileOpen(long)
104 stdcall FileMenu_DeleteAllItems(long) 104 stdcall FileMenu_DeleteAllItems(long)
105 stdcall FileMenu_DrawItem(long ptr) 105 stdcall FileMenu_DrawItem(long ptr)
......
...@@ -122,8 +122,8 @@ DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str) ...@@ -122,8 +122,8 @@ DWORD WINAPI __SHGUIDToStringW (REFGUID guid, LPWSTR str)
/************************************************************************/ /************************************************************************/
LRESULT WINAPI SHCoCreateInstance( LRESULT WINAPI SHCoCreateInstance(
LPCSTR aclsid, LPCWSTR aclsid,
REFCLSID clsid, const CLSID *clsid,
LPUNKNOWN pUnkOuter, LPUNKNOWN pUnkOuter,
REFIID refiid, REFIID refiid,
LPVOID *ppv) LPVOID *ppv)
...@@ -150,7 +150,7 @@ LRESULT WINAPI SHCoCreateInstance( ...@@ -150,7 +150,7 @@ LRESULT WINAPI SHCoCreateInstance(
if (!clsid) if (!clsid)
{ {
if (!aclsid) return REGDB_E_CLASSNOTREG; if (!aclsid) return REGDB_E_CLASSNOTREG;
SHCLSIDFromStringA(aclsid, &iid); SHCLSIDFromStringW(aclsid, &iid);
myclsid = &iid; myclsid = &iid;
} }
...@@ -279,7 +279,7 @@ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id) ...@@ -279,7 +279,7 @@ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id)
return CO_E_CLASSSTRING; return CO_E_CLASSSTRING;
return CLSIDFromString( buffer, id ); return CLSIDFromString( buffer, id );
} }
DWORD WINAPI SHCLSIDFromStringW (LPWSTR clsid, CLSID *id) DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id)
{ {
TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id);
return CLSIDFromString(clsid, id); return CLSIDFromString(clsid, id);
......
...@@ -836,14 +836,7 @@ HRESULT WINAPI SHCreateDefClassObject( ...@@ -836,14 +836,7 @@ HRESULT WINAPI SHCreateDefClassObject(
REFIID riidObject); REFIID riidObject);
DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id); DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
DWORD WINAPI SHCLSIDFromStringW (LPWSTR clsid, CLSID *id); DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id);
HRESULT WINAPI SHCoCreateInstance(
LPCSTR lpszClsid,
REFCLSID rClsid,
LPUNKNOWN pUnkOuter,
REFIID riid,
LPVOID *ppv);
void WINAPI SHFreeUnusedLibraries(); void WINAPI SHFreeUnusedLibraries();
......
...@@ -33,6 +33,7 @@ extern "C" { ...@@ -33,6 +33,7 @@ extern "C" {
#include <shtypes.h> #include <shtypes.h>
#include <shobjidl.h> #include <shobjidl.h>
HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,LPUNKNOWN,REFIID,LPVOID*);
BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath); BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath);
BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath); BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment