Use LPSTORAGE to better match the PSDK.

dlls/ole32/ole2.c

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

dlls/ole32/ole2_16.c

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

dlls/ole32/storage.c

@@ -2223,9 +2223,14 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16(
 /***********************************************************************
  *    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;
 	HANDLE16 hstatstg;
 	HRESULT	hres;
@@ -2268,7 +2273,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR /*IStorage **/pstg,CLSID *pclsid){
 /***********************************************************************
  *              GetConvertStg (OLE2.82)
  */
-HRESULT WINAPI GetConvertStg16(IStorage *stg) {
+HRESULT WINAPI GetConvertStg16(LPSTORAGE stg) {
     FIXME("unimplemented stub!\n");
     return E_FAIL;
 }

tools/winapi/win16.api

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