COBJMACROS patch 5

[Francois Gouget]

This patch replaces some calls to IUnknown_QueryInterface() with the 
call for actual object it is called on. I think this change makes sense 
and it helps avoid a few '#define COBJMACROS'.

If this patch is accepted then the next patch will remove the '#define 
COBJMACROS' from objbase.h and we will be done with this. Otherwise 
I'll add the required COBJMACROS and submit them in the next patch.


Changelog:

  * dlls/avifil32/acmstream.c
    dlls/avifil32/avifile.c
    dlls/avifil32/factory.c
    dlls/avifil32/icmstream.c
    dlls/avifil32/wavfile.c

    Replace some IUnknown_QueryInterface() calls with the specific call 
for the object being used.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
In theory, theory and practice are the same, but in practice they're different.
-------------- next part --------------
Index: dlls/avifil32/acmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/acmstream.c,v
retrieving revision 1.13
diff -u -r1.13 acmstream.c
--- dlls/avifil32/acmstream.c	6 Sep 2004 21:34:26 -0000	1.13
+++ dlls/avifil32/acmstream.c	30 Sep 2004 16:12:24 -0000
@@ -119,7 +119,7 @@
 
   pstream->lpVtbl = &iacmst;
 
-  hr = IUnknown_QueryInterface((IUnknown*)pstream, riid, ppv);
+  hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv);
   if (FAILED(hr))
     LocalFree((HLOCAL)pstream);
 
Index: dlls/avifil32/avifile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/avifile.c,v
retrieving revision 1.49
diff -u -r1.49 avifile.c
--- dlls/avifil32/avifile.c	16 Sep 2004 20:29:00 -0000	1.49
+++ dlls/avifil32/avifile.c	30 Sep 2004 16:11:24 -0000
@@ -249,7 +249,7 @@
   pfile->iPersistFile.lpVtbl = &ipersistft;
   pfile->iPersistFile.paf = pfile;
 
-  hr = IUnknown_QueryInterface((IUnknown*)pfile, riid, ppv);
+  hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv);
   if (FAILED(hr))
     LocalFree((HLOCAL)pfile);
 
Index: dlls/avifil32/factory.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/factory.c,v
retrieving revision 1.15
diff -u -r1.15 factory.c
--- dlls/avifil32/factory.c	6 Sep 2004 21:34:26 -0000	1.15
+++ dlls/avifil32/factory.c	30 Sep 2004 16:14:00 -0000
@@ -81,7 +83,7 @@
   pClassFactory->dwRef     = 0;
   memcpy(&pClassFactory->clsid, pclsid, sizeof(pClassFactory->clsid));
 
-  hr = IUnknown_QueryInterface((IUnknown*)pClassFactory, riid, ppv);
+  hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv);
   if (FAILED(hr)) {
     LocalFree((HLOCAL)pClassFactory);
     *ppv = NULL;
Index: dlls/avifil32/icmstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/icmstream.c,v
retrieving revision 1.11
diff -u -r1.11 icmstream.c
--- dlls/avifil32/icmstream.c	6 Sep 2004 21:34:26 -0000	1.11
+++ dlls/avifil32/icmstream.c	30 Sep 2004 16:15:06 -0000
@@ -135,7 +135,7 @@
   pstream->lpVtbl  = &iicmst;
   AVIFILE_Reset(pstream);
 
-  hr = IUnknown_QueryInterface((IUnknown*)pstream, riid, ppv);
+  hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv);
   if (FAILED(hr))
     LocalFree((HLOCAL)pstream);
 
Index: dlls/avifil32/wavfile.c
===================================================================
RCS file: /var/cvs/wine/dlls/avifil32/wavfile.c,v
retrieving revision 1.14
diff -u -r1.14 wavfile.c
--- dlls/avifil32/wavfile.c	6 Sep 2004 21:34:26 -0000	1.14
+++ dlls/avifil32/wavfile.c	30 Sep 2004 16:11:18 -0000
@@ -236,7 +236,7 @@
   pfile->iPersistFile.paf = pfile;
   pfile->iAVIStream.paf   = pfile;
 
-  hr = IUnknown_QueryInterface((IUnknown*)pfile, riid, ppv);
+  hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv);
   if (FAILED(hr))
     LocalFree((HLOCAL)pfile);