Changeset 4984 for trunk/src


Ignore:
Timestamp:
Jan 20, 2001, 5:57:35 PM (25 years ago)
Author:
sandervl
Message:

resync with Wine + stubs added

Location:
trunk/src/avifil32
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/avifil32/avifile.cpp

    r4632 r4984  
    1 /* $Id: avifile.cpp,v 1.7 2000-11-19 13:12:09 sandervl Exp $ */
    21/*                                 
    32 * Copyright 1999 Marcus Meissner
    43 */
    5 #include <string.h>
    6 #include <stdio.h>
    7 #include <assert.h>
    8 
     4#ifdef __WIN32OS2__
    95#include <os2win.h>
    106#define CINTERFACE
    117#define ICOM_CINTERFACE 1
    128#define INITGUID
     9#endif
     10#include <string.h>
     11#include <stdio.h>
     12#include <assert.h>
    1313
    1414#include "winbase.h"
    15 #include "vfw.h"
    16 #include "wine/winestring.h"
    17 ////#include "driver.h"
     15#include "winnls.h"
    1816#include "mmsystem.h"
    1917#include "winerror.h"
    20 #include "debugstr.h"
     18#include "vfw.h"
    2119#include "debugtools.h"
    2220
    23 #include <misc.h>
    24 
    25 DECLARE_DEBUG_CHANNEL(avifile)
    26 //DECLARE_DEBUG_CHANNEL(msvideo)
    27 //DECLARE_DEBUG_CHANNEL(relay)
     21DEFAULT_DEBUG_CHANNEL(avifile);
    2822
    2923static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj);
    … …  
    111105} IAVIStreamImpl;
    112106
     107/***********************************************************************
     108 *              AVIFileInit
     109 */
    113110void WINAPI
    114111AVIFileInit(void) {
    … …  
    125122static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj) {
    126123        ICOM_THIS(IAVIFileImpl,iface);
    127         char    xrefiid[50];
    128 
    129         WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
    130         TRACE_(relay)("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
     124
     125        TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
    131126        if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
    132127                !memcmp(&IID_IAVIFile,refiid,sizeof(IID_IAVIFile))
    … …  
    141136        ICOM_THIS(IAVIFileImpl,iface);
    142137       
    143         FIXME_(relay)("(%p)->AddRef()\n",iface);
     138        FIXME("(%p)->AddRef()\n",iface);
    144139        return ++(This->ref);
    145140}
    … …  
    148143        ICOM_THIS(IAVIFileImpl,iface);
    149144       
    150         FIXME_(relay)("(%p)->Release()\n",iface);
     145        FIXME("(%p)->Release()\n",iface);
    151146        if (!--(This->ref)) {
    152147                HeapFree(GetProcessHeap(),0,iface);
    … …  
    216211}
    217212
     213/***********************************************************************
     214 *              AVIFileOpenA
     215 */
    218216HRESULT WINAPI AVIFileOpenA(
    219217        PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler
    220218) {
    221         char    buf[80];
    222219        IAVIFileImpl    *iavi;
    223220
    224 
    225         if (HIWORD(lpHandler))
    226                 WINE_StringFromCLSID(lpHandler,buf);
    227         else
    228                 sprintf(buf,"<clsid-0x%04lx>",(DWORD)lpHandler);
    229 
    230         FIXME("(%p,%s,0x%08lx,%s),stub!\n",ppfile,szFile,(DWORD)uMode,buf);
     221        FIXME("(%p,%s,0x%08lx,%s),stub!\n",ppfile,szFile,(DWORD)uMode,debugstr_guid(lpHandler));
    231222        iavi = (IAVIFileImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IAVIFileImpl));
    232223        iavi->ref = 1;
    233224        ICOM_VTBL(iavi) = &iavift;
    234         *ppfile = (PAVIFILE)iavi;
     225#ifdef __WIN32OS2__
     226        *ppfile = (PAVIFILE)iavi;
     227#else
     228        *ppfile = (LPVOID)iavi;
     229#endif
    235230        return S_OK;
    236231}
    … …  
    238233static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj) {
    239234        ICOM_THIS(IAVIStreamImpl,iface);
    240         char    xrefiid[50];
    241 
    242         WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
    243         TRACE_(relay)("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
     235
     236        TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj);
    244237        if (    !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
    245238                !memcmp(&IID_IAVIStream,refiid,sizeof(IID_IAVIStream))
    … …  
    255248        ICOM_THIS(IAVIStreamImpl,iface);
    256249       
    257         FIXME_(relay)("(%p)->AddRef()\n",iface);
     250        FIXME("(%p)->AddRef()\n",iface);
    258251        return ++(This->ref);
    259252}
    … …  
    262255        ICOM_THIS(IAVIStreamImpl,iface);
    263256       
    264         FIXME_(relay)("(%p)->Release()\n",iface);
     257        FIXME("(%p)->Release()\n",iface);
    265258        if (!--(This->ref)) {
    266259                HeapFree(GetProcessHeap(),0,This);
    … …  
    290283}
    291284
    292 /*****************************************************************************
    293  *                                              [IAVIStream::SetFormat]
     285/***********************************************************************
     286 *              IAVIStream::SetFormat
    294287 */
    295288static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize) {
    … …  
    339332
    340333        ICCompress(
    341                 as->hic,flags,
    342                 (LPBITMAPINFOHEADER)as->lpCompressFormat,
    343                 as->compbuffer,
    344                 (LPBITMAPINFOHEADER)as->lpInputFormat,
    345                 buffer,
    346                 &ckid,&xflags,
    347                 as->curframe,0xffffff/*framesize*/,as->aco.dwQuality,
    348                 (LPBITMAPINFOHEADER)as->lpPrevFormat,as->lpPrev
     334                as->hic,flags,
     335#ifdef __WIN32OS2__
     336                (LPBITMAPINFOHEADER)
     337#endif
     338                as->lpCompressFormat,
     339                as->compbuffer,
     340#ifdef __WIN32OS2__
     341                (LPBITMAPINFOHEADER)
     342#endif
     343                as->lpInputFormat,buffer,
     344                &ckid,&xflags,
     345                as->curframe,0xffffff/*framesize*/,as->aco.dwQuality,
     346#ifdef __WIN32OS2__
     347                (LPBITMAPINFOHEADER)as->lpPrevFormat,as->lpPrev
     348#else
     349                as->lpPrevFormat,as->lpPrev
     350#endif
    349351        );
    350352        ICDecompress(
    351                 as->hic,
    352                 flags,  /* FIXME: check */
    353                 (LPBITMAPINFOHEADER)as->lpCompressFormat,
    354                 as->compbuffer,
    355                 (LPBITMAPINFOHEADER)as->decompformat,
    356                 as->decompbuffer
     353                as->hic,
     354                flags,  /* FIXME: check */
     355#ifdef __WIN32OS2__
     356                (LPBITMAPINFOHEADER)
     357#endif
     358                as->lpCompressFormat,
     359                as->compbuffer,
     360#ifdef __WIN32OS2__
     361                (LPBITMAPINFOHEADER)
     362#endif
     363                as->decompformat,
     364                as->decompbuffer
    357365        );
    358366        /* We now have a prev format for the next compress ... */
    … …  
    381389}
    382390
     391/***********************************************************************
     392 *              AVIFileCreateStreamA
     393 */
    383394HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE iface,PAVISTREAM *ppavi,AVISTREAMINFOA * psi) {
    384395        AVISTREAMINFOW  psiw;
    … …  
    386397        /* Only the szName at the end is different */
    387398        memcpy(&psiw,psi,sizeof(*psi)-sizeof(psi->szName));
    388         lstrcpynAtoW(psiw.szName,psi->szName,sizeof(psi->szName));
     399        MultiByteToWideChar( CP_ACP, 0, psi->szName, -1,
     400                             psiw.szName, sizeof(psiw.szName) / sizeof(WCHAR) );
    389401        return IAVIFile_CreateStream(iface,ppavi,&psiw);
    390402}
    391403
     404/***********************************************************************
     405 *              AVIFileCreateStreamW
     406 */
    392407HRESULT WINAPI AVIFileCreateStreamW(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi) {
    393408        return IAVIFile_CreateStream(iface,avis,asi);
    … …  
    395410
    396411
     412/***********************************************************************
     413 *              AVIFileGetStream
     414 */
    397415HRESULT WINAPI AVIFileGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam) {
    398416        return IAVIFile_GetStream(iface,avis,fccType,lParam);
    399417}
    400418
     419/***********************************************************************
     420 *              AVIFileInfoA
     421 */
    401422HRESULT WINAPI AVIFileInfoA(PAVIFILE iface,LPAVIFILEINFOA afi,LONG size) {
    402423        AVIFILEINFOW    afiw;
    … …  
    407428        hres = IAVIFile_Info(iface,&afiw,sizeof(afiw));
    408429        memcpy(afi,&afiw,sizeof(*afi)-sizeof(afi->szFileType));
    409         lstrcpynWtoA(afi->szFileType,afiw.szFileType,sizeof(afi->szFileType));
     430        WideCharToMultiByte( CP_ACP, 0, afiw.szFileType, -1,
     431                             afi->szFileType, sizeof(afi->szFileType), NULL, NULL );
     432        afi->szFileType[sizeof(afi->szFileType)-1] = 0;
    410433        return hres;
    411434}
    412435
     436/***********************************************************************
     437 *              AVIStreamInfoW
     438 */
    413439HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG
    414440 size) {
    … …  
    416442}
    417443
     444/***********************************************************************
     445 *              AVIStreamInfoA
     446 */
    418447HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG
    419448 size) {
    … …  
    425454        hres = IAVIFile_Info(iface,&asiw,sizeof(asiw));
    426455        memcpy(asi,&asiw,sizeof(asiw)-sizeof(asiw.szName));
    427         lstrcpynWtoA(asi->szName,asiw.szName,sizeof(asi->szName));
     456        WideCharToMultiByte( CP_ACP, 0, asiw.szName, -1,
     457                             asi->szName, sizeof(asi->szName), NULL, NULL );
     458        asi->szName[sizeof(asi->szName)-1] = 0;
    428459        return hres;
    429460}
    430461
     462/***********************************************************************
     463 *              AVIFileInfoW
     464 */
    431465HRESULT WINAPI AVIFileInfoW(PAVIFILE iface,LPAVIFILEINFOW afi,LONG size) {
    432466        return IAVIFile_Info(iface,afi,size);
    433467}
    434468
     469/***********************************************************************
     470 *              AVIMakeCompressedStream
     471 */
    435472HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *aco,CLSID *pclsidHandler) {
    436473        char                    fcc[5];
    … …  
    469506                icf.lKeyRate    = aco->dwKeyFrameEvery;
    470507
    471                 icf.GetData = (LONG (_stdcall *)(LPARAM,LONG,LPVOID,LONG)) 0xdead4242;
    472                 icf.PutData = (LONG (_stdcall *)(LPARAM,LONG,LPVOID,LONG)) 0xdead4243;
     508#ifdef __WIN32OS2__
     509                *(DWORD *)&icf.GetData = 0xdead4242;
     510                *(DWORD *)&icf.PutData = 0xdead4243;
     511#else
     512                icf.GetData = (void *)0xdead4242;
     513                icf.PutData = (void *)0xdead4243;
     514#endif
    473515                ICSendMessage(as->hic,ICM_COMPRESS_FRAMES_INFO,(LPARAM)&icf,sizeof(icf));
    474516        }
    … …  
    476518}
    477519
     520/***********************************************************************
     521 *              AVIStreamSetFormat
     522 */
    478523HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize) {
    479524        return IAVIStream_SetFormat(iface,pos,format,formatsize);
    480525}
    481526
     527/***********************************************************************
     528 *              AVIStreamReadFormat
     529 */
    482530HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize) {
    483531        return IAVIStream_ReadFormat(iface,pos,format,formatsize);
    484532}
    485533
     534/***********************************************************************
     535 *              AVIStreamWrite(
     536 */
    486537HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten) {
    487538        return IAVIStream_Write(iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
    488539}
    489540
     541/***********************************************************************
     542 *              AVIStreamRead
     543 */
    490544HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
    491545        return IAVIStream_Read(iface,start,samples,buffer,buffersize,bytesread,samplesread);
    492546}
    493547
     548/***********************************************************************
     549 *              AVIStreamWriteData
     550 */
    494551HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size) {
    495552        return IAVIStream_WriteData(iface,fcc,lp,size);
    496553}
    497554
     555/***********************************************************************
     556 *              AVIStreamReadData
     557 */
    498558HRESULT WINAPI AVIStreamReadData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG *lpread) {
    499559        return IAVIStream_ReadData(iface,fcc,lp,lpread);
    500560}
    501561
     562/***********************************************************************
     563 *              AVIStreamStart
     564 */
    502565LONG WINAPI AVIStreamStart(PAVISTREAM iface) {
    503566        AVISTREAMINFOW  si;
    … …  
    507570}
    508571
     572/***********************************************************************
     573 *              AVIStreamLength
     574 */
    509575LONG WINAPI AVIStreamLength(PAVISTREAM iface) {
    510576        AVISTREAMINFOW  si;
    … …  
    517583}
    518584
     585/***********************************************************************
     586 *              AVIStreamRelease
     587 */
    519588ULONG WINAPI AVIStreamRelease(PAVISTREAM iface) {
    520589        return IAVIStream_Release(iface);
    521590}
    522591
     592/***********************************************************************
     593 *              AVIStreamGetFrameOpen
     594 */
    523595PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM iface,LPBITMAPINFOHEADER bmi) {
    524         FIXME_(msvideo)("(%p)->(%p),stub!\n",iface,bmi);
     596        FIXME("(%p)->(%p),stub!\n",iface,bmi);
    525597        return NULL;
    526598}
    527599
     600/***********************************************************************
     601 *              AVIStreamGetFrame
     602 */
    528603LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg,LONG pos) {
    529604        return IGetFrame_GetFrame(pg,pos);
    530605}
    531606
     607/***********************************************************************
     608 *              AVIStreamGetFrameClose
     609 */
    532610HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg) {
    533611        if (pg) IGetFrame_Release(pg);
    … …  
    535613}
    536614
     615/***********************************************************************
     616 *              AVIFileRelease
     617 */
    537618ULONG WINAPI AVIFileRelease(PAVIFILE iface) {
    538619        return IAVIFile_Release(iface);
    539620}
    540621
     622/***********************************************************************
     623 *              AVIFileExit
     624 */
    541625void WINAPI AVIFileExit(void) {
    542626        FIXME("(), stub.\n");
    543627}
     628
     629#ifdef __WIN32OS2__
     630LONG WINAPI AVIStreamTimeToSample (PAVISTREAM pavi, LONG lTime)
     631{
     632    return 0;
     633}
     634
     635LONG WINAPI AVIStreamSampleToTime (PAVISTREAM pavi, LONG lSample)
     636{
     637    return 0;
     638}
     639#endif
Note: See TracChangeset for help on using the changeset viewer.