Changeset 21479 for trunk/src


Ignore:
Timestamp:
Nov 27, 2010, 11:27:43 AM (15 years ago)
Author:
dmik
Message:

Get rid of dd_obj_base.h which duplicates obj_base.h creating unnecessary mess (symbol/define duplication) and conflicts when both the DDarw and other COM-related headers are included.

Location:
trunk/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ddraw/clipper.cpp

    r9459 r21479  
    2020#include <memory.h>
    2121
    22 #define INITGUID
     22#define CINTERFACE
    2323#include "ddraw2d.h"
    2424#include "clipper.h"
     25
    2526#include <misc.h>
    2627#include <winerror.h>
    … …  
    3940  // no ddraw object is associated
    4041
    41   lpVtbl                  = &Vtbl;
    42   Vtbl.AddRef             = ClipAddRef;
    43   Vtbl.Release            = ClipRelease;
    44   Vtbl.QueryInterface     = ClipQueryInterface;
    45   Vtbl.GetClipList        = ClipGetClipList;
    46   Vtbl.GetHWnd            = ClipGetHWnd;
    47   Vtbl.Initialize         = ClipInitialize;
    48   Vtbl.IsClipListChanged  = ClipIsClipListChanged;
    49   Vtbl.SetClipList        = ClipSetClipList;
    50   Vtbl.SetHWnd            = ClipSetHWnd;
    51 
    52   lpDraw                  = NULL;
     42  lpVtbl                    = &Vtbl;
     43  Vtbl.fnAddRef             = ClipAddRef;
     44  Vtbl.fnRelease            = ClipRelease;
     45  Vtbl.fnQueryInterface     = ClipQueryInterface;
     46  Vtbl.fnGetClipList        = ClipGetClipList;
     47  Vtbl.fnGetHWnd            = ClipGetHWnd;
     48  Vtbl.fnInitialize         = ClipInitialize;
     49  Vtbl.fnIsClipListChanged  = ClipIsClipListChanged;
     50  Vtbl.fnSetClipList        = ClipSetClipList;
     51  Vtbl.fnSetHWnd            = ClipSetHWnd;
     52
     53  lpDraw                    = NULL;
    5354  // lpDraw->Vtbl.AddRef(lpDraw);
    5455  // hDive                   = lpDirectDraw->GetDiveInstance();
    … …  
    6364                 fClipListChangedInt(FALSE)
    6465{
    65   lpVtbl                  = &Vtbl;
    66   Vtbl.AddRef             = ClipAddRef;
    67   Vtbl.Release            = ClipRelease;
    68   Vtbl.QueryInterface     = ClipQueryInterface;
    69   Vtbl.GetClipList        = ClipGetClipList;
    70   Vtbl.GetHWnd            = ClipGetHWnd;
    71   Vtbl.Initialize         = ClipInitialize;
    72   Vtbl.IsClipListChanged  = ClipIsClipListChanged;
    73   Vtbl.SetClipList        = ClipSetClipList;
    74   Vtbl.SetHWnd            = ClipSetHWnd;
    75 
    76   lpDraw                  = lpDirectDraw;
    77   lpDraw->Vtbl.AddRef(lpDraw);
    78   hDive                   = lpDirectDraw->GetDiveInstance();
     66  lpVtbl                    = &Vtbl;
     67  Vtbl.fnAddRef             = ClipAddRef;
     68  Vtbl.fnRelease            = ClipRelease;
     69  Vtbl.fnQueryInterface     = ClipQueryInterface;
     70  Vtbl.fnGetClipList        = ClipGetClipList;
     71  Vtbl.fnGetHWnd            = ClipGetHWnd;
     72  Vtbl.fnInitialize         = ClipInitialize;
     73  Vtbl.fnIsClipListChanged  = ClipIsClipListChanged;
     74  Vtbl.fnSetClipList        = ClipSetClipList;
     75  Vtbl.fnSetHWnd            = ClipSetHWnd;
     76
     77  lpDraw                    = lpDirectDraw;
     78  lpDraw->Vtbl.fnAddRef(lpDraw);
     79  hDive                     = lpDirectDraw->GetDiveInstance();
    7980}
    8081//******************************************************************************
    8182//******************************************************************************
    8283OS2IDirectDrawClipper::~OS2IDirectDrawClipper()
    83 { 
     84{
    8485  if(lpRgnData) free(lpRgnData);
    8586  if(clipWindow) {
    8687      WinSetVisibleRgnNotifyProc(clipWindow, NULL, 0);
    8788  }
    88   lpDraw->Vtbl.Release(lpDraw);
     89  lpDraw->Vtbl.fnRelease(lpDraw);
    8990}
    9091//******************************************************************************
    … …  
    9697  *ppvObj = NULL;
    9798
    98   if(!IsEqualGUID(riid, IID_IDirectDrawClipper) &&
    99      !IsEqualGUID(riid, CLSID_DirectDrawClipper))
     99  if(!IsEqualGUID(riid, &IID_IDirectDrawClipper) &&
     100     !IsEqualGUID(riid, &CLSID_DirectDrawClipper))
    100101//&& !IsEqualGUID(riid, IID_IUnknown))
    101102  return E_NOINTERFACE;
    … …  
    140141//******************************************************************************
    141142//******************************************************************************
    142 HRESULT WIN32API ClipGetClipList(THIS This, LPRECT lpRect, LPRGNDATA lpClipList, 
     143HRESULT WIN32API ClipGetClipList(THIS This, LPRECT lpRect, LPRGNDATA lpClipList,
    143144                                 LPDWORD lpdwSize)
    144145{
    … …  
    154155      dprintf(("WARNING: clipping the cliplist is not yet implemented"));
    155156  }
    156   if(me->clipWindow) 
     157  if(me->clipWindow)
    157158  {
    158159      RECT *rect = (RECT *)&lpClipList->Buffer;
    … …  
    216217      OS2IDirectDraw *os2DD = (OS2IDirectDraw *)lpDD;
    217218      me->lpDraw = os2DD;
    218       me->lpDraw->Vtbl.AddRef(me->lpDraw);
     219      me->lpDraw->Vtbl.fnAddRef(me->lpDraw);
    219220      me->hDive = me->lpDraw->GetDiveInstance();
    220221  }

  • trunk/src/ddraw/ddclipper.cpp

    r9459 r21479  
    1919#include <memory.h>
    2020#include <stdio.h>
    21 #define INITGUID
    22 #define ICOM_CINTERFACE 1
     21
    2322#define CINTERFACE
    24 
    2523#include "ddraw2d.h"
    2624#include "clipper.h"
    … …  
    5957    else
    6058    {
    61         newDDClipper->Vtbl.AddRef((IDirectDrawClipper *)newDDClipper);
     59        newDDClipper->Vtbl.fnAddRef((IDirectDrawClipper *)newDDClipper);
    6260
    6361        rc = newDDClipper->GetLastError();

  • trunk/src/ddraw/ddmain.cpp

    r9459 r21479  
    2222#include <memory.h>
    2323#include <stdio.h>
    24 #define INITGUID
    25 #define ICOM_CINTERFACE 1
     24
    2625#define CINTERFACE
    27 
    2826#include "ddraw2d.h"
    2927#include "winerror.h"
    … …  
    5048  else
    5149  {
    52     newdraw->Vtbl.AddRef((IDirectDraw2 *)newdraw);
     50    newdraw->Vtbl.fnAddRef((IDirectDraw2 *)newdraw);
    5351
    5452    rc = newdraw->GetLastError();
    … …  
    217215  dprintf(("DDRAW:DDCF_CreateInstance"));
    218216  if( lpGUID &&
    219       ( (*lpGUID == IID_IDirectDraw ) ||
    220         (*lpGUID == IID_IDirectDraw2) ||
    221         (*lpGUID == IID_IDirectDraw4))
     217      ( IsEqualGUID(lpGUID, &IID_IDirectDraw) ||
     218        IsEqualGUID(lpGUID, &IID_IDirectDraw2) ||
     219        IsEqualGUID(lpGUID, &IID_IDirectDraw4))
    222220    )
    223221  {
    … …  
    267265  {
    268266    *ppv = (LPVOID)&DDRAW_CF;
    269     DDRAW_CF.lpvtbl->AddRef((IClassFactory*)&DDRAW_CF);
     267    DDRAW_CF.lpvtbl->fnAddRef((IClassFactory*)&DDRAW_CF);
    270268    return S_OK;
    271269  }

  • trunk/src/ddraw/ddraw2d.cpp

    r9560 r21479  
    2323
    2424#define INITGUID
     25#define CINTERFACE
    2526#include "ddraw2d.h"
    2627#include "clipper.h"
    2728#include "palette.h"
    2829#include "surface.h"
     30
    2931#include <misc.h>
    3032#include <string.h>
    … …  
    105107
    106108
    107   if(lpGUID && *lpGUID == IID_IDirect3D)
     109  if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirect3D))
    108110  {
    109111    dprintf(("DDRAW: D3D Interface -> using V4 Interface"));
    … …  
    113115  else
    114116  {
    115     if(lpGUID && *lpGUID == IID_IDirectDraw4)
     117    if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirectDraw4))
    116118    {
    117119      dprintf(("DDRAW: V4 Interface\n"));
    … …  
    184186
    185187  // Check to see if FS DDraw is enabled in ODIN.INI
    186   if (!fNoFSDD && PROFILE_GetOdinIniBool(ODINDDRAW_SECTION, "Fullscreen", FALSE)) 
     188  if (!fNoFSDD && PROFILE_GetOdinIniBool(ODINDDRAW_SECTION, "Fullscreen", FALSE))
    187189  {
    188190#if 0
    … …  
    201203      rc = LoadPMIService();
    202204      dprintf(("DDRAW: LoadPMIService() rc=0x%08X",rc));
    203                
     205
    204206      if (!rc) {
    205207          SetUpModeTable();
    206                        
     208
    207209          bUseFSDD = TRUE;
    208210          dprintf(("DDRAW: Fullscreen enabled",rc));
    209       } 
    210   }     
     211      }
     212  }
    211213}
    212214//******************************************************************************
    … …  
    258260  *ppvObj = NULL;
    259261
    260   if(!IsEqualGUID(riid, CLSID_DirectDraw) &&
    261      !IsEqualGUID(riid, IID_IDirectDraw) &&
    262      !IsEqualGUID(riid, IID_IDirectDraw2) &&
    263      !IsEqualGUID(riid, IID_IDirectDraw4) &&
    264      !IsEqualGUID(riid, IID_IDirect3D))
     262  if(!IsEqualGUID(riid, &CLSID_DirectDraw) &&
     263     !IsEqualGUID(riid, &IID_IDirectDraw) &&
     264     !IsEqualGUID(riid, &IID_IDirectDraw2) &&
     265     !IsEqualGUID(riid, &IID_IDirectDraw4) &&
     266     !IsEqualGUID(riid, &IID_IDirect3D))
    265267//     !IsEqualGUID(riid, IID_IUnknown))
    266268  return E_NOINTERFACE;
    267269
    268270  // ToDo Better way of returning differnent interfaces for same class
    269   if(IsEqualGUID(riid, IID_IDirect3D))
     271  if(IsEqualGUID(riid, &IID_IDirect3D))
    270272  {
    271273    me->lpVtbl3D         = &me->Vtbl3D;
    … …  
    278280  else
    279281  {
    280     if(IsEqualGUID(riid, IID_IDirectDraw4))
     282    if(IsEqualGUID(riid, &IID_IDirectDraw4))
    281283    {
    282284      dprintf(("DDRAW: IID_IDirectDraw4 Interface"));
    … …  
    285287    else
    286288    {
    287       if(IsEqualGUID(riid, IID_IDirectDraw2))
     289      if(IsEqualGUID(riid, &IID_IDirectDraw2))
    288290      {
    289291        dprintf(("DDRAW: IID_IDirectDraw2 Interface"));
    … …  
    366368  else
    367369  {
    368     newclip->Vtbl.AddRef((IDirectDrawClipper *)newclip);
     370    newclip->Vtbl.fnAddRef((IDirectDrawClipper *)newclip);
    369371    rc = newclip->GetLastError();
    370372    if(rc != DD_OK)
    … …  
    422424    else
    423425    {
    424       newpal->Vtbl.AddRef((IDirectDrawPalette *)newpal);
     426      newpal->Vtbl.fnAddRef((IDirectDrawPalette *)newpal);
    425427      rc = newpal->GetLastError();
    426428
    … …  
    465467  else
    466468  {
    467     newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
     469    newsurf->Vtbl.fnAddRef((IDirectDrawSurface *)newsurf);
    468470    rc = newsurf->GetLastError();
    469471    if(rc != DD_OK)
    … …  
    509511  else
    510512  {
    511     newsurf->Vtbl.AddRef((IDirectDrawSurface *)newsurf);
     513    newsurf->Vtbl.fnAddRef((IDirectDrawSurface *)newsurf);
    512514    rc = newsurf->GetLastError();
    513515    if(rc != DD_OK)
    … …  
    20892091// Setup table for 3d devices
    20902092//******************************************************************************
    2091 IDirect3DVtbl DDraw3DTable = 
    2092 {
    2093  D3DQueryInterface, 
    2094  D3DAddRef, 
    2095  D3DRelease, 
    2096  D3DInitialize, 
    2097  D3DEnumDevices, 
    2098  D3DCreateLight, 
    2099  D3DCreateMaterial, 
    2100  D3DCreateViewport, 
     2093IDirect3DVtbl DDraw3DTable =
     2094{
     2095 D3DQueryInterface,
     2096 D3DAddRef,
     2097 D3DRelease,
     2098 D3DInitialize,
     2099 D3DEnumDevices,
     2100 D3DCreateLight,
     2101 D3DCreateMaterial,
     2102 D3DCreateViewport,
    21012103 D3DFindDevice
    21022104};
    … …  
    21042106// Org Interface
    21052107//******************************************************************************
    2106 IDirectDrawVtbl DDrawV1Table = 
    2107 {
    2108  DrawQueryInterface, 
    2109  DrawAddRef, 
    2110  DrawRelease, 
    2111  DrawCompact, 
    2112  DrawCreateClipper, 
    2113  DrawCreatePalette, 
    2114  DrawCreateSurface, 
    2115  DrawDuplicateSurface, 
    2116  DrawEnumDisplayModes, 
    2117  DrawEnumSurfaces, 
    2118  DrawFlipToGDISurface, 
    2119  DrawGetCaps, 
    2120  DrawGetDisplayMode, 
    2121  DrawGetFourCCCodes, 
    2122  DrawGetGDISurface, 
    2123  DrawGetMonitorFrequency, 
    2124  DrawGetScanLine, 
    2125  DrawGetVerticalBlankStatus, 
    2126  DrawInitialize, 
    2127  DrawRestoreDisplayMode, 
    2128  DrawSetCooperativeLevel, 
    2129  DrawSetDisplayMode, 
     2108IDirectDrawVtbl DDrawV1Table =
     2109{
     2110 DrawQueryInterface,
     2111 DrawAddRef,
     2112 DrawRelease,
     2113 DrawCompact,
     2114 DrawCreateClipper,
     2115 DrawCreatePalette,
     2116 DrawCreateSurface,
     2117 DrawDuplicateSurface,
     2118 DrawEnumDisplayModes,
     2119 DrawEnumSurfaces,
     2120 DrawFlipToGDISurface,
     2121 DrawGetCaps,
     2122 DrawGetDisplayMode,
     2123 DrawGetFourCCCodes,
     2124 DrawGetGDISurface,
     2125 DrawGetMonitorFrequency,
     2126 DrawGetScanLine,
     2127 DrawGetVerticalBlankStatus,
     2128 DrawInitialize,
     2129 DrawRestoreDisplayMode,
     2130 DrawSetCooperativeLevel,
     2131 DrawSetDisplayMode,
    21302132 DrawWaitForVerticalBlank
    21312133};
    … …  
    21332135// V2 Interface
    21342136//******************************************************************************
    2135 IDirectDraw2Vtbl DDrawV2Table = 
    2136 {
    2137  DrawQueryInterface, 
    2138  DrawAddRef, 
    2139  DrawRelease, 
    2140  DrawCompact, 
    2141  DrawCreateClipper, 
    2142  DrawCreatePalette, 
    2143  DrawCreateSurface, 
    2144  DrawDuplicateSurface, 
    2145  DrawEnumDisplayModes, 
    2146  DrawEnumSurfaces, 
    2147  DrawFlipToGDISurface, 
    2148  DrawGetCaps, 
    2149  DrawGetDisplayMode, 
    2150  DrawGetFourCCCodes, 
    2151  DrawGetGDISurface, 
    2152  DrawGetMonitorFrequency, 
    2153  DrawGetScanLine, 
    2154  DrawGetVerticalBlankStatus, 
    2155  DrawInitialize, 
    2156  DrawRestoreDisplayMode, 
    2157  DrawSetCooperativeLevel, 
    2158  DrawSetDisplayMode2, 
    2159  DrawWaitForVerticalBlank, 
     2137IDirectDraw2Vtbl DDrawV2Table =
     2138{
     2139 DrawQueryInterface,
     2140 DrawAddRef,
     2141 DrawRelease,
     2142 DrawCompact,
     2143 DrawCreateClipper,
     2144 DrawCreatePalette,
     2145 DrawCreateSurface,
     2146 DrawDuplicateSurface,
     2147 DrawEnumDisplayModes,
     2148 DrawEnumSurfaces,
     2149 DrawFlipToGDISurface,
     2150 DrawGetCaps,
     2151 DrawGetDisplayMode,
     2152 DrawGetFourCCCodes,
     2153 DrawGetGDISurface,
     2154 DrawGetMonitorFrequency,
     2155 DrawGetScanLine,
     2156 DrawGetVerticalBlankStatus,
     2157 DrawInitialize,
     2158 DrawRestoreDisplayMode,
     2159 DrawSetCooperativeLevel,
     2160 DrawSetDisplayMode2,
     2161 DrawWaitForVerticalBlank,
    21602162 DrawGetAvailableVidMem
    21612163};
    … …  
    21632165// New V4 interface
    21642166//******************************************************************************
    2165 IDirectDraw4Vtbl DDrawV4Table = 
    2166 {
    2167  DrawQueryInterface, 
    2168  DrawAddRef,   // todo change to a DrawAddRef4 as handling this has change, 
    2169  DrawRelease,  // see abov, 
    2170  DrawCompact, 
    2171  DrawCreateClipper, 
    2172  DrawCreatePalette, 
    2173  DrawCreateSurface4, 
    2174  DrawDuplicateSurface4, 
    2175  DrawEnumDisplayModes4, 
    2176  DrawEnumSurfaces4, 
    2177  DrawFlipToGDISurface, 
    2178  DrawGetCaps, 
    2179  DrawGetDisplayMode4, 
    2180  DrawGetFourCCCodes, 
    2181  DrawGetGDISurface4, 
    2182  DrawGetMonitorFrequency, 
    2183  DrawGetScanLine, 
    2184  DrawGetVerticalBlankStatus, 
    2185  DrawInitialize, 
    2186  DrawRestoreDisplayMode, 
    2187  DrawSetCooperativeLevel, 
    2188  DrawSetDisplayMode2, 
    2189  DrawWaitForVerticalBlank, 
    2190  DrawGetAvailableVidMem4, 
    2191  DrawGetSurfaceFromDC, 
    2192  DrawRestoreAllSurfaces, 
    2193  DrawTestCooperativeLevel, 
    2194  DrawGetDeviceIdentifier, 
     2167IDirectDraw4Vtbl DDrawV4Table =
     2168{
     2169 DrawQueryInterface,
     2170 DrawAddRef,   // todo change to a DrawAddRef4 as handling this has change,
     2171 DrawRelease,  // see abov,
     2172 DrawCompact,
     2173 DrawCreateClipper,
     2174 DrawCreatePalette,
     2175 DrawCreateSurface4,
     2176 DrawDuplicateSurface4,
     2177 DrawEnumDisplayModes4,
     2178 DrawEnumSurfaces4,
     2179 DrawFlipToGDISurface,
     2180 DrawGetCaps,
     2181 DrawGetDisplayMode4,
     2182 DrawGetFourCCCodes,
     2183 DrawGetGDISurface4,
     2184 DrawGetMonitorFrequency,
     2185 DrawGetScanLine,
     2186 DrawGetVerticalBlankStatus,
     2187 DrawInitialize,
     2188 DrawRestoreDisplayMode,
     2189 DrawSetCooperativeLevel,
     2190 DrawSetDisplayMode2,
     2191 DrawWaitForVerticalBlank,
     2192 DrawGetAvailableVidMem4,
     2193 DrawGetSurfaceFromDC,
     2194 DrawRestoreAllSurfaces,
     2195 DrawTestCooperativeLevel,
     2196 DrawGetDeviceIdentifier,
    21952197};
    21962198//******************************************************************************

  • trunk/src/ddraw/ddraw3d.cpp

    r9560 r21479  
    1414#include <memory.h>
    1515
    16 #define INITGUID
    1716#define _OS2WIN_H
    1817#define FAR
    … …  
    2019#include <odin.h>
    2120#include <winbase.h>
     21
     22#define CINTERFACE
    2223#include "ddraw2d.h"
    2324#include "clipper.h"
    2425#include "palette.h"
    2526#include "surface.h"
     27
    2628#include <misc.h>
    2729#include <winerror.h>
    … …  
    3638  *ppvObj = NULL;
    3739
    38   if (!IsEqualGUID(riid, IID_IDirect3D))
     40  if (!IsEqualGUID(riid, &IID_IDirect3D))
    3941    return E_NOINTERFACE;
    4042

  • trunk/src/ddraw/palette.cpp

    r9560 r21479  
    2020#include <string.h>
    2121#include <memory.h>
    22 #define INITGUID
     22
     23#define CINTERFACE
    2324#include "ddraw2d.h"
    2425#include "clipper.h"
    2526#include "palette.h"
    2627#include "surface.h"
     28
    2729#include <misc.h>
    2830#include "os2palset.h"
    … …  
    4951
    5052  lpDraw  = lpDirectDraw;
    51   ((OS2IDirectDraw*)lpDraw)->Vtbl.AddRef(lpDraw);
     53  ((OS2IDirectDraw*)lpDraw)->Vtbl.fnAddRef(lpDraw);
    5254  hDive   = ((OS2IDirectDraw*)lpDirectDraw)->GetDiveInstance();
    5355  dwCaps  = dwPalFlags;
    … …  
    8587  if(os2pal)
    8688    free(os2pal);
    87   ((OS2IDirectDraw*)lpDraw)->Vtbl.Release((OS2IDirectDraw*)lpDraw);
     89  ((OS2IDirectDraw*)lpDraw)->Vtbl.fnRelease((OS2IDirectDraw*)lpDraw);
    8890}
    8991//******************************************************************************
    … …  
    9597  *ppvObj = NULL;
    9698
    97   if(!IsEqualGUID(riid, IID_IDirectDrawPalette))
    98 //&& !IsEqualGUID(riid, IID_IUnknown))
     99  if(!IsEqualGUID(riid, &IID_IDirectDrawPalette))
     100//&& !IsEqualGUID(riid, &IID_IUnknown))
    99101  return E_NOINTERFACE;
    100102
    … …  
    237239        // Run appropriate code depening on whether FS DDraw is enabled
    238240        if (bUseFSDD)
    239                 SetSVGAPalette(os2pal); 
    240         else   
     241                SetSVGAPalette(os2pal);
     242        else
    241243                OS2SetPhysPalette(os2pal);
    242244}
    … …  
    270272//******************************************************************************
    271273//******************************************************************************
    272 IDirectDrawPaletteVtbl DDrawPaletteTable = 
     274IDirectDrawPaletteVtbl DDrawPaletteTable =
    273275{
    274276  PalQueryInterface,

  • trunk/src/ddraw/surface.cpp

    r9566 r21479  
    2424                  ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
    2525#include <fourcc.h>
    26 #define INITGUID
     26
     27#define CINTERFACE
    2728#include "ddraw2d.h"
    2829#include "clipper.h"
    … …  
    8283
    8384  lpDraw                     = lpDirectDraw;
    84   lpDraw->Vtbl.AddRef(lpDraw);
     85  lpDraw->Vtbl.fnAddRef(lpDraw);
    8586
    8687  ImplicitSurface = Implicit;
    … …  
    283284//TODO: Docs say this is done, but does it really happen in windows?
    284285    // check for invalid flag combinations
    285     switch(lpDDSurfaceDesc->ddsCaps.dwCaps2 & (DDSCAPS2_OPAQUE|DDSCAPS2_HINTDYNAMIC|DDSCAPS2_HINTSTATIC)) 
     286    switch(lpDDSurfaceDesc->ddsCaps.dwCaps2 & (DDSCAPS2_OPAQUE|DDSCAPS2_HINTDYNAMIC|DDSCAPS2_HINTSTATIC))
    286287    {
    287288    case 0:
    … …  
    439440
    440441          BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, TRUE);
    441           BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
     442          BackBuffer->Vtbl.fnAddRef((IDirectDrawSurface *)BackBuffer);
    442443
    443444          if (BackBuffer->GetLastError()==DD_OK)
    … …  
    477478      {
    478479           DirectDrawSurface_RegisterClass();
    479            hwndFullScreen = DirectDrawSurface_CreateWindow(DDSurfaceDesc.dwWidth, 
     480           hwndFullScreen = DirectDrawSurface_CreateWindow(DDSurfaceDesc.dwWidth,
    480481                                                           DDSurfaceDesc.dwHeight,
    481482                                                           lpDraw->GetClientWindow());
    … …  
    778779
    779780          BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, TRUE);
    780           BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
     781          BackBuffer->Vtbl.fnAddRef((IDirectDrawSurface *)BackBuffer);
    781782
    782783          if (BackBuffer->GetLastError()==DD_OK)
    … …  
    808809          }
    809810          BackBuffer = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE, Mainchain);
    810           BackBuffer->Vtbl.AddRef((IDirectDrawSurface *)BackBuffer);
     811          BackBuffer->Vtbl.fnAddRef((IDirectDrawSurface *)BackBuffer);
    811812
    812813          if (BackBuffer->GetLastError()==DD_OK)
    … …  
    840841
    841842            MipMapSurface = new OS2IDirectDrawSurface(lpDraw, &ComplexSurfaceDesc, TRUE);
    842             MipMapSurface->Vtbl.AddRef((IDirectDrawSurface *)MipMapSurface);
     843            MipMapSurface->Vtbl.fnAddRef((IDirectDrawSurface *)MipMapSurface);
    843844
    844845            DPA_InsertPtr( DPA_SurfaceMipMaps,
    … …  
    11501151  OS2IDirectDrawSurface *pSurf;
    11511152  pSurf = (OS2IDirectDrawSurface *)lpItem;
    1152   pSurf->Vtbl.Release(pSurf);
     1153  pSurf->Vtbl.fnRelease(pSurf);
    11531154  return 1;
    11541155}
    … …  
    12021203  if(lpClipper)
    12031204  {
    1204     lpClipper->Vtbl.Release((IDirectDrawClipper*)lpClipper);
     1205    lpClipper->Vtbl.fnRelease((IDirectDrawClipper*)lpClipper);
    12051206    lpClipper = NULL;
    12061207  }
    … …  
    12081209  if(lpPalette)
    12091210  {
    1210     lpPalette->Vtbl.Release((IDirectDrawPalette*)lpPalette);
     1211    lpPalette->Vtbl.fnRelease((IDirectDrawPalette*)lpPalette);
    12111212    lpPalette = NULL;
    12121213  }
    … …  
    12191220
    12201221  if (NULL!=BackBuffer)
    1221     BackBuffer->Vtbl.Release(BackBuffer);
     1222    BackBuffer->Vtbl.fnRelease(BackBuffer);
    12221223
    12231224  if (DPA_GetPtrCount(DPA_SurfaceMipMaps)>0)
    … …  
    12351236  }
    12361237
    1237   lpDraw->Vtbl.Release(lpDraw);
     1238  lpDraw->Vtbl.fnRelease(lpDraw);
    12381239}
    12391240
    … …  
    13051306  *ppvObj = NULL;
    13061307
    1307   if(IsEqualGUID(riid, IID_IDirectDrawSurface))
     1308  if(IsEqualGUID(riid, &IID_IDirectDrawSurface))
    13081309  {
    13091310    *ppvObj = &me->lpVtbl;  // ToDo DO a real V1 table
    … …  
    13111312    goto RetFn;
    13121313  }
    1313   if(IsEqualGUID(riid, IID_IDirectDrawSurface2))
     1314  if(IsEqualGUID(riid, &IID_IDirectDrawSurface2))
    13141315  {
    13151316    *ppvObj = &me->lpVtbl2;
    … …  
    13171318    goto RetFn;
    13181319  }
    1319   if(IsEqualGUID(riid, IID_IDirectDrawSurface3))
     1320  if(IsEqualGUID(riid, &IID_IDirectDrawSurface3))
    13201321  {
    13211322    *ppvObj = &me->Vtbl3;
    … …  
    13231324    goto RetFn;
    13241325  }
    1325   if(IsEqualGUID(riid, IID_IDirectDrawSurface4))
     1326  if(IsEqualGUID(riid, &IID_IDirectDrawSurface4))
    13261327  {
    13271328    *ppvObj = This;
    … …  
    13291330  }
    13301331
    1331   //if(IsEqualGUID(riid, IID_IUnknown)) ...
     1332  //if(IsEqualGUID(riid, &IID_IUnknown)) ...
    13321333
    13331334RetFn:
    … …  
    14321433          me->DDSurfaceDesc.dwMipMapCount++;
    14331434
    1434           AttachedSurface->Vtbl.AddRef(AttachedSurface);
     1435          AttachedSurface->Vtbl.fnAddRef(AttachedSurface);
    14351436        }
    14361437        else
    … …  
    14541455      if(rc>=0)
    14551456      {
    1456         AttachedSurface->Vtbl.AddRef(AttachedSurface);
     1457        AttachedSurface->Vtbl.fnAddRef(AttachedSurface);
    14571458      }
    14581459      else
    … …  
    15081509          me->DDSurfaceDesc.ddsCaps.dwCaps |= DDSCAPS_FLIP;
    15091510
    1510           AttachedSurface->Vtbl.AddRef(AttachedSurface);
     1511          AttachedSurface->Vtbl.fnAddRef(AttachedSurface);
    15111512          return (DD_OK);
    15121513        }
    … …  
    15311532              me->DDSurfaceDesc.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER;
    15321533
    1533               AttachedSurface->Vtbl.AddRef(AttachedSurface);
     1534              AttachedSurface->Vtbl.fnAddRef(AttachedSurface);
    15341535            }
    15351536            else
    … …  
    15511552                             AttachedSurface) >=0)
    15521553          {
    1553             AttachedSurface->Vtbl.AddRef(AttachedSurface);
     1554            AttachedSurface->Vtbl.fnAddRef(AttachedSurface);
    15541555          }
    15551556          else
    … …  
    16551656      AttachedSurface->DDSurfaceDesc.ddsCaps.dwCaps &= ~DDSCAPS_FLIP;
    16561657      AttachedSurface->DDSurfaceDesc.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; // Set this flag as adding to the chain removed it
    1657       AttachedSurface->lpVtbl->Release(AttachedSurface);
     1658      AttachedSurface->lpVtbl->fnRelease(AttachedSurface);
    16581659
    16591660    }
    … …  
    16821683      AttachedSurface->DDSurfaceDesc.dwFlags &= ~DDSD_BACKBUFFERCOUNT;
    16831684      AttachedSurface->DDSurfaceDesc.ddsCaps.dwCaps &= ~DDSCAPS_FLIP;
    1684       AttachedSurface->lpVtbl->Release(AttachedSurface);
     1685      AttachedSurface->lpVtbl->fnRelease(AttachedSurface);
    16851686    }
    16861687
    … …  
    16981699        Found = TRUE;
    16991700        DPA_DeletePtr(me->DPA_SurfaceMipMaps,i);
    1700         AttachedSurface->lpVtbl->Release(AttachedSurface);
     1701        AttachedSurface->lpVtbl->fnRelease(AttachedSurface);
    17011702        // adjust our info
    17021703        me->DDSurfaceDesc.dwMipMapCount-- ;
    … …  
    17201721        Found = TRUE;
    17211722        DPA_DeletePtr(me->DPA_SurfaceAttached,i);
    1722         AttachedSurface->lpVtbl->Release(AttachedSurface);
     1723        AttachedSurface->lpVtbl->fnRelease(AttachedSurface);
    17231724      }
    17241725      i++;
    … …  
    20372038    *lpDDSurf = (IDirectDrawSurface4*)AttachedSurface;
    20382039    // not sure but as we returned an reference rains usage count
    2039     AttachedSurface->lpVtbl->AddRef(AttachedSurface);
     2040    AttachedSurface->lpVtbl->fnAddRef(AttachedSurface);
    20402041  }
    20412042  else
    … …  
    23882389
    23892390#if 0
    2390     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     2391    if(me->diveBufNr == DIVE_BUFFER_SCREEN)
    23912392    {
    23922393        OS2RECTL rectOS2;
    … …  
    24052406    me->fLocked = TRUE;
    24062407
    2407     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     2408    if(me->diveBufNr == DIVE_BUFFER_SCREEN)
    24082409    {
    24092410        //If fHideCursorOnLock is set, then we hide the cursor to prevent
    … …  
    24362437  LockedSurfaceDesc.dwSize = sizeof(DDSURFACEDESC2);
    24372438
    2438   if(DD_OK != me->Vtbl.Lock(me,NULL,&LockedSurfaceDesc,0,0))
     2439  if(DD_OK != me->Vtbl.fnLock(me,NULL,&LockedSurfaceDesc,0,0))
    24392440  {
    24402441    return(DDERR_DCALREADYCREATED);
    … …  
    24502451    {
    24512452      dprintf(("DDRAW: Can't create compatible DC!\n"));
    2452       me->Vtbl.Unlock(me,NULL);
     2453      me->Vtbl.fnUnlock(me,NULL);
    24532454      rc = DDERR_GENERIC;
    24542455    }
    … …  
    24842485           ddpal = me->FrontBuffer->lpPalette;
    24852486        if (ddpal != NULL) {
    2486            ddpal->Vtbl.GetEntries((IDirectDrawPalette*)ddpal,
     2487           ddpal->Vtbl.fnGetEntries((IDirectDrawPalette*)ddpal,
    24872488              0, 0, 256, (PPALETTEENTRY)&BitmapInfo.bmiCols[0]);
    24882489        }
    … …  
    25312532      DeleteDC(me->hdcImage);
    25322533      me->hdcImage = NULL;
    2533       me->Vtbl.Unlock(me,NULL);
     2534      me->Vtbl.fnUnlock(me,NULL);
    25342535      rc = DDERR_GENERIC;
    25352536    }
    … …  
    25922593      DeleteObject(me->hbmImage);
    25932594      me->hbmImage = NULL;
    2594       me->Vtbl.Unlock(me,NULL);
     2595      me->Vtbl.fnUnlock(me,NULL);
    25952596      rc = DDERR_GENERIC;
    25962597    }
    … …  
    26992700  } // end switch (me->DDSurfaceDesc.ddpfPixelFormat.dwRGBBitCount)
    27002701
    2701   me->Vtbl.Unlock(me,NULL);
     2702  me->Vtbl.fnUnlock(me,NULL);
    27022703  me->dwLastDCUnique = me->dwUniqueValue; // Store this to see if the surface was locked after we released the DC
    27032704
    … …  
    27252726    if(me->lpClipper)
    27262727    {
    2727       me->lpClipper->Vtbl.Release((IDirectDrawClipper*)me->lpClipper);
     2728      me->lpClipper->Vtbl.fnRelease((IDirectDrawClipper*)me->lpClipper);
    27282729      me->lpClipper = NULL;
    27292730      return(DD_OK);
    … …  
    27382739  if(me->lpClipper != NULL)
    27392740  {
    2740     me->lpClipper->Vtbl.Release((IDirectDrawClipper*)me->lpClipper);  //attach other surface
     2741    me->lpClipper->Vtbl.fnRelease((IDirectDrawClipper*)me->lpClipper);  //attach other surface
    27412742    return(DD_OK);
    27422743  }
    27432744
    27442745  me->lpClipper = (OS2IDirectDrawClipper *)lpClipper;
    2745   me->lpClipper->Vtbl.AddRef((IDirectDrawClipper*)me->lpClipper);
     2746  me->lpClipper->Vtbl.fnAddRef((IDirectDrawClipper*)me->lpClipper);
    27462747
    27472748  return(DD_OK);
    … …  
    28172818        me->lpPalette->SetIsPrimary(FALSE);
    28182819      }
    2819       me->lpPalette->Vtbl.Release((IDirectDrawPalette*)me->lpPalette);
     2820      me->lpPalette->Vtbl.fnRelease((IDirectDrawPalette*)me->lpPalette);
    28202821      me->lpPalette = NULL;
    28212822      return(DD_OK);
    … …  
    28302831  if(me->lpPalette != NULL)
    28312832  {
    2832     me->lpPalette->Vtbl.Release((IDirectDrawPalette*)me->lpPalette);  //attach other palette
     2833    me->lpPalette->Vtbl.fnRelease((IDirectDrawPalette*)me->lpPalette);  //attach other palette
    28332834    //return(DD_OK);
    28342835  }
    28352836  me->lpPalette = (OS2IDirectDrawPalette *)lpPalette;
    2836   me->lpPalette->Vtbl.AddRef((IDirectDrawPalette*)me->lpPalette);
     2837  me->lpPalette->Vtbl.fnAddRef((IDirectDrawPalette*)me->lpPalette);
    28372838
    28382839  // If Attached to a primary surface notify
    … …  
    29882989
    29892990#if 0
    2990     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     2991    if(me->diveBufNr == DIVE_BUFFER_SCREEN)
    29912992    {
    29922993        OS2RECTL rectOS2;
    … …  
    30133014    rc = DD_OK;
    30143015
    3015     if(me->diveBufNr == DIVE_BUFFER_SCREEN) 
     3016    if(me->diveBufNr == DIVE_BUFFER_SCREEN)
    30163017    {
    30173018        //If fHideCursorOnLock is set, then we hide the cursor to prevent in SurfLock4
    … …  
    32823283      pSData = (PSURFPRIVATEDATA) DPA_FastGetPtr(me->DPA_SurfacePrivateData,i);
    32833284
    3284       if (IsEqualGUID(pSData->guidTag,refGUID))
     3285      if (IsEqualGUID(&pSData->guidTag,refGUID))
    32853286        bFound = TRUE;
    32863287
    … …  
    33033304        pSData->dwFlags = dwFlags;
    33043305        pSData->isValid = TRUE;
    3305         ((OS2IDirectDrawSurface *) lpData)->lpVtbl->AddRef(lpData);
     3306        ((OS2IDirectDrawSurface *) lpData)->lpVtbl->fnAddRef(lpData);
    33063307      }
    33073308      else
    … …  
    33313332          {
    33323333            // Change of IUNKOWNPOINTER => release old and add ref to new one
    3333             ((OS2IDirectDrawSurface *)pSData->pData)->lpVtbl->Release(pSData->pData);
    3334             ((OS2IDirectDrawSurface *)lpData)->lpVtbl->AddRef(lpData);
     3334            ((OS2IDirectDrawSurface *)pSData->pData)->lpVtbl->fnRelease(pSData->pData);
     3335            ((OS2IDirectDrawSurface *)lpData)->lpVtbl->fnAddRef(lpData);
    33353336            pSData->pData = lpData;
    33363337          }
    … …  
    33443345          {
    33453346            // release old ref and copy data
    3346             ((OS2IDirectDrawSurface *)pSData->pData)->lpVtbl->Release(pSData->pData);
     3347            ((OS2IDirectDrawSurface *)pSData->pData)->lpVtbl->fnRelease(pSData->pData);
    33473348            memcpy(pBuffer,lpData,dwDataSize);
    33483349            pSData->pData = pBuffer;
    … …  
    33603361          // Change of data to IUNKOWNPOINTER => free old memory and add ref to new one
    33613362          free(pSData->pData);
    3362           ((OS2IDirectDrawSurface *)lpData)->lpVtbl->AddRef(lpData);
     3363          ((OS2IDirectDrawSurface *)lpData)->lpVtbl->fnAddRef(lpData);
    33633364          pSData->pData = lpData;
    33643365          pSData->dwSize = dwDataSize; // Update the size
    … …  
    34013402        pSData->dwFlags = dwFlags;
    34023403        pSData->isValid = TRUE;
    3403         ((OS2IDirectDrawSurface *)lpData)->lpVtbl->AddRef(lpData);
     3404        ((OS2IDirectDrawSurface *)lpData)->lpVtbl->fnAddRef(lpData);
    34043405      }
    34053406      else
    … …  
    34613462      pSData = (PSURFPRIVATEDATA) DPA_FastGetPtr(me->DPA_SurfacePrivateData,i);
    34623463
    3463       if (IsEqualGUID(pSData->guidTag,refGUID))
     3464      if (IsEqualGUID(&pSData->guidTag,refGUID))
    34643465        bFound = TRUE;
    34653466
    … …  
    35163517      pSData = (PSURFPRIVATEDATA) DPA_FastGetPtr(me->DPA_SurfacePrivateData,i);
    35173518
    3518       if (IsEqualGUID(pSData->guidTag,refGUID))
     3519      if (IsEqualGUID(&pSData->guidTag,refGUID))
    35193520      {
    35203521        bFound = TRUE;
    … …  
    35263527          {
    35273528            // pointer to com stored so calll its release
    3528             ((OS2IDirectDrawSurface *) pSData->pData)->lpVtbl->Release(pSData->pData);
     3529            ((OS2IDirectDrawSurface *) pSData->pData)->lpVtbl->fnRelease(pSData->pData);
    35293530          }
    35303531          else
    … …  
    35793580        {
    35803581          // pointer to com stored so call its release
    3581           ((OS2IDirectDrawSurface *) pSData->pData)->lpVtbl->Release(pSData->pData);
     3582          ((OS2IDirectDrawSurface *) pSData->pData)->lpVtbl->fnRelease(pSData->pData);
    35823583        }
    35833584        else
    … …  
    35983599//******************************************************************************
    35993600//******************************************************************************
    3600 IDirectDrawSurface4Vtbl DDrawSurfaceV4Table = 
     3601IDirectDrawSurface4Vtbl DDrawSurfaceV4Table =
    36013602{
    36023603 SurfQueryInterface,
    … …  
    36103611 SurfDeleteAttachedSurface4,
    36113612 SurfEnumAttachedSurfaces4,
    3612  SurfEnumOverlayZOrders4, 
    3613  SurfFlip4, 
    3614  SurfGetAttachedSurface4, 
    3615  SurfGetBltStatus, 
    3616  SurfGetCaps4, 
    3617  SurfGetClipper, 
    3618  SurfGetColorKey, 
    3619  SurfGetDC, 
    3620  SurfGetFlipStatus, 
    3621  SurfGetOverlayPosition, 
    3622  SurfGetPalette, 
    3623  SurfGetPixelFormat, 
    3624  SurfGetSurfaceDesc4, 
    3625  SurfInitialize4, 
    3626  SurfIsLost, 
    3627  SurfLock4, 
    3628  SurfReleaseDC, 
    3629  SurfRestore, 
    3630  SurfSetClipper, 
    3631  SurfSetColorKey, 
    3632  SurfSetOverlayPosition, 
    3633  SurfSetPalette, 
    3634  SurfUnlock4, 
    3635  SurfUpdateOverlay4, 
    3636  SurfUpdateOverlayDisplay, 
    3637  SurfUpdateOverlayZOrder4, 
    3638  SurfGetDDInterface, 
    3639  SurfPageLock, 
    3640  SurfPageUnlock, 
    3641  SurfSetSurfaceDesc4, 
    3642  SurfSetPrivateData, 
    3643  SurfGetPrivateData, 
    3644  SurfFreePrivateData, 
     3613 SurfEnumOverlayZOrders4,
     3614 SurfFlip4,
     3615 SurfGetAttachedSurface4,
     3616 SurfGetBltStatus,
     3617 SurfGetCaps4,
     3618 SurfGetClipper,
     3619 SurfGetColorKey,
     3620 SurfGetDC,
     3621 SurfGetFlipStatus,
     3622 SurfGetOverlayPosition,
     3623 SurfGetPalette,
     3624 SurfGetPixelFormat,
     3625 SurfGetSurfaceDesc4,
     3626 SurfInitialize4,
     3627 SurfIsLost,
     3628 SurfLock4,
     3629 SurfReleaseDC,
     3630 SurfRestore,
     3631 SurfSetClipper,
     3632 SurfSetColorKey,
     3633 SurfSetOverlayPosition,
     3634 SurfSetPalette,
     3635 SurfUnlock4,
     3636 SurfUpdateOverlay4,
     3637 SurfUpdateOverlayDisplay,
     3638 SurfUpdateOverlayZOrder4,
     3639 SurfGetDDInterface,
     3640 SurfPageLock,
     3641 SurfPageUnlock,
     3642 SurfSetSurfaceDesc4,
     3643 SurfSetPrivateData,
     3644 SurfGetPrivateData,
     3645 SurfFreePrivateData,
    36453646 SurfGetUniquenessValue,
    36463647 SurfChangeUniquenessValue
    … …  
    36483649//******************************************************************************
    36493650//******************************************************************************
    3650 IDirectDrawSurface3Vtbl DDrawSurfaceV3Table = 
    3651 {
    3652  SurfQueryInterface, 
    3653  SurfAddRef, 
    3654  SurfRelease, 
    3655  SurfAddAttachedSurface3, 
    3656  SurfAddOverlayDirtyRect, 
    3657  SurfBlt3, 
    3658  SurfBltBatch, 
    3659  SurfBltFast3, 
    3660  SurfDeleteAttachedSurface3, 
    3661  SurfEnumAttachedSurfaces, 
    3662  SurfEnumOverlayZOrders, 
    3663  SurfFlip3, 
    3664  SurfGetAttachedSurface3, 
    3665  SurfGetBltStatus, 
    3666  SurfGetCaps, 
    3667  SurfGetClipper, 
    3668  SurfGetColorKey, 
    3669  SurfGetDC, 
    3670  SurfGetFlipStatus, 
    3671  SurfGetOverlayPosition, 
    3672  SurfGetPalette, 
    3673  SurfGetPixelFormat, 
    3674  SurfGetSurfaceDesc, 
    3675  SurfInitialize, 
    3676  SurfIsLost, 
    3677  SurfLock, 
    3678  SurfReleaseDC, 
    3679  SurfRestore, 
    3680  SurfSetClipper, 
    3681  SurfSetColorKey, 
    3682  SurfSetOverlayPosition, 
    3683  SurfSetPalette, 
    3684  SurfUnlock, 
    3685  SurfUpdateOverlay3, 
    3686  SurfUpdateOverlayDisplay, 
    3687  SurfUpdateOverlayZOrder3, 
    3688  SurfGetDDInterface, 
    3689  SurfPageLock, 
    3690  SurfPageUnlock, 
     3651IDirectDrawSurface3Vtbl DDrawSurfaceV3Table =
     3652{
     3653 SurfQueryInterface,
     3654 SurfAddRef,
     3655 SurfRelease,
     3656 SurfAddAttachedSurface3,
     3657 SurfAddOverlayDirtyRect,
     3658 SurfBlt3,
     3659 SurfBltBatch,
     3660 SurfBltFast3,
     3661 SurfDeleteAttachedSurface3,
     3662 SurfEnumAttachedSurfaces,
     3663 SurfEnumOverlayZOrders,
     3664 SurfFlip3,
     3665 SurfGetAttachedSurface3,
     3666 SurfGetBltStatus,
     3667 SurfGetCaps,
     3668 SurfGetClipper,
     3669 SurfGetColorKey,
     3670 SurfGetDC,
     3671 SurfGetFlipStatus,
     3672 SurfGetOverlayPosition,
     3673 SurfGetPalette,
     3674 SurfGetPixelFormat,
     3675 SurfGetSurfaceDesc,
     3676 SurfInitialize,
     3677 SurfIsLost,
     3678 SurfLock,
     3679 SurfReleaseDC,
     3680 SurfRestore,
     3681 SurfSetClipper,
     3682 SurfSetColorKey,
     3683 SurfSetOverlayPosition,
     3684 SurfSetPalette,
     3685 SurfUnlock,
     3686 SurfUpdateOverlay3,
     3687 SurfUpdateOverlayDisplay,
     3688 SurfUpdateOverlayZOrder3,
     3689 SurfGetDDInterface,
     3690 SurfPageLock,
     3691 SurfPageUnlock,
    36913692 SurfSetSurfaceDesc
    36923693};
    36933694//******************************************************************************
    36943695//******************************************************************************
    3695 IDirectDrawSurface2Vtbl DDrawSurfaceV2Table = 
    3696 {
    3697  SurfQueryInterface, 
    3698  SurfAddRef, 
    3699  SurfRelease, 
    3700  SurfAddAttachedSurface, 
    3701  SurfAddOverlayDirtyRect, 
    3702  SurfBlt, 
    3703  SurfBltBatch, 
    3704  SurfBltFast, 
    3705  SurfDeleteAttachedSurface, 
    3706  SurfEnumAttachedSurfaces, 
    3707  SurfEnumOverlayZOrders, 
    3708  SurfFlip, 
    3709  SurfGetAttachedSurface, 
    3710  SurfGetBltStatus, 
    3711  SurfGetCaps, 
    3712  SurfGetClipper, 
    3713  SurfGetColorKey, 
    3714  SurfGetDC, 
    3715  SurfGetFlipStatus, 
    3716  SurfGetOverlayPosition, 
    3717  SurfGetPalette, 
    3718  SurfGetPixelFormat, 
    3719  SurfGetSurfaceDesc, 
    3720  SurfInitialize, 
    3721  SurfIsLost, 
    3722  SurfLock, 
    3723  SurfReleaseDC, 
    3724  SurfRestore, 
    3725  SurfSetClipper, 
    3726  SurfSetColorKey, 
    3727  SurfSetOverlayPosition, 
    3728  SurfSetPalette, 
    3729  SurfUnlock, 
    3730  SurfUpdateOverlay, 
    3731  SurfUpdateOverlayDisplay, 
    3732  SurfUpdateOverlayZOrder, 
    3733  SurfGetDDInterface, 
    3734  SurfPageLock, 
     3696IDirectDrawSurface2Vtbl DDrawSurfaceV2Table =
     3697{
     3698 SurfQueryInterface,
     3699 SurfAddRef,
     3700 SurfRelease,
     3701 SurfAddAttachedSurface,
     3702 SurfAddOverlayDirtyRect,
     3703 SurfBlt,
     3704 SurfBltBatch,
     3705 SurfBltFast,
     3706 SurfDeleteAttachedSurface,
     3707 SurfEnumAttachedSurfaces,
     3708 SurfEnumOverlayZOrders,
     3709 SurfFlip,
     3710 SurfGetAttachedSurface,
     3711 SurfGetBltStatus,
     3712 SurfGetCaps,
     3713 SurfGetClipper,
     3714 SurfGetColorKey,
     3715 SurfGetDC,
     3716 SurfGetFlipStatus,
     3717 SurfGetOverlayPosition,
     3718 SurfGetPalette,
     3719 SurfGetPixelFormat,
     3720 SurfGetSurfaceDesc,
     3721 SurfInitialize,
     3722 SurfIsLost,
     3723 SurfLock,
     3724 SurfReleaseDC,
     3725 SurfRestore,
     3726 SurfSetClipper,
     3727 SurfSetColorKey,
     3728 SurfSetOverlayPosition,
     3729 SurfSetPalette,
     3730 SurfUnlock,
     3731 SurfUpdateOverlay,
     3732 SurfUpdateOverlayDisplay,
     3733 SurfUpdateOverlayZOrder,
     3734 SurfGetDDInterface,
     3735 SurfPageLock,
    37353736 SurfPageUnlock
    37363737};

  • trunk/src/ddraw/surfacehlp.cpp

    r9459 r21479  
    1212                  ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
    1313#include <fourcc.h>
    14 #define INITGUID
     14
     15#define CINTERFACE
    1516#include "ddraw2d.h"
    1617#include "clipper.h"
    … …  
    2021#include "os2util.h"
    2122#include "rectangle.h"
     23
    2224#include <misc.h>
    2325#include "asmutil.h"

  • trunk/src/ddraw/surfblit.cpp

    r9698 r21479  
    2424                  ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
    2525#include <fourcc.h>
    26 #define INITGUID
     26
     27#define CINTERFACE
    2728#include "ddraw2d.h"
    2829#include "clipper.h"
    … …  
    3233#include "os2util.h"
    3334#include "rectangle.h"
     35
    3436#include <misc.h>
    3537#include "asmutil.h"

  • trunk/src/ddraw/surfoverlay.cpp

    r9560 r21479  
    2424                  ( (DWORD)(BYTE)(ch2) << 16 ) | ( (DWORD)(BYTE)(ch3) << 24 ) )
    2525#include <fourcc.h>
    26 #define INITGUID
     26
     27#define CINTERFACE
    2728#include "ddraw2d.h"
    2829#include "clipper.h"
    … …  
    3233#include "os2util.h"
    3334#include "rectangle.h"
     35
    3436#include <misc.h>
    3537#include "asmutil.h"

  • trunk/src/dsound/DAudioBuffer.cpp

    r8217 r21479  
    2020#include <string.h>
    2121
    22 #define INITGUID
     22#define CINTERFACE
    2323#include <dsound.h>
    2424
    … …  
    186186{
    187187    lpVtbl = &Vtbl;
    188     Vtbl.AddRef               = DAudioBufAddRef;
    189     Vtbl.Release              = DAudioBufRelease;
    190     Vtbl.QueryInterface       = DAudioBufQueryInterface;
    191     Vtbl.GetCaps              = DAudioBufGetCaps;
    192     Vtbl.GetFormat            = DAudioBufGetFormat;
    193     Vtbl.GetVolume            = DAudioBufGetVolume;
    194     Vtbl.GetStatus            = DAudioBufGetStatus;
    195     Vtbl.GetCurrentPosition   = DAudioBufGetCurrentPosition;
    196     Vtbl.GetPan               = DAudioBufGetPan;
    197     Vtbl.GetFrequency         = DAudioBufGetFrequency;
    198     Vtbl.Initialize           = DAudioBufInitialize;
    199     Vtbl.Restore              = DAudioBufRestore;
    200     Vtbl.SetFormat            = DAudioBufSetFormat;
    201     Vtbl.SetVolume            = DAudioBufSetVolume;
    202     Vtbl.SetCurrentPosition   = DAudioBufSetCurrentPosition;
    203     Vtbl.SetPan               = DAudioBufSetPan;
    204     Vtbl.SetFrequency         = DAudioBufSetFrequency;
    205     Vtbl.Lock                 = DAudioBufLock;
    206     Vtbl.Unlock               = DAudioBufUnlock;
    207     Vtbl.Stop                 = DAudioBufStop;
    208     Vtbl.Play                 = DAudioBufPlay;
     188    Vtbl.fnAddRef               = DAudioBufAddRef;
     189    Vtbl.fnRelease              = DAudioBufRelease;
     190    Vtbl.fnQueryInterface       = DAudioBufQueryInterface;
     191    Vtbl.fnGetCaps              = DAudioBufGetCaps;
     192    Vtbl.fnGetFormat            = DAudioBufGetFormat;
     193    Vtbl.fnGetVolume            = DAudioBufGetVolume;
     194    Vtbl.fnGetStatus            = DAudioBufGetStatus;
     195    Vtbl.fnGetCurrentPosition   = DAudioBufGetCurrentPosition;
     196    Vtbl.fnGetPan               = DAudioBufGetPan;
     197    Vtbl.fnGetFrequency         = DAudioBufGetFrequency;
     198    Vtbl.fnInitialize           = DAudioBufInitialize;
     199    Vtbl.fnRestore              = DAudioBufRestore;
     200    Vtbl.fnSetFormat            = DAudioBufSetFormat;
     201    Vtbl.fnSetVolume            = DAudioBufSetVolume;
     202    Vtbl.fnSetCurrentPosition   = DAudioBufSetCurrentPosition;
     203    Vtbl.fnSetPan               = DAudioBufSetPan;
     204    Vtbl.fnSetFrequency         = DAudioBufSetFrequency;
     205    Vtbl.fnLock                 = DAudioBufLock;
     206    Vtbl.fnUnlock               = DAudioBufUnlock;
     207    Vtbl.fnStop                 = DAudioBufStop;
     208    Vtbl.fnPlay                 = DAudioBufPlay;
    209209}
    210210//******************************************************************************
    … …  
    233233   *ppvObj = NULL;
    234234
    235    if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
     235   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
    236236      *ppvObj = this;
    237237
    … …  
    240240   }
    241241
    242    if (IsEqualGUID(riid, IID_IDirectSoundNotify))
     242   if (IsEqualGUID(riid, &IID_IDirectSoundNotify))
    243243   {
    244244      IDirectAudioNotify  *notify;
    … …  
    246246      notify     = new IDirectAudioNotify(this);
    247247      *ppvObj    = notify;
    248       notify->Vtbl.AddRef(notify);
     248      notify->Vtbl.fnAddRef(notify);
    249249      return DS_OK;
    250250   }
    251251#if 0
    252    if (IsEqualGUID(riid, IID_IDirectSound3DBuffer)) {
     252   if (IsEqualGUID(riid, &IID_IDirectSound3DBuffer)) {
    253253      OS2IDirectSound3DBuffer *buffer3D;
    254254
    255255      buffer3D   = new OS2IDirectSound3DBuffer(this);
    256256      *ppvObj    = buffer3D;
    257       buffer3D->Vtbl.AddRef((IDirectSound3DBuffer *)buffer3D);
     257      buffer3D->Vtbl.fnAddRef((IDirectSound3DBuffer *)buffer3D);
    258258      return DS_OK;
    259259   }

  • trunk/src/dsound/DAudioNotify.cpp

    r5608 r21479  
    1919#include <string.h>
    2020
    21 #define INITGUID
     21#define CINTERFACE
    2222#include <dsound.h>
    2323
    … …  
    3232{
    3333   lpVtbl = &Vtbl;
    34    Vtbl.AddRef                   = DAudioNotifyAddRef;
    35    Vtbl.Release                  = DAudioNotifyRelease;
    36    Vtbl.QueryInterface           = DAudioNotifyQueryInterface;
    37    Vtbl.SetNotificationPositions = DAudioNotifySetNotificationPositions;
     34   Vtbl.fnAddRef                   = DAudioNotifyAddRef;
     35   Vtbl.fnRelease                  = DAudioNotifyRelease;
     36   Vtbl.fnQueryInterface           = DAudioNotifyQueryInterface;
     37   Vtbl.fnSetNotificationPositions = DAudioNotifySetNotificationPositions;
    3838
    3939   dprintf(("DSOUND-IDirectAudioNotify::IDirectAudioNotify (this=%X)", this));
    … …  
    4545
    4646   // add a reference to the parent SoundBuffer to make sure it won't suddenly disappear
    47    lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
     47   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    4848   // set pointer to ourselves in parent SoundBuffer
    4949   lpSoundBuffer->SetNotify(this);
    … …  
    5656   dprintf(("DSOUND-IDirectAudioNotify::~IDirectAudioNotify (this=%X)", this));
    5757   lpSoundBuffer->SetNotify(NULL);
    58    lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
     58   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    5959   if (lpPositions != NULL)
    6060      free(lpPositions);
    … …  
    7171   *ppvObj = NULL;
    7272
    73    if (!IsEqualGUID(riid, IID_IDirectSoundNotify))
     73   if (!IsEqualGUID(riid, &IID_IDirectSoundNotify))
    7474      return E_NOINTERFACE;
    7575

  • trunk/src/dsound/DSOUND.CPP

    r7431 r21479  
    2020
    2121#define INITGUID
    22 #define ICOM_CINTERFACE 1
    2322#define CINTERFACE
    2423#include <dsound.h>
    … …  
    4544   if (OS2IDirectSound::fDSExists) {
    4645      *ppDS = (LPDIRECTSOUND)DS;
    47       DS->Vtbl.AddRef(DS);
     46      DS->Vtbl.fnAddRef(DS);
    4847      return DS_OK;
    4948   }
    … …  
    6160   else {
    6261     *ppDS = (LPDIRECTSOUND)newsound;
    63      newsound->Vtbl.AddRef(newsound);
     62     newsound->Vtbl.fnAddRef(newsound);
    6463     DS = newsound;
    6564   }
    … …  
    178177
    179178  dprintf(("DSOUND:DSCF_CreateInstance\n"));
    180   if( lpGUID && (*lpGUID == IID_IDirectSound )) {
     179  if(lpGUID && IsEqualGUID(lpGUID, &IID_IDirectSound)) {
    181180    return OS2DirectSoundCreate(lpGUID,(LPDIRECTSOUND*)ppobj,pOuter);
    182181  }
    … …  
    223222  {
    224223    *ppv = (LPVOID)&DSOUND_CF;
    225     DSOUND_CF.lpvtbl->AddRef((IClassFactory*)&DSOUND_CF);
     224    DSOUND_CF.lpvtbl->fnAddRef((IClassFactory*)&DSOUND_CF);
    226225    return S_OK;
    227226  }

  • trunk/src/dsound/OS23DBuffer.cpp

    r3925 r21479  
    1919#include <string.h>
    2020
    21 #define INITGUID
     21#define CINTERFACE
    2222#include <dsound.h>
    2323
    … …  
    4242{
    4343   lpVtbl = &Vtbl;
    44    Vtbl.AddRef                   = Sound3DBufferAddRef;
    45    Vtbl.Release                  = Sound3DBufferRelease;
    46    Vtbl.QueryInterface           = Sound3DBufferQueryInterface;
    47    Vtbl.GetAllParameters         = Sound3DBufferGetAllParameters;
    48    Vtbl.SetAllParameters         = Sound3DBufferSetAllParameters;
    49    Vtbl.GetMaxDistance           = Sound3DBufferGetMaxDistance;
    50    Vtbl.SetMaxDistance           = Sound3DBufferSetMaxDistance;
    51    Vtbl.GetMinDistance           = Sound3DBufferGetMinDistance;
    52    Vtbl.SetMinDistance           = Sound3DBufferSetMinDistance;
    53    Vtbl.GetMode                  = Sound3DBufferGetMode;
    54    Vtbl.SetMode                  = Sound3DBufferSetMode;
    55    Vtbl.GetPosition              = Sound3DBufferGetPosition;
    56    Vtbl.SetPosition              = Sound3DBufferSetPosition;
    57    Vtbl.GetConeAngles            = Sound3DBufferGetConeAngles;
    58    Vtbl.SetConeAngles            = Sound3DBufferSetConeAngles;
    59    Vtbl.GetConeOrientation       = Sound3DBufferGetConeOrientation;
    60    Vtbl.SetConeOrientation       = Sound3DBufferSetConeOrientation;
    61    Vtbl.GetConeOutsideVolume     = Sound3DBufferGetConeOutsideVolume;
    62    Vtbl.SetConeOutsideVolume     = Sound3DBufferSetConeOutsideVolume;
    63    Vtbl.GetVelocity              = Sound3DBufferGetVelocity;
    64    Vtbl.SetVelocity              = Sound3DBufferSetVelocity;
     44   Vtbl.fnAddRef                   = Sound3DBufferAddRef;
     45   Vtbl.fnRelease                  = Sound3DBufferRelease;
     46   Vtbl.fnQueryInterface           = Sound3DBufferQueryInterface;
     47   Vtbl.fnGetAllParameters         = Sound3DBufferGetAllParameters;
     48   Vtbl.fnSetAllParameters         = Sound3DBufferSetAllParameters;
     49   Vtbl.fnGetMaxDistance           = Sound3DBufferGetMaxDistance;
     50   Vtbl.fnSetMaxDistance           = Sound3DBufferSetMaxDistance;
     51   Vtbl.fnGetMinDistance           = Sound3DBufferGetMinDistance;
     52   Vtbl.fnSetMinDistance           = Sound3DBufferSetMinDistance;
     53   Vtbl.fnGetMode                  = Sound3DBufferGetMode;
     54   Vtbl.fnSetMode                  = Sound3DBufferSetMode;
     55   Vtbl.fnGetPosition              = Sound3DBufferGetPosition;
     56   Vtbl.fnSetPosition              = Sound3DBufferSetPosition;
     57   Vtbl.fnGetConeAngles            = Sound3DBufferGetConeAngles;
     58   Vtbl.fnSetConeAngles            = Sound3DBufferSetConeAngles;
     59   Vtbl.fnGetConeOrientation       = Sound3DBufferGetConeOrientation;
     60   Vtbl.fnSetConeOrientation       = Sound3DBufferSetConeOrientation;
     61   Vtbl.fnGetConeOutsideVolume     = Sound3DBufferGetConeOutsideVolume;
     62   Vtbl.fnSetConeOutsideVolume     = Sound3DBufferSetConeOutsideVolume;
     63   Vtbl.fnGetVelocity              = Sound3DBufferGetVelocity;
     64   Vtbl.fnSetVelocity              = Sound3DBufferSetVelocity;
    6565
    6666
    … …  
    7474
    7575   // add a reference to the parent primary SoundBuffer to make sure it won't suddenly disappear
    76    lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
     76   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    7777   // set pointer to ourselves in parent SoundBuffer
    7878   lpSoundBuffer->Set3DBuffer(this);
    … …  
    8585   dprintf(("DSOUND-OS2IDirectSound3DBuffer::~OS2IDirectSound3DBuffer (this=%X)", this));
    8686   lpSoundBuffer->Set3DBuffer(NULL);
    87    lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
     87   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    8888}
    8989
    … …  
    9898   *ppvObj = NULL;
    9999
    100    if (!IsEqualGUID(riid, IID_IDirectSound3DBuffer))
     100   if (!IsEqualGUID(riid, &IID_IDirectSound3DBuffer))
    101101      return E_NOINTERFACE;
    102102

  • trunk/src/dsound/OS23DListener.cpp

    r3925 r21479  
    1919#include <string.h>
    2020
    21 #define INITGUID
     21#define CINTERFACE
    2222#include <dsound.h>
    2323
    … …  
    4242{
    4343   lpVtbl = &Vtbl;
    44    Vtbl.AddRef                   = Sound3DListenerAddRef;
    45    Vtbl.Release                  = Sound3DListenerRelease;
    46    Vtbl.QueryInterface           = Sound3DListenerQueryInterface;
    47    Vtbl.GetAllParameters         = Sound3DListenerGetAllParameters;
    48    Vtbl.SetAllParameters         = Sound3DListenerSetAllParameters;
    49    Vtbl.CommitDeferredSettings   = Sound3DListenerCommitDeferredSettings;
    50    Vtbl.GetDistanceFactor        = Sound3DListenerGetDistanceFactor;
    51    Vtbl.SetDistanceFactor        = Sound3DListenerSetDistanceFactor;
    52    Vtbl.GetDopplerFactor         = Sound3DListenerGetDopplerFactor;
    53    Vtbl.SetDopplerFactor         = Sound3DListenerSetDopplerFactor;
    54    Vtbl.GetOrientation           = Sound3DListenerGetOrientation;
    55    Vtbl.SetOrientation           = Sound3DListenerSetOrientation;
    56    Vtbl.GetPosition              = Sound3DListenerGetPosition;
    57    Vtbl.SetPosition              = Sound3DListenerSetPosition;
    58    Vtbl.GetRolloffFactor         = Sound3DListenerGetRolloffFactor;
    59    Vtbl.SetRolloffFactor         = Sound3DListenerSetRolloffFactor;
    60    Vtbl.GetVelocity              = Sound3DListenerGetVelocity;
    61    Vtbl.SetVelocity              = Sound3DListenerSetVelocity;
     44   Vtbl.fnAddRef                   = Sound3DListenerAddRef;
     45   Vtbl.fnRelease                  = Sound3DListenerRelease;
     46   Vtbl.fnQueryInterface           = Sound3DListenerQueryInterface;
     47   Vtbl.fnGetAllParameters         = Sound3DListenerGetAllParameters;
     48   Vtbl.fnSetAllParameters         = Sound3DListenerSetAllParameters;
     49   Vtbl.fnCommitDeferredSettings   = Sound3DListenerCommitDeferredSettings;
     50   Vtbl.fnGetDistanceFactor        = Sound3DListenerGetDistanceFactor;
     51   Vtbl.fnSetDistanceFactor        = Sound3DListenerSetDistanceFactor;
     52   Vtbl.fnGetDopplerFactor         = Sound3DListenerGetDopplerFactor;
     53   Vtbl.fnSetDopplerFactor         = Sound3DListenerSetDopplerFactor;
     54   Vtbl.fnGetOrientation           = Sound3DListenerGetOrientation;
     55   Vtbl.fnSetOrientation           = Sound3DListenerSetOrientation;
     56   Vtbl.fnGetPosition              = Sound3DListenerGetPosition;
     57   Vtbl.fnSetPosition              = Sound3DListenerSetPosition;
     58   Vtbl.fnGetRolloffFactor         = Sound3DListenerGetRolloffFactor;
     59   Vtbl.fnSetRolloffFactor         = Sound3DListenerSetRolloffFactor;
     60   Vtbl.fnGetVelocity              = Sound3DListenerGetVelocity;
     61   Vtbl.fnSetVelocity              = Sound3DListenerSetVelocity;
    6262
    6363
    … …  
    7171
    7272   // add a reference to the parent primary SoundBuffer to make sure it won't suddenly disappear
    73    lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
     73   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    7474   // set pointer to ourselves in parent SoundBuffer
    7575   lpSoundBuffer->Set3DListener(this);
    … …  
    8282   dprintf(("DSOUND-OS2IDirectSound3DListener::~OS2IDirectSound3DListener (this=%X)", this));
    8383   lpSoundBuffer->Set3DListener(NULL);
    84    lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
     84   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    8585}
    8686
    … …  
    9595   *ppvObj = NULL;
    9696
    97    if (!IsEqualGUID(riid, IID_IDirectSound3DListener))
     97   if (!IsEqualGUID(riid, &IID_IDirectSound3DListener))
    9898      return E_NOINTERFACE;
    9999

  • trunk/src/dsound/OS2DSOUND.CPP

    r5292 r21479  
    2121#include <stdio.h> /****** DEBUGGING ********/
    2222
    23 #define INITGUID
     23#define CINTERFACE
    2424#include <dsound.h>
    2525
    … …  
    4242{
    4343   lpVtbl = &Vtbl;
    44    Vtbl.AddRef               = SoundAddRef;
    45    Vtbl.Release              = SoundRelease;
    46    Vtbl.QueryInterface       = SoundQueryInterface;
    47    Vtbl.Compact              = SoundCompact;
    48    Vtbl.CreateSoundBuffer    = SoundCreateSoundBuffer;
    49    Vtbl.GetCaps              = SoundGetCaps;
    50    Vtbl.DuplicateSoundBuffer = SoundDuplicateSoundBuffer;
    51    Vtbl.SetCooperativeLevel  = SoundSetCooperativeLevel;
    52    Vtbl.Compact              = SoundCompact;
    53    Vtbl.GetSpeakerConfig     = SoundGetSpeakerConfig;
    54    Vtbl.SetSpeakerConfig     = SoundSetSpeakerConfig;
    55    Vtbl.Initialize           = SoundInitialize;
     44   Vtbl.fnAddRef               = SoundAddRef;
     45   Vtbl.fnRelease              = SoundRelease;
     46   Vtbl.fnQueryInterface       = SoundQueryInterface;
     47   Vtbl.fnCompact              = SoundCompact;
     48   Vtbl.fnCreateSoundBuffer    = SoundCreateSoundBuffer;
     49   Vtbl.fnGetCaps              = SoundGetCaps;
     50   Vtbl.fnDuplicateSoundBuffer = SoundDuplicateSoundBuffer;
     51   Vtbl.fnSetCooperativeLevel  = SoundSetCooperativeLevel;
     52   Vtbl.fnCompact              = SoundCompact;
     53   Vtbl.fnGetSpeakerConfig     = SoundGetSpeakerConfig;
     54   Vtbl.fnSetSpeakerConfig     = SoundSetSpeakerConfig;
     55   Vtbl.fnInitialize           = SoundInitialize;
    5656
    5757   dprintf(("DSOUND-OS2IDirectSound::OS2IDirectSound"));
    … …  
    7575      return;
    7676   }
    77    primary->Vtbl.AddRef(primary);
     77   primary->Vtbl.fnAddRef(primary);
    7878
    7979   dprintf(("Sound init OK"));
    … …  
    9999   *ppvObj = NULL;
    100100
    101    if (!IsEqualGUID(riid, CLSID_DirectSound) &&
    102        !IsEqualGUID(riid, IID_IDirectSound))
     101   if (!IsEqualGUID(riid, &CLSID_DirectSound) &&
     102       !IsEqualGUID(riid, &IID_IDirectSound))
    103103      return E_NOINTERFACE;
    104104
    … …  
    181181      return lastErr;
    182182   }
    183    sndbuf->Vtbl.AddRef(sndbuf);
     183   sndbuf->Vtbl.fnAddRef(sndbuf);
    184184
    185185   *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)sndbuf;
    … …  
    251251      return lastErr;
    252252   }
    253    tgtBuf->Vtbl.AddRef(tgtBuf);
     253   tgtBuf->Vtbl.fnAddRef(tgtBuf);
    254254
    255255   *lplpDirectSoundBuffer = (LPDIRECTSOUNDBUFFER)tgtBuf;

  • trunk/src/dsound/OS2NOTIFY.CPP

    r3925 r21479  
    1919#include <string.h>
    2020
    21 #define INITGUID
     21#define CINTERFACE
    2222#include <dsound.h>
    2323
    … …  
    3232{
    3333   lpVtbl = &Vtbl;
    34    Vtbl.AddRef                   = SoundNotifyAddRef;
    35    Vtbl.Release                  = SoundNotifyRelease;
    36    Vtbl.QueryInterface           = SoundNotifyQueryInterface;
    37    Vtbl.SetNotificationPositions = SoundNotifySetNotificationPositions;
     34   Vtbl.fnAddRef                   = SoundNotifyAddRef;
     35   Vtbl.fnRelease                  = SoundNotifyRelease;
     36   Vtbl.fnQueryInterface           = SoundNotifyQueryInterface;
     37   Vtbl.fnSetNotificationPositions = SoundNotifySetNotificationPositions;
    3838
    3939   dprintf(("DSOUND-OS2IDirectSoundNotify::OS2IDirectSoundNotify (this=%X)", this));
    … …  
    4545
    4646   // add a reference to the parent SoundBuffer to make sure it won't suddenly disappear
    47    lpSoundBuffer->Vtbl.AddRef(lpSoundBuffer);
     47   lpSoundBuffer->Vtbl.fnAddRef(lpSoundBuffer);
    4848   // set pointer to ourselves in parent SoundBuffer
    4949   lpSoundBuffer->SetNotify(this);
    … …  
    5656   dprintf(("DSOUND-OS2IDirectSoundNotify::~OS2IDirectSoundNotify (this=%X)", this));
    5757   lpSoundBuffer->SetNotify(NULL);
    58    lpSoundBuffer->Vtbl.Release(lpSoundBuffer);
     58   lpSoundBuffer->Vtbl.fnRelease(lpSoundBuffer);
    5959   if (lpPositions != NULL)
    6060      free(lpPositions);
    … …  
    7171   *ppvObj = NULL;
    7272
    73    if (!IsEqualGUID(riid, IID_IDirectSoundNotify))
     73   if (!IsEqualGUID(riid, &IID_IDirectSoundNotify))
    7474      return E_NOINTERFACE;
    7575

  • trunk/src/dsound/OS2PrimBuff.cpp

    r5285 r21479  
    3333#include <string.h>
    3434
    35 #define INITGUID
     35#define CINTERFACE
    3636#include <dsound.h>
    3737
    … …  
    5555{
    5656   lpVtbl = &Vtbl;
    57    Vtbl.AddRef               = PrimBufAddRef;
    58    Vtbl.Release              = PrimBufRelease;
    59    Vtbl.QueryInterface       = PrimBufQueryInterface;
    60    Vtbl.GetCaps              = PrimBufGetCaps;
    61    Vtbl.GetFormat            = PrimBufGetFormat;
    62    Vtbl.GetVolume            = PrimBufGetVolume;
    63    Vtbl.GetStatus            = PrimBufGetStatus;
    64    Vtbl.GetCurrentPosition   = PrimBufGetCurrentPosition;
    65    Vtbl.GetPan               = PrimBufGetPan;
    66    Vtbl.GetFrequency         = PrimBufGetFrequency;
    67    Vtbl.Initialize           = PrimBufInitialize;
    68    Vtbl.Restore              = PrimBufRestore;
    69    Vtbl.SetFormat            = PrimBufSetFormat;
    70    Vtbl.SetVolume            = PrimBufSetVolume;
    71    Vtbl.SetCurrentPosition   = PrimBufSetCurrentPosition;
    72    Vtbl.SetPan               = PrimBufSetPan;
    73    Vtbl.SetFrequency         = PrimBufSetFrequency;
    74    Vtbl.Lock                 = PrimBufLock;
    75    Vtbl.Unlock               = PrimBufUnlock;
    76    Vtbl.Stop                 = PrimBufStop;
    77    Vtbl.Play                 = PrimBufPlay;
     57   Vtbl.fnAddRef               = PrimBufAddRef;
     58   Vtbl.fnRelease              = PrimBufRelease;
     59   Vtbl.fnQueryInterface       = PrimBufQueryInterface;
     60   Vtbl.fnGetCaps              = PrimBufGetCaps;
     61   Vtbl.fnGetFormat            = PrimBufGetFormat;
     62   Vtbl.fnGetVolume            = PrimBufGetVolume;
     63   Vtbl.fnGetStatus            = PrimBufGetStatus;
     64   Vtbl.fnGetCurrentPosition   = PrimBufGetCurrentPosition;
     65   Vtbl.fnGetPan               = PrimBufGetPan;
     66   Vtbl.fnGetFrequency         = PrimBufGetFrequency;
     67   Vtbl.fnInitialize           = PrimBufInitialize;
     68   Vtbl.fnRestore              = PrimBufRestore;
     69   Vtbl.fnSetFormat            = PrimBufSetFormat;
     70   Vtbl.fnSetVolume            = PrimBufSetVolume;
     71   Vtbl.fnSetCurrentPosition   = PrimBufSetCurrentPosition;
     72   Vtbl.fnSetPan               = PrimBufSetPan;
     73   Vtbl.fnSetFrequency         = PrimBufSetFrequency;
     74   Vtbl.fnLock                 = PrimBufLock;
     75   Vtbl.fnUnlock               = PrimBufUnlock;
     76   Vtbl.fnStop                 = PrimBufStop;
     77   Vtbl.fnPlay                 = PrimBufPlay;
    7878
    7979   dprintf(("DSOUND-PrimBuff: Constructor"));
    … …  
    135135   *ppvObj = NULL;
    136136
    137    if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
     137   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
    138138      *ppvObj = This;
    139139      PrimBufAddRef(This);
    … …  
    142142
    143143
    144    if (IsEqualGUID(riid, IID_IDirectSound3DListener)) {
     144   if (IsEqualGUID(riid, &IID_IDirectSound3DListener)) {
    145145      OS2PrimBuff                *me = (OS2PrimBuff *)This;
    146146      OS2IDirectSound3DListener  *listener;
    … …  
    148148      listener     = new OS2IDirectSound3DListener(me);
    149149      *ppvObj      = listener;
    150       listener->Vtbl.AddRef((IDirectSound3DListener *)listener);
     150      listener->Vtbl.fnAddRef((IDirectSound3DListener *)listener);
    151151      return DS_OK;
    152152   }

  • trunk/src/dsound/OS2SNDBUFFER.CPP

    r5331 r21479  
    2121#include <string.h>
    2222
    23 #define INITGUID
     23#define CINTERFACE
    2424#include <dsound.h>
    2525
    … …  
    5252   //This is the "normal" constructor
    5353   lpVtbl = &Vtbl;
    54    Vtbl.AddRef               = SoundBufAddRef;
    55    Vtbl.Release              = SoundBufRelease;
    56    Vtbl.QueryInterface       = SoundBufQueryInterface;
    57    Vtbl.GetCaps              = SoundBufGetCaps;
    58    Vtbl.GetFormat            = SoundBufGetFormat;
    59    Vtbl.GetVolume            = SoundBufGetVolume;
    60    Vtbl.GetStatus            = SoundBufGetStatus;
    61    Vtbl.GetCurrentPosition   = SoundBufGetCurrentPosition;
    62    Vtbl.GetPan               = SoundBufGetPan;
    63    Vtbl.GetFrequency         = SoundBufGetFrequency;
    64    Vtbl.Initialize           = SoundBufInitialize;
    65    Vtbl.Restore              = SoundBufRestore;
    66    Vtbl.SetFormat            = SoundBufSetFormat;
    67    Vtbl.SetVolume            = SoundBufSetVolume;
    68    Vtbl.SetCurrentPosition   = SoundBufSetCurrentPosition;
    69    Vtbl.SetPan               = SoundBufSetPan;
    70    Vtbl.SetFrequency         = SoundBufSetFrequency;
    71    Vtbl.Lock                 = SoundBufLock;
    72    Vtbl.Unlock               = SoundBufUnlock;
    73    Vtbl.Stop                 = SoundBufStop;
    74    Vtbl.Play                 = SoundBufPlay;
     54   Vtbl.fnAddRef               = SoundBufAddRef;
     55   Vtbl.fnRelease              = SoundBufRelease;
     56   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
     57   Vtbl.fnGetCaps              = SoundBufGetCaps;
     58   Vtbl.fnGetFormat            = SoundBufGetFormat;
     59   Vtbl.fnGetVolume            = SoundBufGetVolume;
     60   Vtbl.fnGetStatus            = SoundBufGetStatus;
     61   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
     62   Vtbl.fnGetPan               = SoundBufGetPan;
     63   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
     64   Vtbl.fnInitialize           = SoundBufInitialize;
     65   Vtbl.fnRestore              = SoundBufRestore;
     66   Vtbl.fnSetFormat            = SoundBufSetFormat;
     67   Vtbl.fnSetVolume            = SoundBufSetVolume;
     68   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
     69   Vtbl.fnSetPan               = SoundBufSetPan;
     70   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
     71   Vtbl.fnLock                 = SoundBufLock;
     72   Vtbl.fnUnlock               = SoundBufUnlock;
     73   Vtbl.fnStop                 = SoundBufStop;
     74   Vtbl.fnPlay                 = SoundBufPlay;
    7575
    7676   dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer (buf=%X)", this));
    … …  
    9494   // destroyed; moreover if the user didn't create  a primary buffer himself/herself,
    9595   // it will automatically get created and destroyed with the last secondary buffer
    96    primary->Vtbl.AddRef(primary);
     96   primary->Vtbl.fnAddRef(primary);
    9797
    9898   // Start playing the primary buffer
    9999   // TODO: only start playing the primary buffer when necessary!
    100    OS2IDirectSoundBuffer::primary->Vtbl.Play(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
     100   OS2IDirectSoundBuffer::primary->Vtbl.fnPlay(OS2IDirectSoundBuffer::primary, 0, 0, DSBPLAY_LOOPING);
    101101
    102102   parentDS  = DSound;
    … …  
    156156   //This is the constructor used for duplicating sound buffers
    157157   lpVtbl = &Vtbl;
    158    Vtbl.AddRef               = SoundBufAddRef;
    159    Vtbl.Release              = SoundBufRelease;
    160    Vtbl.QueryInterface       = SoundBufQueryInterface;
    161    Vtbl.GetCaps              = SoundBufGetCaps;
    162    Vtbl.GetFormat            = SoundBufGetFormat;
    163    Vtbl.GetVolume            = SoundBufGetVolume;
    164    Vtbl.GetStatus            = SoundBufGetStatus;
    165    Vtbl.GetCurrentPosition   = SoundBufGetCurrentPosition;
    166    Vtbl.GetPan               = SoundBufGetPan;
    167    Vtbl.GetFrequency         = SoundBufGetFrequency;
    168    Vtbl.Initialize           = SoundBufInitialize;
    169    Vtbl.Restore              = SoundBufRestore;
    170    Vtbl.SetFormat            = SoundBufSetFormat;
    171    Vtbl.SetVolume            = SoundBufSetVolume;
    172    Vtbl.SetCurrentPosition   = SoundBufSetCurrentPosition;
    173    Vtbl.SetPan               = SoundBufSetPan;
    174    Vtbl.SetFrequency         = SoundBufSetFrequency;
    175    Vtbl.Lock                 = SoundBufLock;
    176    Vtbl.Unlock               = SoundBufUnlock;
    177    Vtbl.Stop                 = SoundBufStop;
    178    Vtbl.Play                 = SoundBufPlay;
     158   Vtbl.fnAddRef               = SoundBufAddRef;
     159   Vtbl.fnRelease              = SoundBufRelease;
     160   Vtbl.fnQueryInterface       = SoundBufQueryInterface;
     161   Vtbl.fnGetCaps              = SoundBufGetCaps;
     162   Vtbl.fnGetFormat            = SoundBufGetFormat;
     163   Vtbl.fnGetVolume            = SoundBufGetVolume;
     164   Vtbl.fnGetStatus            = SoundBufGetStatus;
     165   Vtbl.fnGetCurrentPosition   = SoundBufGetCurrentPosition;
     166   Vtbl.fnGetPan               = SoundBufGetPan;
     167   Vtbl.fnGetFrequency         = SoundBufGetFrequency;
     168   Vtbl.fnInitialize           = SoundBufInitialize;
     169   Vtbl.fnRestore              = SoundBufRestore;
     170   Vtbl.fnSetFormat            = SoundBufSetFormat;
     171   Vtbl.fnSetVolume            = SoundBufSetVolume;
     172   Vtbl.fnSetCurrentPosition   = SoundBufSetCurrentPosition;
     173   Vtbl.fnSetPan               = SoundBufSetPan;
     174   Vtbl.fnSetFrequency         = SoundBufSetFrequency;
     175   Vtbl.fnLock                 = SoundBufLock;
     176   Vtbl.fnUnlock               = SoundBufUnlock;
     177   Vtbl.fnStop                 = SoundBufStop;
     178   Vtbl.fnPlay                 = SoundBufPlay;
    179179
    180180   dprintf(("DSOUND-OS2IDirectSoundBuffer::OS2IDirectSoundBuffer/Duplicate (buf=%X)", this));
    … …  
    197197   // destroyed; moreover if the user didn't create  a primary buffer himself/herself,
    198198   // it will automatically get created and destroyed with the last secondary buffer
    199    primary->Vtbl.AddRef(primary);
     199   primary->Vtbl.fnAddRef(primary);
    200200
    201201   parentDS  = DSound;
    … …  
    259259
    260260   // release the primary buffer too
    261    primary->Vtbl.Release(primary);
     261   primary->Vtbl.fnRelease(primary);
    262262
    263263   if (this == dsbroot)  // is this the first SoundBuffer?
    … …  
    284284
    285285   if (primary != NULL)
    286       primary->Vtbl.Stop(primary);
     286      primary->Vtbl.fnStop(primary);
    287287
    288288   while (cur != NULL) {
    … …  
    293293   dprintf(("DSOUND-OS2IDirectSoundBuffer::DestroyAllBuffers - %X", primary));
    294294   if (primary != NULL)
    295       primary->Vtbl.Release(primary);
     295      primary->Vtbl.fnRelease(primary);
    296296}
    297297
    … …  
    306306   *ppvObj = NULL;
    307307
    308    if (IsEqualGUID(riid, IID_IDirectSoundBuffer)) {
     308   if (IsEqualGUID(riid, &IID_IDirectSoundBuffer)) {
    309309      *ppvObj = This;
    310310
    … …  
    313313   }
    314314
    315    if (IsEqualGUID(riid, IID_IDirectSoundNotify)) {
     315   if (IsEqualGUID(riid, &IID_IDirectSoundNotify)) {
    316316      OS2IDirectSoundBuffer  *me     = (OS2IDirectSoundBuffer *)This;
    317317      OS2IDirectSoundNotify  *notify;
    … …  
    319319      notify     = new OS2IDirectSoundNotify(me);
    320320      *ppvObj    = notify;
    321       notify->Vtbl.AddRef(notify);
     321      notify->Vtbl.fnAddRef(notify);
    322322      return DS_OK;
    323323   }
    324324
    325    if (IsEqualGUID(riid, IID_IDirectSound3DBuffer)) {
     325   if (IsEqualGUID(riid, &IID_IDirectSound3DBuffer)) {
    326326      OS2IDirectSoundBuffer   *me     = (OS2IDirectSoundBuffer *)This;
    327327      OS2IDirectSound3DBuffer *buffer3D;
    … …  
    329329      buffer3D   = new OS2IDirectSound3DBuffer(me);
    330330      *ppvObj    = buffer3D;
    331       buffer3D->Vtbl.AddRef((IDirectSound3DBuffer *)buffer3D);
     331      buffer3D->Vtbl.fnAddRef((IDirectSound3DBuffer *)buffer3D);
    332332      return DS_OK;
    333333   }

  • trunk/src/dsound/dsmixer.cpp

    r21342 r21479  
    2020#include <string.h>
    2121
    22 #define INITGUID
     22#define CINTERFACE
    2323#include <dsound.h>
    2424

  • trunk/src/opengl/mesa/wmesadef.h

    r3597 r21479  
    8787
    8888#if defined(DDRAW)
    89 #ifdef __WIN32OS2__
    90 #define __WINE_DD_OBJ_BASE_H/* Don't include dd_obj_base.h, or the file won't*/
    91 #endif                                 /* compile due to redefined symbols.*/
    92 #include <ddraw.h>          /* Is this a bug in the Odin DDRAW implementation??*/
     89#include <ddraw.h>
    9390#endif
    9491
Note: See TracChangeset for help on using the changeset viewer.