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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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};
Note: See TracChangeset for help on using the changeset viewer.