From f4f4dff978309af80ff7f9c52d08c68dacaa00af Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@it.vu.nl>
Date: Mon, 27 Dec 2004 16:58:18 +0000
Subject: [PATCH] Stub implementations for AVIMakeStreamFromClipboard,
 AVISave{A,W}. Forward AVIBuildFilter, AVIFileCreateStream, AVIFileOpen,
 AVISave, EditStreamSetInfo, EditStreamSetName to their respective *A
 variants.

---
 dlls/avifil32/api.c         | 32 ++++++++++++++++++++++++++++++++
 dlls/avifil32/avifil32.spec | 20 ++++++++++----------
 include/vfw.h               |  9 +++++++++
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index feb24c505b4..bd8625ad421 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -2289,6 +2289,20 @@ HRESULT WINAPI AVIGetFromClipboard(PAVIFILE *ppfile)
   return AVIERR_UNSUPPORTED;
 }
 
+/***********************************************************************
+ *      AVIMakeStreamFromClipboard (AVIFIL32.@)
+ */
+HRESULT WINAPI AVIMakeStreamFromClipboard(UINT cfFormat, HANDLE hGlobal,
+                                          PAVISTREAM * ppstream)
+{
+  FIXME("(0x%08x,%p,%p), stub!\n", cfFormat, hGlobal, ppstream);
+
+  if (ppstream == NULL)
+    return AVIERR_BADHANDLE;
+
+  return AVIERR_UNSUPPORTED;
+}
+
 /***********************************************************************
  *		AVIPutFileOnClipboard	(AVIFIL32.@)
  */
@@ -2301,3 +2315,21 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile)
 
   return AVIERR_UNSUPPORTED;
 }
+
+HRESULT WINAPI AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback,
+                        int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...)
+{
+    FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_a(szFile), pclsidHandler, lpfnCallback,
+          nStreams, pavi, lpOptions);
+
+    return AVIERR_UNSUPPORTED;
+}
+
+HRESULT WINAPI AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback,
+                        int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...)
+{
+    FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_w(szFile), pclsidHandler, lpfnCallback,
+          nStreams, pavi, lpOptions);
+
+    return AVIERR_UNSUPPORTED;
+}
diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec
index 19ded97f9f7..d853362e151 100644
--- a/dlls/avifil32/avifil32.spec
+++ b/dlls/avifil32/avifil32.spec
@@ -1,9 +1,9 @@
-@ stub    AVIBuildFilter
+@ stdcall AVIBuildFilter(str long long) AVIBuildFilterA
 @ stdcall AVIBuildFilterA(str long long)
 @ stdcall AVIBuildFilterW(wstr long long)
 @ stdcall AVIClearClipboard()
 @ stdcall AVIFileAddRef(ptr)
-@ stub    AVIFileCreateStream
+@ stdcall AVIFileCreateStream(ptr ptr ptr) AVIFileCreateStreamA
 @ stdcall AVIFileCreateStreamA(ptr ptr ptr)
 @ stdcall AVIFileCreateStreamW(ptr ptr ptr)
 @ stdcall AVIFileEndRecord(ptr)
@@ -13,7 +13,7 @@
 @ stdcall AVIFileInfoA(ptr ptr long)
 @ stdcall AVIFileInfoW(ptr ptr long)
 @ stdcall AVIFileInit()
-@ stub    AVIFileOpen
+@ stdcall AVIFileOpen(ptr str long ptr) AVIFileOpenA
 @ stdcall AVIFileOpenA(ptr str long ptr)
 @ stdcall AVIFileOpenW(ptr wstr long ptr)
 @ stdcall AVIFileReadData(ptr long ptr ptr)
@@ -22,16 +22,16 @@
 @ stdcall AVIGetFromClipboard(ptr)
 @ stdcall AVIMakeCompressedStream(ptr ptr ptr ptr)
 @ stdcall AVIMakeFileFromStreams(ptr long ptr)
-@ stub    AVIMakeStreamFromClipboard
+@ stdcall AVIMakeStreamFromClipboard(long long ptr)
 @ stdcall AVIPutFileOnClipboard(ptr)
-@ stub    AVISave
-@ stub    AVISaveA
+@ varargs AVISave(str ptr ptr long ptr ptr) AVISaveA
+@ varargs AVISaveA(str ptr ptr long ptr ptr)
 @ stdcall AVISaveOptions(long long long ptr ptr)
 @ stdcall AVISaveOptionsFree(long ptr)
-@ stub    AVISaveV
+@ stdcall AVISaveV(str ptr ptr long ptr ptr) AVISaveVA
 @ stdcall AVISaveVA(str ptr ptr long ptr ptr)
 @ stdcall AVISaveVW(wstr ptr ptr long ptr ptr)
-@ stub    AVISaveW
+@ varargs AVISaveW(wstr ptr ptr long ptr ptr)
 @ stdcall AVIStreamAddRef(ptr)
 @ stdcall AVIStreamBeginStreaming(ptr long long long)
 @ stdcall AVIStreamCreate(ptr long long ptr)
@@ -67,10 +67,10 @@
 @ stdcall EditStreamCopy(ptr ptr ptr ptr)
 @ stdcall EditStreamCut(ptr ptr ptr ptr)
 @ stdcall EditStreamPaste(ptr ptr ptr ptr long long)
-@ stub    EditStreamSetInfo
+@ stdcall EditStreamSetInfo(ptr ptr long) EditStreamSetInfoA
 @ stdcall EditStreamSetInfoA(ptr ptr long)
 @ stdcall EditStreamSetInfoW(ptr ptr long)
-@ stub    EditStreamSetName
+@ stdcall EditStreamSetName(ptr str) EditStreamSetNameA
 @ stdcall EditStreamSetNameA(ptr str)
 @ stdcall EditStreamSetNameW(ptr wstr)
 @ extern  IID_IAVIEditStream
diff --git a/include/vfw.h b/include/vfw.h
index 7c2b9e8afde..4ab0db61679 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -1051,6 +1051,7 @@ HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg);
 
 HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*ppsCompressed,PAVISTREAM ppsSource,AVICOMPRESSOPTIONS *lpOptions,CLSID*pclsidHandler);
 HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE *ppfile, int nStreams, PAVISTREAM *ppStreams);
+HRESULT WINAPI AVIMakeStreamFromClipboard(UINT cfFormat, HANDLE hGlobal, PAVISTREAM * ppstream);
 
 HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
 				      DWORD fccType, LONG lParam,
@@ -1068,6 +1069,14 @@ BOOL WINAPI AVISaveOptions(HWND hWnd,UINT uFlags,INT nStream,
 			   PAVISTREAM *ppavi,LPAVICOMPRESSOPTIONS *ppOptions);
 HRESULT WINAPI AVISaveOptionsFree(INT nStreams,LPAVICOMPRESSOPTIONS*ppOptions);
 
+HRESULT WINAPI AVISaveA(LPCSTR szFile, CLSID *pclsidHandler,
+             AVISAVECALLBACK lpfnCallback, int nStreams,
+             PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...);
+HRESULT WINAPI AVISaveW(LPCWSTR szFile, CLSID *pclsidHandler,
+             AVISAVECALLBACK lpfnCallback, int nStreams,
+             PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...);
+#define AVISave WINELIB_NAME_AW(AVISave)
+
 HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler,
 			 AVISAVECALLBACK lpfnCallback, int nStream,
 			 PAVISTREAM *ppavi, LPAVICOMPRESSOPTIONS *plpOptions);