[AVIFIL32] Sync with Wine Staging 1.9.23. CORE-12409

svn path=/trunk/; revision=73257

diff --git a/reactos/dll/win32/avifil32/avifile.c b/reactos/dll/win32/avifil32/avifile.c
index f1f6509..fdec0f8 100644 (file)
--- a/reactos/dll/win32/avifil32/avifile.c
+++ b/reactos/dll/win32/avifil32/avifile.c
@@ -297,6 +297,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D
   }
 
   /* Sorry, but the specified stream doesn't exist */
+  *avis = NULL;
   return AVIERR_NODATA;
 }
 

diff --git a/reactos/dll/win32/avifil32/getframe.c b/reactos/dll/win32/avifil32/getframe.c
index 23da880..06ac404 100644 (file)
--- a/reactos/dll/win32/avifil32/getframe.c
+++ b/reactos/dll/win32/avifil32/getframe.c
@@ -490,7 +490,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream)
     IAVIStream_AddRef(pStream);
   }
 
-  return (PGETFRAME)pg;
+  return &pg->IGetFrame_iface;
 }
 
 /***********************************************************************/

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 768121b..543b883 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -48,7 +48,7 @@ reactos/dll/win32/advpack             # Synced to WineStaging-1.9.11
 reactos/dll/win32/atl                 # Synced to WineStaging-1.9.16
 reactos/dll/win32/atl80               # Synced to WineStaging-1.9.11
 reactos/dll/win32/atl100              # Synced to WineStaging-1.9.11
-reactos/dll/win32/avifil32            # Synced to WineStaging-1.9.16
+reactos/dll/win32/avifil32            # Synced to WineStaging-1.9.23
 reactos/dll/win32/bcrypt              # Synced to WineStaging-1.9.4
 reactos/dll/win32/browseui            # Out of sync
 reactos/dll/win32/cabinet             # Synced to WineStaging-1.9.16