Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 10:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

merged WineHQ correction for SHCoCreateInstance()

Browse source 
svn path=/trunk/; revision=7491
This commit is contained in:
Martin Fuchs 2004-01-06 21:31:27 +00:00
parent 6cd1349c6a
commit 95d7074a7f
3 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/shell32/shell32.spec
View file

@ -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)

8
reactos/lib/shell32/shellole.c
View file

@ -123,8 +123,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)
@ -151,7 +151,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;
} }
@ -280,7 +280,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);

9
reactos/lib/shell32/undocshell.h
View file

@ -831,14 +831,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();