From c64432cebe8d70c04d0cd7df58b5b7c41690082a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.de>
Date: Sat, 2 Jul 2005 10:49:39 +0000
Subject: [PATCH] Use CoCreateInstance instead of SHCoCreateInstance, drop
 shell32 from imports. Call OleInitialize() on AVIFileInit.

---
 dlls/avifil32/Makefile.in |  2 +-
 dlls/avifil32/api.c       | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index dbf3279da53..793b9257ffa 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = avifil32.dll
 IMPORTLIB = libavifil32.$(IMPLIBEXT)
-IMPORTS   = msacm32 msvfw32 shell32 winmm ole32 user32 advapi32 kernel32 ntdll
+IMPORTS   = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll
 EXTRALIBS = -luuid
 
 C_SRCS = \
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 8be7900edc8..8f0067ffdd9 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -176,8 +176,7 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid)
  *		AVIFileInit		(AVIFILE.100)
  */
 void WINAPI AVIFileInit(void) {
-  /* need to load ole32.dll if not already done and get some functions */
-  FIXME("(): stub!\n");
+  OleInitialize(NULL);
 }
 
 /***********************************************************************
@@ -186,6 +185,7 @@ void WINAPI AVIFileInit(void) {
  */
 void WINAPI AVIFileExit(void) {
   /* need to free ole32.dll if we are the last exit call */
+  /* OleUnitialize() */
   FIXME("(): stub!\n");
 }
 
@@ -253,8 +253,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode,
     memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler));
 
   /* create instance of handler */
-  hr = SHCoCreateInstance(NULL, &clsidHandler, NULL,
-			  &IID_IAVIFile, (LPVOID*)ppfile);
+  hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIFile, (LPVOID*)ppfile);
   if (FAILED(hr) || *ppfile == NULL)
     return hr;
 
@@ -493,8 +492,7 @@ HRESULT WINAPI AVIStreamCreate(PAVISTREAM *ppavi, LONG lParam1, LONG lParam2,
   if (pclsidHandler == NULL)
     return AVIERR_UNSUPPORTED;
 
-  hr = SHCoCreateInstance(NULL, pclsidHandler, NULL,
-			  &IID_IAVIStream, (LPVOID*)ppavi);
+  hr = CoCreateInstance(pclsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppavi);
   if (FAILED(hr) || *ppavi == NULL)
     return hr;
 
@@ -751,8 +749,7 @@ HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM *ppsCompressed,
   } else
     memcpy(&clsidHandler, pclsidHandler, sizeof(clsidHandler));
 
-  hr = SHCoCreateInstance(NULL, &clsidHandler, NULL,
-			  &IID_IAVIStream, (LPVOID*)ppsCompressed);
+  hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppsCompressed);
   if (FAILED(hr) || *ppsCompressed == NULL)
     return hr;