reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-05 03:26:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use LPSTORAGE to better match the PSDK.

Browse Source 
Document the real SEGPTR type using the standard documentation
mechanisms. Fixes winapi_check warnings.
This commit is contained in:
Francois Gouget 2005-08-16 16:01:15 +00:00 committed by Alexandre Julliard
parent e3181e3fcc
commit 71af595499
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ole32/ole2.c
View File

@ -2322,7 +2322,7 @@ done:
/****************************************************************************** /******************************************************************************
* OleDoAutoConvert [OLE32.@] * OleDoAutoConvert [OLE32.@]
*/ */
HRESULT WINAPI OleDoAutoConvert(IStorage *pStg, LPCLSID pClsidNew) HRESULT WINAPI OleDoAutoConvert(LPSTORAGE pStg, LPCLSID pClsidNew)
{ {
FIXME("(%p,%p) : stub\n",pStg,pClsidNew); FIXME("(%p,%p) : stub\n",pStg,pClsidNew);
return E_NOTIMPL; return E_NOTIMPL;
@ -2331,7 +2331,7 @@ HRESULT WINAPI OleDoAutoConvert(IStorage *pStg, LPCLSID pClsidNew)
/****************************************************************************** /******************************************************************************
* OleDoAutoConvert [OLE2.79] * OleDoAutoConvert [OLE2.79]
*/ */
HRESULT WINAPI OleDoAutoConvert16(IStorage *pStg, LPCLSID pClsidNew) HRESULT WINAPI OleDoAutoConvert16(LPSTORAGE pStg, LPCLSID pClsidNew)
{ {
FIXME("(%p,%p) : stub\n",pStg,pClsidNew); FIXME("(%p,%p) : stub\n",pStg,pClsidNew);
return E_NOTIMPL; return E_NOTIMPL;

12
dlls/ole32/ole2_16.c
View File

@ -195,12 +195,16 @@ BOOL WINAPI IsValidInterface16(SEGPTR punk)
/****************************************************************************** /******************************************************************************
* OleLoad [OLE2.12] * OleLoad [OLE2.12]
*
* PARAMS
* pStg Segmented LPSTORAGE pointer.
* pClientSite Segmented LPOLECLIENTSITE pointer.
*/ */
HRESULT WINAPI OleLoad16( HRESULT WINAPI OleLoad16(
/*LPSTORAGE16*/ SEGPTR pStg, SEGPTR pStg,
REFIID riid, REFIID riid,
/*LPOLECLIENTSITE16*/ SEGPTR pClientSite, SEGPTR pClientSite,
LPVOID* ppvObj) LPVOID* ppvObj)
{ {
FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj); FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
return E_NOTIMPL; return E_NOTIMPL;

11
dlls/ole32/storage.c
View File

@ -2223,9 +2223,14 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16(
/*********************************************************************** /***********************************************************************
* ReadClassStg (OLE2.18) * ReadClassStg (OLE2.18)
* *
* This method reads the CLSID previously written to a storage object with the WriteClassStg. * This method reads the CLSID previously written to a storage object with
* the WriteClassStg.
*
* PARAMS
* pstg Segmented LPSTORAGE pointer.
*/ */
HRESULT WINAPI ReadClassStg16(SEGPTR /*IStorage **/pstg,CLSID *pclsid){ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
{
STATSTG16 statstg; STATSTG16 statstg;
HANDLE16 hstatstg; HANDLE16 hstatstg;
HRESULT hres; HRESULT hres;
@ -2268,7 +2273,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR /*IStorage **/pstg,CLSID *pclsid){
/*********************************************************************** /***********************************************************************
* GetConvertStg (OLE2.82) * GetConvertStg (OLE2.82)
*/ */
HRESULT WINAPI GetConvertStg16(IStorage *stg) { HRESULT WINAPI GetConvertStg16(LPSTORAGE stg) {
FIXME("unimplemented stub!\n"); FIXME("unimplemented stub!\n");
return E_FAIL; return E_FAIL;
} }

2
tools/winapi/win16.api
View File

@ -762,7 +762,6 @@ CLSID *
IDataObject * IDataObject *
IDataObject ** IDataObject **
ILockBytes16 * ILockBytes16 *
IStorage *
LPCLSID LPCLSID
LPDROPTARGET LPDROPTARGET
LPLOCKBYTES16 * LPLOCKBYTES16 *
@ -770,6 +769,7 @@ LPMONIKER *
LPOLEINPLACEACTIVEOBJECT LPOLEINPLACEACTIVEOBJECT
LPOLEINPLACEFRAME LPOLEINPLACEFRAME
LPRUNNINGOBJECTTABLE * LPRUNNINGOBJECTTABLE *
LPSTORAGE
LPVOID LPVOID
LPVOID * LPVOID *
REFIID REFIID