Changeset 1658 for trunk/src

Timestamp:

Nov 9, 1999, 1:49:13 PM (26 years ago)

Author:

bird

Message:

Corrected some lpvtbl accesses to ICOM_VTBL.

File:

• trunk/src/avifil32/avifile.cpp (modified) (12 diffs)

trunk/src/avifil32/avifile.cpp

@@ -1 @@
-/* $Id: avifile.cpp,v 1.3 1999-10-03 20:20:57 sandervl Exp $ */
+/* $Id: avifile.cpp,v 1.4 1999-11-09 12:49:13 bird Exp $ */
 /*
  * Copyright 1999 Marcus Meissner
@@ -387 +387 @@
         memcpy(&psiw,psi,sizeof(*psi)-sizeof(psi->szName));
         lstrcpynAtoW(psiw.szName,psi->szName,sizeof(psi->szName));
-        return iface->lpvtbl->fnCreateStream(iface,ppavi,&psiw);
+        return ICOM_VTBL(iface)->fnCreateStream(iface,ppavi,&psiw);
 }
 
 HRESULT WINAPI AVIFileCreateStreamW(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi) {
-        return iface->lpvtbl->fnCreateStream(iface,avis,asi);
+        return ICOM_VTBL(iface)->fnCreateStream(iface,avis,asi);
 }
 
 
 HRESULT WINAPI AVIFileGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam) {
-        return iface->lpvtbl->fnGetStream(iface,avis,fccType,lParam);
+        return ICOM_VTBL(iface)->fnGetStream(iface,avis,fccType,lParam);
 }
 
@@ -405 +405 @@
         if (size < sizeof(AVIFILEINFOA))
                 return AVIERR_BADSIZE;
-        hres = iface->lpvtbl->fnInfo(iface,&afiw,sizeof(afiw));
+        hres = ICOM_VTBL(iface)->fnInfo(iface,&afiw,sizeof(afiw));
         memcpy(afi,&afiw,sizeof(*afi)-sizeof(afi->szFileType));
         lstrcpynWtoA(afi->szFileType,afiw.szFileType,sizeof(afi->szFileType));
@@ -413 +413 @@
 HRESULT WINAPI AVIStreamInfoW(PAVISTREAM iface,AVISTREAMINFOW *asi,LONG
  size) {
-        return iface->lpvtbl->fnInfo(iface,asi,size);
+        return ICOM_VTBL(iface)->fnInfo(iface,asi,size);
 }
 
@@ -423 +423 @@
         if (size<sizeof(AVISTREAMINFOA))
                 return AVIERR_BADSIZE;
-        hres = iface->lpvtbl->fnInfo(iface,&asiw,sizeof(asiw));
+        hres = ICOM_VTBL(iface)->fnInfo(iface,&asiw,sizeof(asiw));
         memcpy(asi,&asiw,sizeof(asiw)-sizeof(asiw.szName));
         lstrcpynWtoA(asi->szName,asiw.szName,sizeof(asi->szName));
@@ -430 +430 @@
 
 HRESULT WINAPI AVIFileInfoW(PAVIFILE iface,LPAVIFILEINFOW afi,LONG size) {
-        return iface->lpvtbl->fnInfo(iface,afi,size);
+        return ICOM_VTBL(iface)->fnInfo(iface,afi,size);
 }
 
@@ -445 +445 @@
 
         /* we just create a duplicate for now */
-        ((IUnknown*)ppsSource)->lpvtbl->fnAddRef((IUnknown*)ppsSource);
+        ICOM_VTBL((IUnknown*)ppsSource)->fnAddRef((IUnknown*)ppsSource);
         *ppsCompressed = ppsSource;
         as = (IAVIStreamImpl*)ppsSource;
@@ -477 +477 @@
 
 HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG formatsize) {
-        return iface->lpvtbl->fnSetFormat(iface,pos,format,formatsize);
+        return ICOM_VTBL(iface)->fnSetFormat(iface,pos,format,formatsize);
 }
 
 HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM iface,LONG pos,LPVOID format,LONG *formatsize) {
-        return iface->lpvtbl->fnReadFormat(iface,pos,format,formatsize);
+        return ICOM_VTBL(iface)->fnReadFormat(iface,pos,format,formatsize);
 }
 
 HRESULT WINAPI AVIStreamWrite(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten) {
-        return iface->lpvtbl->fnWrite(iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
+        return ICOM_VTBL(iface)->fnWrite(iface,start,samples,buffer,buffersize,flags,sampwritten,byteswritten);
 }
 
 HRESULT WINAPI AVIStreamRead(PAVISTREAM iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
-        return iface->lpvtbl->fnRead(iface,start,samples,buffer,buffersize,bytesread,samplesread);
+        return ICOM_VTBL(iface)->fnRead(iface,start,samples,buffer,buffersize,bytesread,samplesread);
 }
 
 HRESULT WINAPI AVIStreamWriteData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG size) {
-        return iface->lpvtbl->fnWriteData(iface,fcc,lp,size);
+        return ICOM_VTBL(iface)->fnWriteData(iface,fcc,lp,size);
 }
 
 HRESULT WINAPI AVIStreamReadData(PAVISTREAM iface,DWORD fcc,LPVOID lp,LONG *lpread) {
-        return iface->lpvtbl->fnReadData(iface,fcc,lp,lpread);
+        return ICOM_VTBL(iface)->fnReadData(iface,fcc,lp,lpread);
 }
 
@@ -503 +503 @@
         AVISTREAMINFOW  si;
 
-        iface->lpvtbl->fnInfo(iface,&si,sizeof(si));
+        ICOM_VTBL(iface)->fnInfo(iface,&si,sizeof(si));
         return si.dwStart;
 }
@@ -511 +511 @@
         HRESULT                 ret;
 
-        ret = iface->lpvtbl->fnInfo(iface,&si,sizeof(si));
+        ret = ICOM_VTBL(iface)->fnInfo(iface,&si,sizeof(si));
         if (ret) /* error */
                 return 1;
@@ -518 +518 @@
 
 ULONG WINAPI AVIStreamRelease(PAVISTREAM iface) {
-        return ((LPUNKNOWN)iface)->lpvtbl->fnRelease((LPUNKNOWN)iface);
+        return ICOM_VTBL((LPUNKNOWN)iface)->fnRelease((LPUNKNOWN)iface);
 }
 
@@ -527 +527 @@
 
 LPVOID WINAPI AVIStreamGetFrame(PGETFRAME pg,LONG pos) {
-        return pg->lpvtbl->fnGetFrame(pg,pos);
+        return ICOM_VTBL(pg)->fnGetFrame(pg,pos);
 }
 
 HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME pg) {
-        if (pg) ((LPUNKNOWN)pg)->lpvtbl->fnRelease((LPUNKNOWN)pg);
+        if (pg) ICOM_VTBL((LPUNKNOWN)pg)->fnRelease((LPUNKNOWN)pg);
         return 0;
 }
 
 ULONG WINAPI AVIFileRelease(PAVIFILE iface) {
-        return ((LPUNKNOWN)iface)->lpvtbl->fnRelease((LPUNKNOWN)iface);
+        return ICOM_VTBL((LPUNKNOWN)iface)->fnRelease((LPUNKNOWN)iface);
 }