Author: winesync Date: Fri Apr 4 07:03:12 2008 New Revision: 32835
URL: http://svn.reactos.org/svn/reactos?rev=32835&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/avifil32.rbuild trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/editstream.c 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/wavfile.c
Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstrea... ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -467,7 +467,7 @@ 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;
Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?re... ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -249,7 +249,7 @@ 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 @@ 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 @@ 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 @@
/* 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 @@ } } 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) {
Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil32... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -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>
Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -590,7 +590,7 @@ if (pClassID == NULL) return AVIERR_BADPARAM;
- memcpy(pClassID, &CLSID_AVIFile, sizeof(CLSID_AVIFile)); + *pClassID = CLSID_AVIFile;
return AVIERR_OK; } @@ -623,7 +623,7 @@ 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 @@ 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 @@ break; };
- /* first frame is alwasy a keyframe */ + /* first frame is always a keyframe */ if (This->lLastFrame == -1) flags |= AVIIF_KEYFRAME;
@@ -1656,7 +1656,7 @@ 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 @@
/* 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 @@
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 @@
/* ... 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 @@ 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;
Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile_... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -31,8 +31,8 @@ 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 @@ IDS_VIDEO "ºñµð¿À" IDS_AUDIO "¿Àµð¿À" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-±âº»-ÆÄÀÏÇڵ鷯r" + IDS_AVIFILETYPE "Wine AVI-±âº»-ÆÄÀÏÇڵ鷯" IDS_UNCOMPRESSED "ºñ¾ÐÃà" }
Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstre... ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -424,7 +424,7 @@ 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 @@ 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)))
Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -25,16 +25,15 @@ #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;
@@ -78,7 +77,7 @@
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)) {
Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getframe... ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -212,7 +212,7 @@ 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))) {
Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstrea... ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -558,7 +558,7 @@ 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);
Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile.... ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -540,7 +540,7 @@ if (pClassID == NULL) return AVIERR_BADPARAM;
- memcpy(pClassID, &CLSID_WAVFile, sizeof(CLSID_WAVFile)); + *pClassID = CLSID_WAVFile;
return AVIERR_OK; } @@ -574,7 +574,7 @@ 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 @@ 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)); }
-
winesync＠svn.reactos.org