lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-07-02 05:44:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Sync avifil32 with Wine 1.1.19

Browse Source 
svn path=/trunk/; revision=40517
This commit is contained in:
Dmitry Chapyshev
2009-04-15 07:33:50 +00:00
parent 5275c90901
commit 9e45cb2d7e
4 changed files with 4 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
reactos/dll/win32/avifil32/api.c
View File

@@ -172,7 +172,6 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid)
/***********************************************************************
* AVIFileInit (AVIFIL32.@)
* AVIFileInit (AVIFILE.100)
*/
void WINAPI AVIFileInit(void) {
OleInitialize(NULL);
@@ -180,7 +179,6 @@ void WINAPI AVIFileInit(void) {
/***********************************************************************
* AVIFileExit (AVIFIL32.@)
* AVIFileExit (AVIFILE.101)
*/
void WINAPI AVIFileExit(void) {
/* need to free ole32.dll if we are the last exit call */
@@ -191,7 +189,6 @@ void WINAPI AVIFileExit(void) {
/***********************************************************************
* AVIFileOpen (AVIFIL32.@)
* AVIFileOpenA (AVIFIL32.@)
* AVIFileOpen (AVIFILE.102)
*/
HRESULT WINAPI AVIFileOpenA(PAVIFILE *ppfile, LPCSTR szFile, UINT uMode,
LPCLSID lpHandler)
@@ -276,7 +273,6 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode,
/***********************************************************************
* AVIFileAddRef (AVIFIL32.@)
* AVIFileAddRef (AVIFILE.140)
*/
ULONG WINAPI AVIFileAddRef(PAVIFILE pfile)
{
@@ -292,7 +288,6 @@ ULONG WINAPI AVIFileAddRef(PAVIFILE pfile)
/***********************************************************************
* AVIFileRelease (AVIFIL32.@)
* AVIFileRelease (AVIFILE.141)
*/
ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
{
@@ -309,7 +304,6 @@ ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
/***********************************************************************
* AVIFileInfo (AVIFIL32.@)
* AVIFileInfoA (AVIFIL32.@)
* AVIFileInfo (AVIFILE.142)
*/
HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile, LPAVIFILEINFOA afi, LONG size)
{
@@ -348,7 +342,6 @@ HRESULT WINAPI AVIFileInfoW(PAVIFILE pfile, LPAVIFILEINFOW afiw, LONG size)
/***********************************************************************
* AVIFileGetStream (AVIFIL32.@)
* AVIFileGetStream (AVIFILE.143)
*/
HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis,
DWORD fccType, LONG lParam)
@@ -364,7 +357,6 @@ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis,
/***********************************************************************
* AVIFileCreateStream (AVIFIL32.@)
* AVIFileCreateStreamA (AVIFIL32.@)
* AVIFileCreateStream (AVIFILE.144)
*/
HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE pfile, PAVISTREAM *ppavi,
LPAVISTREAMINFOA psi)
@@ -400,7 +392,6 @@ HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE pfile, PAVISTREAM *avis,
/***********************************************************************
* AVIFileWriteData (AVIFIL32.@)
* AVIFileWriteData (AVIFILE.146)
*/
HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size)
{
@@ -414,7 +405,6 @@ HRESULT WINAPI AVIFileWriteData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LONG size)
/***********************************************************************
* AVIFileReadData (AVIFIL32.@)
* AVIFileReadData (AVIFILE.147)
*/
HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size)
{
@@ -428,7 +418,6 @@ HRESULT WINAPI AVIFileReadData(PAVIFILE pfile,DWORD fcc,LPVOID lp,LPLONG size)
/***********************************************************************
* AVIFileEndRecord (AVIFIL32.@)
* AVIFileEndRecord (AVIFILE.148)
*/
HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile)
{
@@ -442,7 +431,6 @@ HRESULT WINAPI AVIFileEndRecord(PAVIFILE pfile)
/***********************************************************************
* AVIStreamAddRef (AVIFIL32.@)
* AVIStreamAddRef (AVIFILE.160)
*/
ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream)
{
@@ -458,7 +446,6 @@ ULONG WINAPI AVIStreamAddRef(PAVISTREAM pstream)
/***********************************************************************
* AVIStreamRelease (AVIFIL32.@)
* AVIStreamRelease (AVIFILE.161)
*/
ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream)
{
@@ -474,7 +461,6 @@ ULONG WINAPI AVIStreamRelease(PAVISTREAM pstream)
/***********************************************************************
* AVIStreamCreate (AVIFIL32.@)
* AVIStreamCreate (AVIFILE.104)
*/
HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
LPCLSID pclsidHandler)
@@ -507,7 +493,6 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
/***********************************************************************
* AVIStreamInfo (AVIFIL32.@)
* AVIStreamInfoA (AVIFIL32.@)
* AVIStreamInfo (AVIFILE.162)
*/
HRESULT WINAPI AVIStreamInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi,
LONG size)
@@ -548,7 +533,6 @@ HRESULT WINAPI AVIStreamInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi,
/***********************************************************************
* AVIStreamFindSample (AVIFIL32.@)
* AVIStreamFindSample (AVIFILE.163)
*/
LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags)
{
@@ -562,7 +546,6 @@ LONG WINAPI AVIStreamFindSample(PAVISTREAM pstream, LONG pos, LONG flags)
/***********************************************************************
* AVIStreamReadFormat (AVIFIL32.@)
* AVIStreamReadFormat (AVIFILE.164)
*/
HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
LPVOID format, LPLONG formatsize)
@@ -577,7 +560,6 @@ HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM pstream, LONG pos,
/***********************************************************************
* AVIStreamSetFormat (AVIFIL32.@)
* AVIStreamSetFormat (AVIFILE.169)
*/
HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos,
LPVOID format, LONG formatsize)
@@ -592,7 +574,6 @@ HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM pstream, LONG pos,
/***********************************************************************
* AVIStreamRead (AVIFIL32.@)
* AVIStreamRead (AVIFILE.167)
*/
HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples,
LPVOID buffer, LONG buffersize,
@@ -610,7 +591,6 @@ HRESULT WINAPI AVIStreamRead(PAVISTREAM pstream, LONG start, LONG samples,
/***********************************************************************
* AVIStreamWrite (AVIFIL32.@)
* AVIStreamWrite (AVIFILE.168)
*/
HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples,
LPVOID buffer, LONG buffersize, DWORD flags,
@@ -628,7 +608,6 @@ HRESULT WINAPI AVIStreamWrite(PAVISTREAM pstream, LONG start, LONG samples,
/***********************************************************************
* AVIStreamReadData (AVIFIL32.@)
* AVIStreamReadData (AVIFILE.165)
*/
HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
LPLONG lpread)
@@ -643,7 +622,6 @@ HRESULT WINAPI AVIStreamReadData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
/***********************************************************************
* AVIStreamWriteData (AVIFIL32.@)
* AVIStreamWriteData (AVIFILE.166)
*/
HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
LONG size)
@@ -658,7 +636,6 @@ HRESULT WINAPI AVIStreamWriteData(PAVISTREAM pstream, DWORD fcc, LPVOID lp,
/***********************************************************************
* AVIStreamGetFrameOpen (AVIFIL32.@)
* AVIStreamGetFrameOpen (AVIFILE.112)
*/
PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream,
LPBITMAPINFOHEADER lpbiWanted)
@@ -684,7 +661,6 @@ PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM pstream,
/***********************************************************************
* AVIStreamGetFrame (AVIFIL32.@)
* AVIStreamGetFrame (AVIFILE.110)
*/
LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos)
{
@@ -698,7 +674,6 @@ LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg, LONG pos)
/***********************************************************************
* AVIStreamGetFrameClose (AVIFIL32.@)
* AVIStreamGetFrameClose (AVIFILE.111)
*/
HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg)
{
@@ -782,7 +757,6 @@ HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE *ppfile, int nStreams,
/***********************************************************************
* AVIStreamOpenFromFile (AVIFIL32.@)
* AVIStreamOpenFromFileA (AVIFIL32.@)
* AVIStreamOpenFromFile (AVIFILE.103)
*/
HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
DWORD fccType, LONG lParam,
@@ -880,7 +854,6 @@ LONG WINAPI AVIStreamEndStreaming(PAVISTREAM pavi)
}
/***********************************************************************
* AVIStreamStart (AVIFILE.130)
* AVIStreamStart (AVIFIL32.@)
*/
LONG WINAPI AVIStreamStart(PAVISTREAM pstream)
@@ -899,7 +872,6 @@ LONG WINAPI AVIStreamStart(PAVISTREAM pstream)
}
/***********************************************************************
* AVIStreamLength (AVIFILE.131)
* AVIStreamLength (AVIFIL32.@)
*/
LONG WINAPI AVIStreamLength(PAVISTREAM pstream)
@@ -918,7 +890,6 @@ LONG WINAPI AVIStreamLength(PAVISTREAM pstream)
}
/***********************************************************************
* AVIStreamSampleToTime (AVIFILE.133)
* AVIStreamSampleToTime (AVIFIL32.@)
*/
LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
@@ -952,7 +923,6 @@ LONG WINAPI AVIStreamSampleToTime(PAVISTREAM pstream, LONG lSample)
}
/***********************************************************************
* AVIStreamTimeToSample (AVIFILE.132)
* AVIStreamTimeToSample (AVIFIL32.@)
*/
LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
@@ -988,7 +958,6 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
/***********************************************************************
* AVIBuildFilter (AVIFIL32.@)
* AVIBuildFilterA (AVIFIL32.@)
* AVIBuildFilter (AVIFILE.123)
*/
HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving)
{
@@ -1515,7 +1484,6 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStreams,
/***********************************************************************
* AVISaveOptionsFree (AVIFIL32.@)
* AVISaveOptionsFree (AVIFILE.124)
*/
HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions)
{

64
reactos/dll/win32/avifil32/avifile.spec
View File

@@ -1,64 +0,0 @@
# I'm just using "long" instead of "ptr" for the interface pointers,
# because they are 32-bit pointers, not converted to 16-bit format,
# but the app doesn't really need to know, it should never need to
# dereference the interface pointer itself (if we're lucky)...
#1 stub WEP
2 stub DLLGETCLASSOBJECT
3 stub DLLCANUNLOADNOW
4 stub ___EXPORTEDSTUB
10 stub _IID_IAVISTREAM
11 stub _IID_IAVIFILE
12 stub _IID_IAVIEDITSTREAM
13 stub _IID_IGETFRAME
14 stub _CLSID_AVISIMPLEUNMARSHAL
100 pascal AVIFileInit() AVIFileInit
101 pascal AVIFileExit() AVIFileExit
102 pascal AVIFileOpen(ptr str word ptr) AVIFileOpenA
103 pascal AVIStreamOpenFromFile(ptr str long long word ptr) AVIStreamOpenFromFileA
104 pascal AVIStreamCreate(ptr long long ptr) AVIStreamCreate
105 stub AVIMAKECOMPRESSEDSTREAM
106 stub AVIMAKEFILEFROMSTREAMS
107 stub AVIMAKESTREAMFROMCLIPBOARD
110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame
111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose
112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen
120 stub _AVISAVE
121 stub AVISAVEV
122 stub AVISAVEOPTIONS
123 pascal AVIBuildFilter(str long word) AVIBuildFilterA
124 pascal AVISaveOptionsFree(word ptr) AVISaveOptionsFree
130 pascal AVIStreamStart(long) AVIStreamStart
131 pascal AVIStreamLength(long) AVIStreamLength
132 pascal AVIStreamTimeToSample(long long) AVIStreamTimeToSample
133 pascal AVIStreamSampleToTime(long long) AVIStreamSampleToTime
140 pascal AVIFileAddRef(long) AVIFileAddRef
141 pascal AVIFileRelease(long) AVIFileRelease
142 pascal AVIFileInfo(long ptr long) AVIFileInfoA
143 pascal AVIFileGetStream(long ptr long long) AVIFileGetStream
144 pascal AVIFileCreateStream(long ptr ptr) AVIFileCreateStreamA
146 pascal AVIFileWriteData(long long ptr long) AVIFileWriteData
147 pascal AVIFileReadData(long long ptr ptr) AVIFileReadData
148 pascal AVIFileEndRecord(long) AVIFileEndRecord
160 pascal AVIStreamAddRef(long) AVIStreamAddRef
161 pascal AVIStreamRelease(long) AVIStreamRelease
162 pascal AVIStreamInfo(long ptr long) AVIStreamInfoA
163 pascal AVIStreamFindSample(long long long) AVIStreamFindSample
164 pascal AVIStreamReadFormat(long long ptr ptr) AVIStreamReadFormat
165 pascal AVIStreamReadData(long long ptr ptr) AVIStreamReadData
166 pascal AVIStreamWriteData(long long ptr long) AVIStreamWriteData
167 pascal AVIStreamRead(long long long ptr long ptr ptr) AVIStreamRead
168 pascal AVIStreamWrite(long long long ptr long long ptr ptr) AVIStreamWrite
169 pascal AVIStreamSetFormat(long long ptr long) AVIStreamSetFormat
180 stub EDITSTREAMCOPY
181 stub EDITSTREAMCUT
182 stub EDITSTREAMPASTE
184 stub CREATEEDITABLESTREAM
185 stub AVIPUTFILEONCLIPBOARD
187 stub AVIGETFROMCLIPBOARD
188 stub AVICLEARCLIPBOARD
190 stub EDITSTREAMCLONE
191 stub EDITSTREAMSETNAME
192 stub EDITSTREAMSETINFO
200 stub AVISTREAMBEGINSTREAMING
201 stub AVISTREAMENDSTREAMING

1
reactos/dll/win32/avifil32/getframe.c
View File

@@ -140,6 +140,7 @@ static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface,
if (IsEqualGUID(&IID_IUnknown, refiid) ||
IsEqualGUID(&IID_IGetFrame, refiid)) {
*obj = iface;
IGetFrame_AddRef(iface);
return S_OK;
}

3
reactos/dll/win32/avifil32/wavfile.c
View File

@@ -251,13 +251,16 @@ static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile *iface, REFIID refiid,
if (IsEqualGUID(&IID_IUnknown, refiid) ||
IsEqualGUID(&IID_IAVIFile, refiid)) {
*obj = iface;
IAVIFile_AddRef(iface);
return S_OK;
} else if (This->fInfo.dwStreams == 1 &&
IsEqualGUID(&IID_IAVIStream, refiid)) {
*obj = &This->iAVIStream;
IAVIFile_AddRef(iface);
return S_OK;
} else if (IsEqualGUID(&IID_IPersistFile, refiid)) {
*obj = &This->iPersistFile;
IAVIFile_AddRef(iface);
return S_OK;
}