Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 09:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=32835
This commit is contained in:
The Wine Synchronizer 2008-04-04 12:03:12 +00:00
parent 6d3c4cb3e8
commit ba35b2aa8e
10 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/avifil32/acmstream.c
View file

@ -467,7 +467,7 @@ static HRESULT WINAPI ACMStream_fnRead(IAVIStream *iface, LONG start,
if (This->acmStreamHdr.pbSrc == NULL)
This->acmStreamHdr.pbSrc = HeapAlloc(GetProcessHeap(), 0, size);
else
This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size);
This->acmStreamHdr.pbSrc = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size);
if (This->acmStreamHdr.pbSrc == NULL)
return AVIERR_MEMORY;
This->acmStreamHdr.dwSrcUser = size;

11
reactos/dll/win32/avifil32/api.c
View file

@ -249,7 +249,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode,
if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler))
return AVIERR_UNSUPPORTED;
} else
memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler));
clsidHandler = *lpHandler;
/* create instance of handler */
hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIFile, (LPVOID*)ppfile);
@ -746,7 +746,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,
if (AVIFILE_CLSIDFromString(szValue, &clsidHandler) != S_OK)
return AVIERR_UNSUPPORTED;
} else
memcpy(&clsidHandler, pclsidHandler, sizeof(clsidHandler));
clsidHandler = *pclsidHandler;
hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppsCompressed);
if (FAILED(hr) || *ppsCompressed == NULL)
@ -1077,7 +1077,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
break; /* a new one */
}
if (count - i == -1U) {
if (i == count + 1) {
/* it's a new CLSID */
/* FIXME: How do we get info's about read/write capabilities? */
@ -1148,7 +1148,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
/* add "All files" "*.*" filter if enough space left */
size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES,
szAllFiles, sizeof(szAllFiles)) + 1;
szAllFiles, sizeof(szAllFiles)/sizeof(szAllFiles[0])) + 1;
if (cbFilter > size) {
int i;
@ -1336,7 +1336,8 @@ static void AVISaveOptionsUpdate(HWND hWnd)
}
} else {
LoadStringW(AVIFILE_hModule, IDS_UNCOMPRESSED,
icinfo.szDescription, sizeof(icinfo.szDescription));
icinfo.szDescription,
sizeof(icinfo.szDescription)/sizeof(icinfo.szDescription[0]));
lstrcatW(szFormat, icinfo.szDescription);
}
} else if (sInfo.fccType == streamtypeAUDIO) {

20
reactos/dll/win32/avifil32/avifil32.rbuild
View file

@ -9,16 +9,6 @@
<define name="__WINESRC__" />
<define name="WINVER">0x600</define>
<define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>msacm32</library>
<library>msvfw32</library>
<library>winmm</library>
<library>ole32</library>
<library>user32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>uuid</library>
<library>ntdll</library>
<file>acmstream.c</file>
<file>api.c</file>
<file>avifile.c</file>
@ -32,5 +22,15 @@
<file>wavfile.c</file>
<file>rsrc.rc</file>
<file>avifil32.spec</file>
<library>wine</library>
<library>msacm32</library>
<library>msvfw32</library>
<library>winmm</library>
<library>ole32</library>
<library>user32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>uuid</library>
<library>ntdll</library>
</module>
</group>

20
reactos/dll/win32/avifil32/avifile.c
View file

@ -590,7 +590,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
if (pClassID == NULL)
return AVIERR_BADPARAM;
memcpy(pClassID, &CLSID_AVIFile, sizeof(CLSID_AVIFile));
*pClassID = CLSID_AVIFile;
return AVIERR_OK;
}
@ -623,7 +623,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
if (This->paf->hmmio != NULL)
return AVIERR_ERROR; /* No reuse of this object for another file! */
/* remeber mode and name */
/* remember mode and name */
This->paf->uMode = dwMode;
len = lstrlenW(pszFileName) + 1;
@ -951,7 +951,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos,
if (This->lpFormat == NULL) {
/* initial format */
if (This->paf->dwMoviChunkPos != 0)
return AVIERR_ERROR; /* user has used API in wrong sequnece! */
return AVIERR_ERROR; /* user has used API in wrong sequence! */
This->lpFormat = HeapAlloc(GetProcessHeap(), 0, formatsize);
if (This->lpFormat == NULL)
@ -1413,7 +1413,7 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DW
break;
};
/* first frame is alwasy a keyframe */
/* first frame is always a keyframe */
if (This->lLastFrame == -1)
flags |= AVIIF_KEYFRAME;
@ -1656,7 +1656,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
This->fInfo.dwWidth = MainAVIHdr.dwWidth;
This->fInfo.dwHeight = MainAVIHdr.dwHeight;
LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType,
sizeof(This->fInfo.szFileType));
sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0]));
/* go back to into header list */
if (mmioAscend(This->hmmio, &ck, 0) != S_OK)
@ -1767,9 +1767,9 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
/* generate description for stream like "filename.avi Type #n" */
if (streamHdr.fccType == streamtypeVIDEO)
LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType));
LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType)/sizeof(szType[0]));
else if (streamHdr.fccType == streamtypeAUDIO)
LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType));
LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType)/sizeof(szType[0]));
else
wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType);
@ -1782,7 +1782,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName));
LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt));
LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)/sizeof(streamNameFmt[0]));
/* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */
wsprintfW(pStream->sInfo.szName, streamNameFmt,
@ -2226,7 +2226,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This)
/* ... some optional additional extra chunk for this stream ... */
if (pStream->extra.lp != NULL && pStream->extra.cb > 0) {
/* the chunk header(s) are already in the strucuture */
/* the chunk header(s) are already in the structure */
if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb)
return AVIERR_FILEWRITE;
}
@ -2332,7 +2332,7 @@ static HRESULT AVIFILE_SaveIndex(const IAVIFileImpl *This)
return AVIERR_FILEWRITE;
if (This->fInfo.dwFlags & AVIFILEINFO_ISINTERLEAVED) {
/* is interleaved -- write block of coresponding frames */
/* is interleaved -- write block of corresponding frames */
LONG lInitialFrames = 0;
LONG stepsize;
LONG i;

6
reactos/dll/win32/avifil32/avifile_Ko.rc
View file

@ -31,8 +31,8 @@ BEGIN
AUTOCHECKBOX "항상 상호배치(&I)",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP
EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL
LTEXT "프레임",-1,104,43,36,9
LTEXT "현재 포맷:",-1,3,56,53,9
LTEXT "사용을 목적으로 하는 공",IDC_FORMATTEXT,55,56,90,26
LTEXT "현재 형식:",-1,3,56,53,9
LTEXT "필요한 공간",IDC_FORMATTEXT,55,56,90,26
DEFPUSHBUTTON "확인",IDOK,145,42,45,14
PUSHBUTTON "취소",IDCANCEL,145,61,45,14
END
@ -46,6 +46,6 @@ STRINGTABLE DISCARDABLE
IDS_VIDEO "비디오"
IDS_AUDIO "오디오"
IDS_AVISTREAMFORMAT "%s %s #%d"
IDS_AVIFILETYPE "Wine AVI-기본-파일핸들러r"
IDS_AVIFILETYPE "Wine AVI-기본-파일핸들러"
IDS_UNCOMPRESSED "비압축"
}

4
reactos/dll/win32/avifil32/editstream.c
View file

@ -424,7 +424,7 @@ static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart,
if (plStart == NULL || plLength == NULL || *plStart < 0)
return AVIERR_BADPARAM;
/* if asked for cutted part copy it before deleting */
/* if asked for cut part copy it before deleting */
if (ppResult != NULL) {
hr = IAVIEditStream_Copy(iface, plStart, plLength, ppResult);
if (FAILED(hr))
@ -620,7 +620,7 @@ static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart,
AVIFILE_ReadFrame(This, This->pStreams[0].pStream,
This->pStreams[0].dwStart);
/* Check if we could convert the source streams to the disired format... */
/* Check if we could convert the source streams to the desired format... */
if (pEdit != NULL) {
if (FAILED(AVIFILE_FindStreamInTable(pEdit, lStart, &pStream,
&startPos, &streamNr, TRUE)))

9
reactos/dll/win32/avifil32/factory.c
View file

@ -25,17 +25,16 @@
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "initguid.h"
#include "vfw.h"
#include "avifile_private.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
#include "initguid.h"
#include "avifile_private.h"
HMODULE AVIFILE_hModule = NULL;
static BOOL AVIFILE_bLocked;
@ -78,7 +77,7 @@ static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid,
pClassFactory->lpVtbl = &iclassfact;
pClassFactory->dwRef = 0;
memcpy(&pClassFactory->clsid, pclsid, sizeof(pClassFactory->clsid));
pClassFactory->clsid = *pclsid;
hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv);
if (FAILED(hr)) {

2
reactos/dll/win32/avifil32/getframe.c
View file

@ -212,7 +212,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos)
if (This->lpOutFormat != NULL) {
BITMAPINFOHEADER bi;
memcpy(&bi, This->lpOutFormat, sizeof(bi));
bi = *This->lpOutFormat;
AVIFILE_CloseCompressor(This);
if (FAILED(IGetFrame_SetFormat(iface, &bi, NULL, 0, 0, -1, -1))) {

2
reactos/dll/win32/avifil32/icmstream.c
View file

@ -558,7 +558,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos,
if (ICCompressBegin(This->hic, lpbi, This->lpbiOutput) != S_OK)
return AVIERR_COMPRESSOR;
/* check if we need to restart decompresion also */
/* check if we need to restart decompression also */
if (This->lKeyFrameEvery != 1 &&
(This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) {
ICDecompressEnd(This->hic);

8
reactos/dll/win32/avifil32/wavfile.c
View file

@ -540,7 +540,7 @@ static HRESULT WINAPI IPersistFile_fnGetClassID(IPersistFile *iface,
if (pClassID == NULL)
return AVIERR_BADPARAM;
memcpy(pClassID, &CLSID_WAVFile, sizeof(CLSID_WAVFile));
*pClassID = CLSID_WAVFile;
return AVIERR_OK;
}
@ -574,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
if (This->hmmio != NULL)
return AVIERR_ERROR; /* No reuse of this object for another file! */
/* remeber mode and name */
/* remember mode and name */
This->uMode = dwMode;
len = lstrlenW(pszFileName) + 1;
@ -607,9 +607,9 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface,
memset(& This->sInfo, 0, sizeof(This->sInfo));
LoadStringW(AVIFILE_hModule, IDS_WAVEFILETYPE, This->fInfo.szFileType,
sizeof(This->fInfo.szFileType));
sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0]));
if (LoadStringW(AVIFILE_hModule, IDS_WAVESTREAMFORMAT,
wszStreamFmt, sizeof(wszStreamFmt)) > 0) {
wszStreamFmt, sizeof(wszStreamFmt)/sizeof(wszStreamFmt[0])) > 0) {
wsprintfW(This->sInfo.szName, wszStreamFmt,
AVIFILE_BasenameW(This->szFileName));
}