[ros-diffs] [winesync] 26494: Autosyncing with Wine HEAD
winesync at svn.reactos.org
winesync at svn.reactos.org
Wed Apr 25 10:20:24 CEST 2007
Author: winesync
Date: Wed Apr 25 12:20:24 2007
New Revision: 26494
URL: http://svn.reactos.org/svn/reactos?rev=26494&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/avifil32/acmstream.c
trunk/reactos/dll/win32/avifil32/api.c
trunk/reactos/dll/win32/avifil32/avifile.c
trunk/reactos/dll/win32/avifil32/avifile_private.h
trunk/reactos/dll/win32/avifil32/editstream.c
trunk/reactos/dll/win32/avifil32/extrachunk.c
trunk/reactos/dll/win32/avifil32/extrachunk.h
trunk/reactos/dll/win32/avifil32/factory.c
trunk/reactos/dll/win32/avifil32/getframe.c
trunk/reactos/dll/win32/avifil32/icmstream.c
trunk/reactos/dll/win32/avifil32/regsvr.c
trunk/reactos/dll/win32/avifil32/tmpfile.c
trunk/reactos/dll/win32/avifil32/wavfile.c
Modified: trunk/reactos/dll/win32/avifil32/acmstream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstream.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/acmstream.c (original)
+++ trunk/reactos/dll/win32/avifil32/acmstream.c Wed Apr 25 12:20:24 2007
@@ -23,7 +23,6 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winnls.h"
#include "winerror.h"
#include "mmsystem.h"
#include "vfw.h"
Modified: trunk/reactos/dll/win32/avifil32/api.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/api.c (original)
+++ trunk/reactos/dll/win32/avifil32/api.c Wed Apr 25 12:20:24 2007
@@ -17,7 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
#include <stdarg.h>
#define COBJMACROS
Modified: trunk/reactos/dll/win32/avifil32/avifile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile.c (original)
+++ trunk/reactos/dll/win32/avifil32/avifile.c Wed Apr 25 12:20:24 2007
@@ -210,19 +210,19 @@
static HRESULT AVIFILE_AddRecord(IAVIFileImpl *This);
static DWORD AVIFILE_ComputeMoviStart(IAVIFileImpl *This);
static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr,
- LPAVISTREAMINFOW asi);
+ const AVISTREAMINFOW *asi);
static void AVIFILE_DestructAVIStream(IAVIStreamImpl *This);
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset);
-static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
+static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset);
+static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp,
LONG count, DWORD pos, BOOL *bAbsolute);
static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD start,
LPVOID buffer, LONG size);
-static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
+static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos,
LPLONG offset);
static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This);
-static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fccType,
+static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This);
+static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fccType,
LONG lSkip);
static void AVIFILE_UpdateInfo(IAVIFileImpl *This);
static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block,
@@ -1502,7 +1502,7 @@
return dwPos;
}
-static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, LPAVISTREAMINFOW asi)
+static void AVIFILE_ConstructAVIStream(IAVIFileImpl *paf, DWORD nr, const AVISTREAMINFOW *asi)
{
IAVIStreamImpl *pstream;
@@ -1902,7 +1902,7 @@
return AVIERR_OK;
}
-static HRESULT AVIFILE_LoadIndex(IAVIFileImpl *This, DWORD size, DWORD offset)
+static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD offset)
{
AVIINDEXENTRY *lp;
DWORD pos, n;
@@ -1975,7 +1975,7 @@
return hr;
}
-static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
+static HRESULT AVIFILE_ParseIndex(const IAVIFileImpl *This, AVIINDEXENTRY *lp,
LONG count, DWORD pos, BOOL *bAbsolute)
{
if (lp == NULL)
@@ -2064,8 +2064,7 @@
return AVIERR_OK;
}
-static void AVIFILE_SamplesToBlock(IAVIStreamImpl *This, LPLONG pos,
- LPLONG offset)
+static void AVIFILE_SamplesToBlock(const IAVIStreamImpl *This, LPLONG pos, LPLONG offset)
{
LONG block;
@@ -2317,7 +2316,7 @@
return AVIERR_OK;
}
-static HRESULT AVIFILE_SaveIndex(IAVIFileImpl *This)
+static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This)
{
IAVIStreamImpl *pStream;
AVIINDEXENTRY idx;
@@ -2447,7 +2446,7 @@
return AVIERR_OK;
}
-static ULONG AVIFILE_SearchStream(IAVIFileImpl *This, DWORD fcc, LONG lSkip)
+static ULONG AVIFILE_SearchStream(const IAVIFileImpl *This, DWORD fcc, LONG lSkip)
{
UINT i;
UINT nStream;
Modified: trunk/reactos/dll/win32/avifil32/avifile_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_private.h?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/avifile_private.h (original)
+++ trunk/reactos/dll/win32/avifil32/avifile_private.h Wed Apr 25 12:20:24 2007
@@ -67,7 +67,7 @@
extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj);
extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream);
extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream);
-extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams,PAVISTREAM *ppStreams);
+extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams);
extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName);
Modified: trunk/reactos/dll/win32/avifil32/editstream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstream.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/editstream.c (original)
+++ trunk/reactos/dll/win32/avifil32/editstream.c Wed Apr 25 12:20:24 2007
@@ -23,7 +23,6 @@
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
-#include "winnls.h"
#include "winerror.h"
#include "mmsystem.h"
#include "vfw.h"
Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrachunk.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.c (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.c Wed Apr 25 12:20:24 2007
@@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size)
+HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size)
{
LPBYTE lp;
DWORD cb;
@@ -99,7 +99,7 @@
}
/* reads a chunk fomr the HMMIO into the extrachunk-structure */
-HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck)
+HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck)
{
LPDWORD lp;
DWORD cb;
Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrachunk.h?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/extrachunk.h (original)
+++ trunk/reactos/dll/win32/avifil32/extrachunk.h Wed Apr 25 12:20:24 2007
@@ -35,13 +35,13 @@
} EXTRACHUNKS, *LPEXTRACHUNKS;
/* reads a chunk outof the extrachunk-structure */
-HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size);
+HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG size);
/* writes a chunk into the extrachunk-structure */
HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size);
/* reads a chunk fomr the HMMIO into the extrachunk-structure */
-HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck);
+HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck);
/* reads all non-junk chunks into the extrachunk-structure until it finds
* the given chunk or the optional parent-chunk is at the end */
Modified: trunk/reactos/dll/win32/avifil32/factory.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/factory.c (original)
+++ trunk/reactos/dll/win32/avifil32/factory.c Wed Apr 25 12:20:24 2007
@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
#include <stdarg.h>
#define COBJMACROS
@@ -25,7 +24,6 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winnls.h"
#include "winerror.h"
#include "ole2.h"
Modified: trunk/reactos/dll/win32/avifil32/getframe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getframe.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/getframe.c (original)
+++ trunk/reactos/dll/win32/avifil32/getframe.c Wed Apr 25 12:20:24 2007
@@ -16,12 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
-#include "winnls.h"
#include "wingdi.h"
#include "winuser.h"
#include "vfw.h"
Modified: trunk/reactos/dll/win32/avifil32/icmstream.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstream.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/icmstream.c (original)
+++ trunk/reactos/dll/win32/avifil32/icmstream.c Wed Apr 25 12:20:24 2007
@@ -23,11 +23,9 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winnls.h"
#include "winerror.h"
#include "mmsystem.h"
#include "vfw.h"
-#include "msacm.h"
#include "avifile_private.h"
Modified: trunk/reactos/dll/win32/avifil32/regsvr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/regsvr.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/regsvr.c (original)
+++ trunk/reactos/dll/win32/avifil32/regsvr.c Wed Apr 25 12:20:24 2007
@@ -28,7 +28,6 @@
#include "winreg.h"
#include "winerror.h"
-#include "mmsystem.h"
#include "vfw.h"
#include "avifile_private.h"
Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/tmpfile.c (original)
+++ trunk/reactos/dll/win32/avifil32/tmpfile.c Wed Apr 25 12:20:24 2007
@@ -16,16 +16,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <assert.h>
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "winnls.h"
#include "winerror.h"
-#include "mmsystem.h"
#include "vfw.h"
#include "avifile_private.h"
@@ -71,7 +68,7 @@
PAVISTREAM *ppStreams;
} ITmpFileImpl;
-PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, PAVISTREAM *ppStreams) {
+PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) {
ITmpFileImpl *tmpFile;
int i;
Modified: trunk/reactos/dll/win32/avifil32/wavfile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile.c?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- trunk/reactos/dll/win32/avifil32/wavfile.c (original)
+++ trunk/reactos/dll/win32/avifil32/wavfile.c Wed Apr 25 12:20:24 2007
@@ -212,7 +212,7 @@
static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This);
static HRESULT AVIFILE_LoadSunFile(IAVIFileImpl *This);
-static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This);
+static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This);
HRESULT AVIFILE_CreateWAVFile(REFIID riid, LPVOID *ppv)
{
@@ -1248,7 +1248,7 @@
return AVIERR_OK;
}
-static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
+static HRESULT AVIFILE_SaveFile(const IAVIFileImpl *This)
{
MMCKINFO ckRIFF;
MMCKINFO ck;
More information about the Ros-diffs
mailing list