Implemented some part of AVIFIL32.

dlls/avifil32/Makefile.in

@@ -10,7 +10,13 @@ LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
 C_SRCS = \
-	avifile.c
+	api.c \
+	comentry.c \
+	iafile.c \
+	iastream.c \
+	igframe.c \
+	main.c \
+	string.c
 
 @MAKE_DLL_RULES@
 

dlls/avifil32/avifil32.spec

 name	avifil32
 type	win32
+init	AVIFILE_DllMain
 
 import msvfw32.dll
+import ole32.dll
 import kernel32.dll
 import ntdll.dll
 
@@ -43,7 +45,7 @@ debug_channels (avifile)
 @ stub    AVISaveW
 @ stub    AVIStreamAddRef
 @ stub    AVIStreamBeginStreaming
-@ stub    AVIStreamCreate
+@ stdcall AVIStreamCreate(ptr long long ptr) AVIStreamCreate
 @ stub    AVIStreamEndStreaming
 @ stub    AVIStreamFindSample
 @ stdcall AVIStreamGetFrame(ptr long) AVIStreamGetFrame

dlls/avifil32/avifile_private.h

+#ifndef __WINE_AVIFILE_PRIVATE_H
+#define __WINE_AVIFILE_PRIVATE_H
+
+typedef struct
+{
+	HANDLE	hHeap;
+	DWORD	dwAVIFileRef;
+	DWORD	dwClassObjRef;
+	BOOL	fInitCOM;
+} WINE_AVIFILE_DATA;
+
+extern WINE_AVIFILE_DATA	AVIFILE_data;
+
+INT AVIFILE_strlenAtoW( LPCSTR lpstr );
+INT AVIFILE_strlenWtoA( LPCWSTR lpwstr );
+LPWSTR AVIFILE_strncpyAtoW( LPWSTR lpwstr, LPCSTR lpstr, INT wbuflen );
+LPSTR AVIFILE_strncpyWtoA( LPSTR lpstr, LPCWSTR lpwstr, INT abuflen );
+LPWSTR AVIFILE_strdupAtoW( LPCSTR lpstr );
+LPSTR AVIFILE_strdupWtoA( LPCWSTR lpwstr );
+
+HRESULT WINAPI AVIFILE_DllGetClassObject(const CLSID* pclsid,const IID* piid,void** ppv);
+
+HRESULT AVIFILE_CreateIAVIFile(void** ppobj);
+HRESULT AVIFILE_IAVIFile_Open( PAVIFILE paf, LPCWSTR szFile, UINT uMode );
+HRESULT AVIFILE_IAVIFile_GetIndexTable( PAVIFILE paf, DWORD dwStreamIndex,
+					AVIINDEXENTRY** ppIndexEntry,
+					DWORD* pdwCountOfIndexEntry );
+HRESULT AVIFILE_IAVIFile_ReadMovieData( PAVIFILE paf, DWORD dwOffset,
+					DWORD dwLength, LPVOID lpvBuf );
+
+HRESULT AVIFILE_CreateIAVIStream(void** ppobj);
+
+HRESULT AVIFILE_CreateIGetFrame(void** ppobj,
+				IAVIStream* pstr,LPBITMAPINFOHEADER lpbi);
+
+
+typedef struct
+{
+	DWORD	dwStreamIndex;
+	AVIStreamHeader*	pstrhdr;
+	BYTE*	pbFmt;
+	DWORD	dwFmtLen;
+} WINE_AVISTREAM_DATA;
+
+WINE_AVISTREAM_DATA* AVIFILE_Alloc_IAVIStreamData( DWORD dwFmtLen );
+void AVIFILE_Free_IAVIStreamData( WINE_AVISTREAM_DATA* pData );
+
+/* this should be moved to vfw.h */
+#ifndef FIND_DIR
+#define FIND_DIR	0x0000000FL
+#define FIND_NEXT	0x00000001L
+#define FIND_PREV	0x00000004L
+#define FIND_FROM_START	0x00000008L
+
+#define FIND_TYPE	0x000000F0L
+#define FIND_KEY	0x00000010L
+#define FIND_ANY	0x00000020L
+#define FIND_FORMAT	0x00000040L
+
+#define FIND_RET	0x0000F000L
+#define FIND_POS	0x00000000L
+#define FIND_LENGTH	0x00001000L
+#define FIND_OFFSET	0x00002000L
+#define FIND_SIZE	0x00003000L
+#define FIND_INDEX	0x00004000L
+#endif
+
+#endif  /* __WINE_AVIFILE_PRIVATE_H */

dlls/avifil32/comentry.c

+/*
+ * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "winbase.h"
+#include "winnls.h"
+#include "mmsystem.h"
+#include "winerror.h"
+#include "ole2.h"
+#include "vfw.h"
+#include "debugtools.h"
+#include "avifile_private.h"
+
+DEFAULT_DEBUG_CHANNEL(avifile);
+
+static HRESULT WINAPI
+IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj);
+static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface);
+static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface);
+static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj);
+static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock);
+
+static ICOM_VTABLE(IClassFactory) iclassfact =
+{
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IClassFactory_fnQueryInterface,
+	IClassFactory_fnAddRef,
+	IClassFactory_fnRelease,
+	IClassFactory_fnCreateInstance,
+	IClassFactory_fnLockServer
+};
+
+typedef struct
+{
+	/* IUnknown fields */
+	ICOM_VFIELD(IClassFactory);
+	DWORD	ref;
+} IClassFactoryImpl;
+
+static IClassFactoryImpl AVIFILE_GlobalCF = {&iclassfact, 0 };
+
+
+
+static HRESULT WINAPI
+IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+
+	TRACE("(%p)->(%p,%p)\n",This,riid,ppobj);
+	if ( ( IsEqualGUID( &IID_IUnknown, riid ) ) ||
+	     ( IsEqualGUID( &IID_IClassFactory, riid ) ) )
+	{
+		*ppobj = iface;
+		IClassFactory_AddRef(iface);
+		return S_OK;
+	}
+
+	return E_NOINTERFACE;
+}
+
+static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+
+	TRACE("(%p)->()\n",This);
+	if ( (This->ref) == 0 )
+		AVIFILE_data.dwClassObjRef ++;
+
+	return ++(This->ref);
+}
+
+static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+
+	TRACE("(%p)->()\n",This);
+	if ( (--(This->ref)) > 0 )
+		return This->ref;
+
+	AVIFILE_data.dwClassObjRef --;
+	return 0;
+}
+
+static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj)
+{
+    /*ICOM_THIS(IClassFactoryImpl,iface);*/
+
+	*ppobj = NULL;
+	if ( pOuter != NULL )
+		return E_FAIL;
+
+	if ( IsEqualGUID( &IID_IAVIFile, riid ) )
+		return AVIFILE_CreateIAVIFile(ppobj);
+	if ( IsEqualGUID( &IID_IAVIStream, riid ) )
+		return AVIFILE_CreateIAVIStream(ppobj);
+
+	return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock)
+{
+	ICOM_THIS(IClassFactoryImpl,iface);
+	HRESULT	hr;
+
+	FIXME("(%p)->(%d),stub!\n",This,dolock);
+	if (dolock)
+		hr = IClassFactory_AddRef(iface);
+	else
+		hr = IClassFactory_Release(iface);
+
+	return hr;
+}
+
+
+/***********************************************************************
+ *		DllGetClassObject (AVIFIL32.@)
+ */
+HRESULT WINAPI AVIFILE_DllGetClassObject(const CLSID* pclsid,const IID* piid,void** ppv)
+{
+	*ppv = NULL;
+	if ( IsEqualCLSID( &IID_IClassFactory, piid ) )
+	{
+		*ppv = (LPVOID)&AVIFILE_GlobalCF;
+		IClassFactory_AddRef((IClassFactory*)*ppv);
+		return S_OK;
+	}
+
+	return CLASS_E_CLASSNOTAVAILABLE;
+}
+
+/*****************************************************************************
+ *		DllCanUnloadNow (AVIFIL32.@)
+ */
+DWORD WINAPI AVIFILE_DllCanUnloadNow(void)
+{
+	return ( AVIFILE_data.dwClassObjRef == 0 ) ? S_OK : S_FALSE;
+}
+

dlls/avifil32/main.c

+/*
+ * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "winbase.h"
+#include "winnls.h"
+#include "mmsystem.h"
+#include "winerror.h"
+#include "vfw.h"
+#include "debugtools.h"
+#include "avifile_private.h"
+
+DEFAULT_DEBUG_CHANNEL(avifile);
+
+WINE_AVIFILE_DATA AVIFILE_data;
+
+
+/***********************************************************************
+ *		AVIFILE_InitProcess (internal)
+ */
+static BOOL AVIFILE_InitProcess( void )
+{
+	TRACE("()\n");
+
+	AVIFILE_data.dwAVIFileRef = 0;
+	AVIFILE_data.dwClassObjRef = 0;
+	AVIFILE_data.hHeap = (HANDLE)NULL;
+
+	AVIFILE_data.hHeap = HeapCreate( 0, 0x10000, 0 );
+	if ( AVIFILE_data.hHeap  == (HANDLE)NULL )
+	{
+		ERR( "cannot allocate heap for AVIFILE.\n" );
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/***********************************************************************
+ *		AVIFILE_UninitProcess (internal)
+ */
+static void AVIFILE_UninitProcess( void )
+{
+	TRACE("()\n");
+
+	if ( AVIFILE_data.dwAVIFileRef != 0 )
+		ERR( "you must call AVIFileExit()\n" );
+
+	if ( AVIFILE_data.dwClassObjRef != 0 )
+		ERR( "you must release some objects allocated from AVIFile.\n" );
+
+	if ( AVIFILE_data.hHeap != (HANDLE)NULL )
+	{
+		HeapDestroy( AVIFILE_data.hHeap );
+		AVIFILE_data.hHeap = (HANDLE)NULL;
+	}
+}
+
+/***********************************************************************
+ *		AVIFILE_DllMain
+ */
+BOOL WINAPI AVIFILE_DllMain(
+	HINSTANCE hInstDLL,
+	DWORD fdwReason,
+	LPVOID lpvReserved )
+{
+	switch ( fdwReason )
+	{
+	case DLL_PROCESS_ATTACH:
+		if ( !AVIFILE_InitProcess() )
+			return FALSE;
+		break;
+	case DLL_PROCESS_DETACH:
+		AVIFILE_UninitProcess();
+		break;
+	case DLL_THREAD_ATTACH:
+		break;
+	case DLL_THREAD_DETACH:
+		break;
+	}
+
+	return TRUE;
+}
+
+

dlls/avifil32/string.c

+/*
+ * Copyright 2001 Hidenori TAKESHIMA <hidenori@a2.ctktv.ne.jp>
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "winbase.h"
+#include "winnls.h"
+#include "mmsystem.h"
+#include "winerror.h"
+#include "vfw.h"
+#include "debugtools.h"
+#include "avifile_private.h"
+
+DEFAULT_DEBUG_CHANNEL(avifile);
+
+
+/****************************************************************************
+ * string APIs (internal) - Copied from wine/dlls/imm32/string.c
+ */
+
+INT AVIFILE_strlenAtoW( LPCSTR lpstr )
+{
+	INT	len;
+
+	len = MultiByteToWideChar( CP_ACP, 0, lpstr, -1, NULL, 0 );
+	return ( len > 0 ) ? (len-1) : 0;
+}
+
+INT AVIFILE_strlenWtoA( LPCWSTR lpwstr )
+{
+	INT	len;
+
+	len = WideCharToMultiByte( CP_ACP, 0, lpwstr, -1,
+				   NULL, 0, NULL, NULL );
+	return ( len > 0 ) ? (len-1) : 0;
+}
+
+LPWSTR AVIFILE_strncpyAtoW( LPWSTR lpwstr, LPCSTR lpstr, INT wbuflen )
+{
+	INT	len;
+
+	len = MultiByteToWideChar( CP_ACP, 0, lpstr, -1, lpwstr, wbuflen );
+	if ( len == 0 )
+		*lpwstr = 0;
+	return lpwstr;
+}
+
+LPSTR AVIFILE_strncpyWtoA( LPSTR lpstr, LPCWSTR lpwstr, INT abuflen )
+{
+	INT	len;
+
+	len = WideCharToMultiByte( CP_ACP, 0, lpwstr, -1,
+				   lpstr, abuflen, NULL, NULL );
+	if ( len == 0 )
+		*lpstr = 0;
+	return lpstr;
+}
+
+LPWSTR AVIFILE_strdupAtoW( LPCSTR lpstr )
+{
+	INT len;
+	LPWSTR lpwstr = NULL;
+
+	len = AVIFILE_strlenAtoW( lpstr );
+	if ( len > 0 )
+	{
+		lpwstr = (LPWSTR)HeapAlloc( AVIFILE_data.hHeap, 0, sizeof(WCHAR)*(len+1) );
+		if ( lpwstr != NULL )
+			(void)AVIFILE_strncpyAtoW( lpwstr, lpstr, len+1 );
+	}
+
+	return lpwstr;
+}
+
+LPSTR AVIFILE_strdupWtoA( LPCWSTR lpwstr )
+{
+	INT len;
+	LPSTR lpstr = NULL;
+
+	len = AVIFILE_strlenWtoA( lpwstr );
+	if ( len > 0 )
+	{
+		lpstr = (LPSTR)HeapAlloc( AVIFILE_data.hHeap, 0, sizeof(CHAR)*(len+1) );
+		if ( lpstr != NULL )
+			(void)AVIFILE_strncpyWtoA( lpstr, lpwstr, len+1 );
+	}
+
+	return lpstr;
+}
+
+
+

include/vfw.h

@@ -1004,6 +1004,7 @@ ICOM_DEFINE(IAVIStream, IUnknown)
 
 HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler); 
 
+HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*);
 HRESULT WINAPI AVIStreamInfoA(PAVISTREAM iface,AVISTREAMINFOA *asi,LONG size);
 HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG size);
 #define AVIStreamInfo WINELIB_NAME_AW(AVIStreamInfo)