IStorage* vs. LPSTORAGE vs. winapi_check

[Francois Gouget]

On Wed, 17 Aug 2005, Marcus Meissner wrote:
[...]
>>> So LPSTORAGE16 would be more fitting I think.
>>
>> You mean in the documentation?
>
> In the documentation I guess it is ok.

Hmm, now I see that IStorage16 and LPSTORAGE16 are defined in 
dlls/ole32/ifs.h and the structures they point to probably don't have 
the same layout as their 32bit equivalents. So it would probably make 
more sense to refer to those types in the documentation. Would the 
attached patch be ok?

(LPOLECLIENTSITE16 is not defined yet in ifs.h or elsewhere but I guess 
that will come)

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                               145 = 1! + 4! + 5!
-------------- next part --------------
Index: dlls/ole32/ole2_16.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2_16.c,v
retrieving revision 1.9
diff -u -p -r1.9 ole2_16.c
--- dlls/ole32/ole2_16.c	16 Aug 2005 16:01:15 -0000	1.9
+++ dlls/ole32/ole2_16.c	17 Aug 2005 06:26:26 -0000
@@ -197,8 +197,8 @@ BOOL WINAPI IsValidInterface16(SEGPTR pu
  *              OleLoad        [OLE2.12]
  *
  * PARAMS
- *  pStg Segmented LPSTORAGE pointer.
- *  pClientSite Segmented LPOLECLIENTSITE pointer.
+ *  pStg Segmented LPSTORAGE16 pointer.
+ *  pClientSite Segmented LPOLECLIENTSITE16 pointer.
  */
 HRESULT WINAPI OleLoad16(
     SEGPTR		pStg,
Index: dlls/ole32/storage.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/storage.c,v
retrieving revision 1.51
diff -u -p -r1.51 storage.c
--- dlls/ole32/storage.c	16 Aug 2005 16:01:15 -0000	1.51
+++ dlls/ole32/storage.c	17 Aug 2005 06:24:20 -0000
@@ -2181,9 +2181,12 @@ HRESULT WINAPI StgIsStorageILockBytes16(
 
 /******************************************************************************
  *    StgOpenStorageOnILockBytes    [STORAGE.4]
+ *
+ * PARAMS
+ *  plkbyt Segmented ILockBytes16* pointer.
  */
 HRESULT WINAPI StgOpenStorageOnILockBytes16(
-	SEGPTR /*ILockBytes16 **/plkbyt,
+	SEGPTR plkbyt,
 	IStorage16 *pstgPriority,
 	DWORD grfMode,
 	SNB16 snbExclude,
@@ -2227,7 +2230,7 @@ HRESULT WINAPI StgOpenStorageOnILockByte
  * the WriteClassStg.
  *
  * PARAMS
- *  pstg Segmented LPSTORAGE pointer.
+ *  pstg Segmented LPSTORAGE16 pointer.
  */
 HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid)
 {