Ignore:
Timestamp:
Feb 3, 2000, 2:26:23 PM (26 years ago)
Author:
sandervl
Message:

header updates

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/win/wine/obj_base.h

    r1626 r2606  
    1 /* $Id: obj_base.h,v 1.14 1999-11-05 20:38:46 davidr Exp $ */
     1/* $Id: obj_base.h,v 1.15 2000-02-03 13:26:23 sandervl Exp $ */
    22/*
    33 * This file defines the macros and types necessary to define COM interfaces,
     
    453453
    454454#define ICOM_METHOD(ret,xfn) \
    455     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me);
     455    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me);
    456456#define ICOM_METHOD1(ret,xfn,ta,na) \
    457     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a);
     457    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a);
    458458#define ICOM_METHOD2(ret,xfn,ta,na,tb,nb) \
    459     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b);
     459    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b);
    460460#define ICOM_METHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
    461     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
     461    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
    462462#define ICOM_METHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
    463     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     463    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    464464#define ICOM_METHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    465     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     465    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    466466#define ICOM_METHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    467     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     467    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    468468#define ICOM_METHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    469     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     469    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    470470#define ICOM_METHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    471     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     471    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    472472#define ICOM_METHOD9(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni) \
    473     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i);
     473    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i);
    474474#define ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \
    475     ret (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j);
     475    ret (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j);
    476476
    477477#define ICOM_CMETHOD(ret,xfn) \
    478         ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me);
     478        ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me);
    479479#define ICOM_CMETHOD1(ret,xfn,ta,na) \
    480     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a);
     480    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a);
    481481#define ICOM_CMETHOD2(ret,xfn,ta,na,tb,nb) \
    482     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b);
     482    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b);
    483483#define ICOM_CMETHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
    484     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
     484    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
    485485#define ICOM_CMETHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
    486     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     486    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    487487#define ICOM_CMETHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    488     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     488    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    489489#define ICOM_CMETHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    490     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     490    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    491491#define ICOM_CMETHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    492     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     492    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    493493#define ICOM_CMETHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    494     ret (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     494    ret (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    495495
    496496#define ICOM_VMETHOD(xfn) \
    497     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me);
     497    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me);
    498498#define ICOM_VMETHOD1(xfn,ta,na) \
    499     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a);
     499    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a);
    500500#define ICOM_VMETHOD2(xfn,ta,na,tb,nb) \
    501     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b);
     501    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b);
    502502#define ICOM_VMETHOD3(xfn,ta,na,tb,nb,tc,nc) \
    503     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
     503    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
    504504#define ICOM_VMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \
    505     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     505    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    506506#define ICOM_VMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    507     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     507    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    508508#define ICOM_VMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    509     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     509    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    510510#define ICOM_VMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    511     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     511    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    512512#define ICOM_VMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,nh) \
    513     void (CALLBACK *fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     513    void (* CALLBACK fn##xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    514514
    515515#define ICOM_CVMETHOD(xfn) \
    516         void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me);
     516        void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me);
    517517#define ICOM_CVMETHOD1(xfn,ta,na) \
    518     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a);
     518    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a);
    519519#define ICOM_CVMETHOD2(xfn,ta,na,tb,nb) \
    520     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b);
     520    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b);
    521521#define ICOM_CVMETHOD3(xfn,ta,na,tb,nb,tc,nc) \
    522     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
     522    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
    523523#define ICOM_CVMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \
    524     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     524    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    525525#define ICOM_CVMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    526     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     526    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    527527#define ICOM_CVMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    528     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     528    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    529529#define ICOM_CVMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    530     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     530    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    531531#define ICOM_CVMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    532     void (CALLBACK *fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     532    void (* CALLBACK fn##xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    533533
    534534#define ICOM_CALL(xfn, p)                       ICOM_VTBL(p)->fn##xfn(p)
     
    549549
    550550#define ICOM_METHOD(ret,xfn) \
    551     ret (CALLBACK *xfn)(ICOM_INTERFACE* me);
     551    ret (* CALLBACK xfn)(ICOM_INTERFACE* me);
    552552#define ICOM_METHOD1(ret,xfn,ta,na) \
    553     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a);
     553    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a);
    554554#define ICOM_METHOD2(ret,xfn,ta,na,tb,nb) \
    555     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b);
     555    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b);
    556556#define ICOM_METHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
    557     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
     557    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
    558558#define ICOM_METHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
    559     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     559    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    560560#define ICOM_METHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    561     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     561    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    562562#define ICOM_METHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    563     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     563    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    564564#define ICOM_METHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    565     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     565    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    566566#define ICOM_METHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    567     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     567    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    568568#define ICOM_METHOD9(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni) \
    569     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i);
     569    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i);
    570570#define ICOM_METHOD10(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh,ti,ni,tj,nj) \
    571     ret (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j);
     571    ret (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h,ti i,tj j);
    572572
    573573#define ICOM_CMETHOD(ret,xfn) \
    574         ret (CALLBACK *xfn)(const ICOM_INTERFACE* me);
     574        ret (* CALLBACK xfn)(const ICOM_INTERFACE* me);
    575575#define ICOM_CMETHOD1(ret,xfn,ta,na) \
    576     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a);
     576    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a);
    577577#define ICOM_CMETHOD2(ret,xfn,ta,na,tb,nb) \
    578     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b);
     578    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b);
    579579#define ICOM_CMETHOD3(ret,xfn,ta,na,tb,nb,tc,nc) \
    580     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
     580    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
    581581#define ICOM_CMETHOD4(ret,xfn,ta,na,tb,nb,tc,nc,td,nd) \
    582     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     582    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    583583#define ICOM_CMETHOD5(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    584     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     584    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    585585#define ICOM_CMETHOD6(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    586     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     586    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    587587#define ICOM_CMETHOD7(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    588     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     588    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    589589#define ICOM_CMETHOD8(ret,xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    590     ret (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     590    ret (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    591591
    592592#define ICOM_VMETHOD(xfn) \
    593     void (CALLBACK *xfn)(ICOM_INTERFACE* me);
     593    void (* CALLBACK xfn)(ICOM_INTERFACE* me);
    594594#define ICOM_VMETHOD1(xfn,ta,na) \
    595     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a);
     595    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a);
    596596#define ICOM_VMETHOD2(xfn,ta,na,tb,nb) \
    597     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b);
     597    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b);
    598598#define ICOM_VMETHOD3(xfn,ta,na,tb,nb,tc,nc) \
    599     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
     599    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c);
    600600#define ICOM_VMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \
    601     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     601    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    602602#define ICOM_VMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    603     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     603    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    604604#define ICOM_VMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    605     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     605    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    606606#define ICOM_VMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    607     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     607    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    608608#define ICOM_VMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,nh) \
    609     void (CALLBACK *xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     609    void (* CALLBACK xfn)(ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    610610
    611611#define ICOM_CVMETHOD(xfn) \
    612         void (CALLBACK *xfn)(const ICOM_INTERFACE* me);
     612        void (* CALLBACK xfn)(const ICOM_INTERFACE* me);
    613613#define ICOM_CVMETHOD1(xfn,ta,na) \
    614     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a);
     614    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a);
    615615#define ICOM_CVMETHOD2(xfn,ta,na,tb,nb) \
    616     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b);
     616    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b);
    617617#define ICOM_CVMETHOD3(xfn,ta,na,tb,nb,tc,nc) \
    618     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
     618    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c);
    619619#define ICOM_CVMETHOD4(xfn,ta,na,tb,nb,tc,nc,td,nd) \
    620     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
     620    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d);
    621621#define ICOM_CVMETHOD5(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne) \
    622     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
     622    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e);
    623623#define ICOM_CVMETHOD6(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf) \
    624     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
     624    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f);
    625625#define ICOM_CVMETHOD7(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng) \
    626     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
     626    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g);
    627627#define ICOM_CVMETHOD8(xfn,ta,na,tb,nb,tc,nc,td,nd,te,ne,tf,nf,tg,ng,th,nh) \
    628     void (CALLBACK *xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
     628    void (* CALLBACK xfn)(const ICOM_INTERFACE* me,ta a,tb b,tc c,td d,te e,tf f,tg g,th h);
    629629
    630630#define ICOM_CALL(xfn, p)                       ICOM_VTBL(p)->xfn(p)
Note: See TracChangeset for help on using the changeset viewer.