Ignore:
Timestamp:
Dec 29, 2002, 3:11:03 PM (23 years ago)
Author:
sandervl
Message:

Cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/ddraw/ddraw2d.h

    r9459 r9560  
    1 /* $Id: ddraw2d.h,v 1.1 2002-12-04 10:34:59 sandervl Exp $ */
     1/* $Id: ddraw2d.h,v 1.2 2002-12-29 14:11:01 sandervl Exp $ */
    22
    33/*
    … …  
    113113    static    OS2IDirectDraw* ddraw;                  // List of OS2IDirectDraw
    114114
    115     friend    HRESULT __stdcall DrawQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
    116     friend    ULONG   __stdcall DrawAddRef(THIS);
    117     friend    ULONG   __stdcall DrawRelease(THIS);
    118     friend    HRESULT __stdcall DrawCompact(THIS);
    119     friend    HRESULT __stdcall DrawCreateClipper(THIS, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown  * );
    120     friend    HRESULT __stdcall DrawCreatePalette(THIS, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown  * );
    121     friend    HRESULT __stdcall DrawCreateSurface(THIS, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE  *, IUnknown  *);
    122     friend    HRESULT __stdcall DrawCreateSurface4(THIS, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE4  *, IUnknown  *);
    123     friend    HRESULT __stdcall DrawDuplicateSurface(THIS, LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE  * );
    124     friend    HRESULT __stdcall DrawDuplicateSurface4(THIS, LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4  * );
    125     friend    HRESULT __stdcall DrawEnumDisplayModes(THIS, DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK );
    126     friend    HRESULT __stdcall DrawEnumDisplayModes4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMMODESCALLBACK2 );
    127     friend    HRESULT __stdcall DrawEnumSurfaces(THIS, DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK );
    128     friend    HRESULT __stdcall DrawEnumSurfaces4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID,LPDDENUMSURFACESCALLBACK2 );
    129     friend    HRESULT __stdcall DrawFlipToGDISurface(THIS);
    130     friend    HRESULT __stdcall DrawGetCaps(THIS, LPDDCAPS, LPDDCAPS);
    131     friend    HRESULT __stdcall DrawGetDisplayMode(THIS, LPDDSURFACEDESC);
    132     friend    HRESULT __stdcall DrawGetFourCCCodes(THIS, LPDWORD, LPDWORD);
    133     friend    HRESULT __stdcall DrawGetGDISurface(THIS, LPDIRECTDRAWSURFACE  *);
    134     friend    HRESULT __stdcall DrawGetGDISurface4(THIS, LPDIRECTDRAWSURFACE4  *);
    135     friend    HRESULT __stdcall DrawGetMonitorFrequency(THIS, LPDWORD);
    136     friend    HRESULT __stdcall DrawGetScanLine(THIS, LPDWORD);
    137     friend    HRESULT __stdcall DrawGetVerticalBlankStatus(THIS, LPBOOL);
    138     friend    HRESULT __stdcall DrawInitialize(THIS, GUID  *);
    139     friend    HRESULT __stdcall DrawRestoreDisplayMode(THIS);
    140     friend    HRESULT __stdcall DrawSetCooperativeLevel(THIS, HWND, DWORD);
    141     friend    HRESULT __stdcall DrawSetDisplayMode(THIS, DWORD, DWORD,DWORD);
    142     friend    HRESULT __stdcall DrawSetDisplayMode2(THIS, DWORD, DWORD,DWORD, DWORD, DWORD);
    143     friend    HRESULT __stdcall DrawWaitForVerticalBlank(THIS, DWORD, HANDLE);
     115    friend    HRESULT WIN32API DrawQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
     116    friend    ULONG   WIN32API DrawAddRef(THIS);
     117    friend    ULONG   WIN32API DrawRelease(THIS);
     118    friend    HRESULT WIN32API DrawCompact(THIS);
     119    friend    HRESULT WIN32API DrawCreateClipper(THIS, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown  * );
     120    friend    HRESULT WIN32API DrawCreatePalette(THIS, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown  * );
     121    friend    HRESULT WIN32API DrawCreateSurface(THIS, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE  *, IUnknown  *);
     122    friend    HRESULT WIN32API DrawCreateSurface4(THIS, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE4  *, IUnknown  *);
     123    friend    HRESULT WIN32API DrawDuplicateSurface(THIS, LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE  * );
     124    friend    HRESULT WIN32API DrawDuplicateSurface4(THIS, LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4  * );
     125    friend    HRESULT WIN32API DrawEnumDisplayModes(THIS, DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK );
     126    friend    HRESULT WIN32API DrawEnumDisplayModes4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMMODESCALLBACK2 );
     127    friend    HRESULT WIN32API DrawEnumSurfaces(THIS, DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK );
     128    friend    HRESULT WIN32API DrawEnumSurfaces4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID,LPDDENUMSURFACESCALLBACK2 );
     129    friend    HRESULT WIN32API DrawFlipToGDISurface(THIS);
     130    friend    HRESULT WIN32API DrawGetCaps(THIS, LPDDCAPS, LPDDCAPS);
     131    friend    HRESULT WIN32API DrawGetDisplayMode(THIS, LPDDSURFACEDESC);
     132    friend    HRESULT WIN32API DrawGetFourCCCodes(THIS, LPDWORD, LPDWORD);
     133    friend    HRESULT WIN32API DrawGetGDISurface(THIS, LPDIRECTDRAWSURFACE  *);
     134    friend    HRESULT WIN32API DrawGetGDISurface4(THIS, LPDIRECTDRAWSURFACE4  *);
     135    friend    HRESULT WIN32API DrawGetMonitorFrequency(THIS, LPDWORD);
     136    friend    HRESULT WIN32API DrawGetScanLine(THIS, LPDWORD);
     137    friend    HRESULT WIN32API DrawGetVerticalBlankStatus(THIS, LPBOOL);
     138    friend    HRESULT WIN32API DrawInitialize(THIS, GUID  *);
     139    friend    HRESULT WIN32API DrawRestoreDisplayMode(THIS);
     140    friend    HRESULT WIN32API DrawSetCooperativeLevel(THIS, HWND, DWORD);
     141    friend    HRESULT WIN32API DrawSetDisplayMode(THIS, DWORD, DWORD,DWORD);
     142    friend    HRESULT WIN32API DrawSetDisplayMode2(THIS, DWORD, DWORD,DWORD, DWORD, DWORD);
     143    friend    HRESULT WIN32API DrawWaitForVerticalBlank(THIS, DWORD, HANDLE);
    144144    // V2 Interface
    145     friend    HRESULT __stdcall DrawGetAvailableVidMem(THIS, LPDDSCAPS, LPDWORD, LPDWORD);
    146     friend    HRESULT __stdcall DrawGetAvailableVidMem4(THIS, LPDDSCAPS2, LPDWORD, LPDWORD);
     145    friend    HRESULT WIN32API DrawGetAvailableVidMem(THIS, LPDDSCAPS, LPDWORD, LPDWORD);
     146    friend    HRESULT WIN32API DrawGetAvailableVidMem4(THIS, LPDDSCAPS2, LPDWORD, LPDWORD);
    147147    // V4 Interface
    148     friend    HRESULT __stdcall GetSurfaceFromDC(THIS, HDC, LPDIRECTDRAWSURFACE4 *);
    149     friend    HRESULT __stdcall RestoreAllSurfaces(THIS) ;
    150     friend    HRESULT __stdcall TestCooperativeLevel(THIS) ;
    151     friend    HRESULT __stdcall GetDeviceIdentifier(THIS, LPDDDEVICEIDENTIFIER, DWORD );
     148    friend    HRESULT WIN32API GetSurfaceFromDC(THIS, HDC, LPDIRECTDRAWSURFACE4 *);
     149    friend    HRESULT WIN32API RestoreAllSurfaces(THIS) ;
     150    friend    HRESULT WIN32API TestCooperativeLevel(THIS) ;
     151    friend    HRESULT WIN32API GetDeviceIdentifier(THIS, LPDDDEVICEIDENTIFIER, DWORD );
    152152    /*** IDirect3D methods ***/
    153     friend    HRESULT __stdcall D3DQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
    154     friend    ULONG   __stdcall D3DAddRef(THIS);
    155     friend    ULONG   __stdcall D3DRelease(THIS);
    156     friend    HRESULT __stdcall D3DInitialize(THIS, REFIID);
    157     friend    HRESULT __stdcall D3DEnumDevices(THIS, LPD3DENUMDEVICESCALLBACK, LPVOID);
    158     friend    HRESULT __stdcall D3DCreateLight(THIS, LPDIRECT3DLIGHT*, IUnknown*);
    159     friend    HRESULT __stdcall D3DCreateMaterial(THIS, LPDIRECT3DMATERIAL*, IUnknown*);
    160     friend    HRESULT __stdcall D3DCreateViewport(THIS, LPDIRECT3DVIEWPORT*, IUnknown*);
    161     friend    HRESULT __stdcall D3DFindDevice(THIS, LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT);
     153    friend    HRESULT WIN32API D3DQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
     154    friend    ULONG   WIN32API D3DAddRef(THIS);
     155    friend    ULONG   WIN32API D3DRelease(THIS);
     156    friend    HRESULT WIN32API D3DInitialize(THIS, REFIID);
     157    friend    HRESULT WIN32API D3DEnumDevices(THIS, LPD3DENUMDEVICESCALLBACK, LPVOID);
     158    friend    HRESULT WIN32API D3DCreateLight(THIS, LPDIRECT3DLIGHT*, IUnknown*);
     159    friend    HRESULT WIN32API D3DCreateMaterial(THIS, LPDIRECT3DMATERIAL*, IUnknown*);
     160    friend    HRESULT WIN32API D3DCreateViewport(THIS, LPDIRECT3DVIEWPORT*, IUnknown*);
     161    friend    HRESULT WIN32API D3DFindDevice(THIS, LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT);
    162162
    163163};
    … …  
    167167
    168168//******************************************************************************
    169 HRESULT __stdcall DrawQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
    170 ULONG   __stdcall DrawAddRef(THIS);
    171 ULONG   __stdcall DrawRelease(THIS);
    172 HRESULT __stdcall DrawCompact(THIS);
    173 HRESULT __stdcall DrawCreateClipper(THIS, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown  * );
    174 HRESULT __stdcall DrawCreatePalette(THIS, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown  * );
    175 HRESULT __stdcall DrawCreateSurface(THIS, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE  *, IUnknown  *);
    176 HRESULT __stdcall DrawDuplicateSurface(THIS, LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE  * );
    177 HRESULT __stdcall DrawEnumDisplayModes(THIS, DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK );
    178 HRESULT __stdcall DrawEnumSurfaces(THIS, DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK );
    179 HRESULT __stdcall DrawFlipToGDISurface(THIS);
    180 HRESULT __stdcall DrawGetCaps(THIS, LPDDCAPS, LPDDCAPS);
    181 HRESULT __stdcall DrawGetDisplayMode(THIS, LPDDSURFACEDESC);
    182 HRESULT __stdcall DrawGetFourCCCodes(THIS, LPDWORD, LPDWORD);
    183 HRESULT __stdcall DrawGetGDISurface(THIS, LPDIRECTDRAWSURFACE  *);
    184 HRESULT __stdcall DrawGetMonitorFrequency(THIS, LPDWORD);
    185 HRESULT __stdcall DrawGetScanLine(THIS, LPDWORD);
    186 HRESULT __stdcall DrawGetVerticalBlankStatus(THIS, LPBOOL);
    187 HRESULT __stdcall DrawInitialize(THIS, GUID  *);
    188 HRESULT __stdcall DrawRestoreDisplayMode(THIS);
    189 HRESULT __stdcall DrawSetCooperativeLevel(THIS, HWND, DWORD);
    190 HRESULT __stdcall DrawSetDisplayMode(THIS, DWORD, DWORD,DWORD);
    191 HRESULT __stdcall DrawSetDisplayMode2(THIS, DWORD, DWORD,DWORD, DWORD, DWORD);
    192 HRESULT __stdcall DrawWaitForVerticalBlank(THIS, DWORD, HANDLE);
     169HRESULT WIN32API DrawQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
     170ULONG   WIN32API DrawAddRef(THIS);
     171ULONG   WIN32API DrawRelease(THIS);
     172HRESULT WIN32API DrawCompact(THIS);
     173HRESULT WIN32API DrawCreateClipper(THIS, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown  * );
     174HRESULT WIN32API DrawCreatePalette(THIS, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown  * );
     175HRESULT WIN32API DrawCreateSurface(THIS, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE  *, IUnknown  *);
     176HRESULT WIN32API DrawDuplicateSurface(THIS, LPDIRECTDRAWSURFACE, LPDIRECTDRAWSURFACE  * );
     177HRESULT WIN32API DrawEnumDisplayModes(THIS, DWORD, LPDDSURFACEDESC, LPVOID, LPDDENUMMODESCALLBACK );
     178HRESULT WIN32API DrawEnumSurfaces(THIS, DWORD, LPDDSURFACEDESC, LPVOID,LPDDENUMSURFACESCALLBACK );
     179HRESULT WIN32API DrawFlipToGDISurface(THIS);
     180HRESULT WIN32API DrawGetCaps(THIS, LPDDCAPS, LPDDCAPS);
     181HRESULT WIN32API DrawGetDisplayMode(THIS, LPDDSURFACEDESC);
     182HRESULT WIN32API DrawGetFourCCCodes(THIS, LPDWORD, LPDWORD);
     183HRESULT WIN32API DrawGetGDISurface(THIS, LPDIRECTDRAWSURFACE  *);
     184HRESULT WIN32API DrawGetMonitorFrequency(THIS, LPDWORD);
     185HRESULT WIN32API DrawGetScanLine(THIS, LPDWORD);
     186HRESULT WIN32API DrawGetVerticalBlankStatus(THIS, LPBOOL);
     187HRESULT WIN32API DrawInitialize(THIS, GUID  *);
     188HRESULT WIN32API DrawRestoreDisplayMode(THIS);
     189HRESULT WIN32API DrawSetCooperativeLevel(THIS, HWND, DWORD);
     190HRESULT WIN32API DrawSetDisplayMode(THIS, DWORD, DWORD,DWORD);
     191HRESULT WIN32API DrawSetDisplayMode2(THIS, DWORD, DWORD,DWORD, DWORD, DWORD);
     192HRESULT WIN32API DrawWaitForVerticalBlank(THIS, DWORD, HANDLE);
    193193// V2
    194 HRESULT __stdcall DrawGetAvailableVidMem(THIS, LPDDSCAPS, LPDWORD, LPDWORD);
     194HRESULT WIN32API DrawGetAvailableVidMem(THIS, LPDDSCAPS, LPDWORD, LPDWORD);
    195195// V4
    196 HRESULT __stdcall DrawGetSurfaceFromDC(THIS, HDC, LPDIRECTDRAWSURFACE4 *);
    197 HRESULT __stdcall DrawRestoreAllSurfaces(THIS) ;
    198 HRESULT __stdcall DrawTestCooperativeLevel(THIS) ;
    199 HRESULT __stdcall DrawGetDeviceIdentifier(THIS, LPDDDEVICEIDENTIFIER, DWORD );
     196HRESULT WIN32API DrawGetSurfaceFromDC(THIS, HDC, LPDIRECTDRAWSURFACE4 *);
     197HRESULT WIN32API DrawRestoreAllSurfaces(THIS) ;
     198HRESULT WIN32API DrawTestCooperativeLevel(THIS) ;
     199HRESULT WIN32API DrawGetDeviceIdentifier(THIS, LPDDDEVICEIDENTIFIER, DWORD );
    200200// functions which ifaces are changed in DirectX6 after all MS uses COM where an programmer
    201201// isn't allowd to change a function iface after he published the iface (See MS COM docs!)
    202 HRESULT __stdcall DrawCreateSurface4(THIS, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE4  *, IUnknown  *);
    203 HRESULT __stdcall DrawDuplicateSurface4(THIS, LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4  * );
    204 HRESULT __stdcall DrawEnumDisplayModes4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMMODESCALLBACK2 );
    205 HRESULT __stdcall DrawEnumSurfaces4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID,LPDDENUMSURFACESCALLBACK2 );
    206 HRESULT __stdcall DrawGetDisplayMode4(THIS, LPDDSURFACEDESC2);
    207 HRESULT __stdcall DrawGetGDISurface4(THIS, LPDIRECTDRAWSURFACE4  *);
    208 HRESULT __stdcall DrawGetAvailableVidMem4(THIS, LPDDSCAPS2, LPDWORD, LPDWORD);
     202HRESULT WIN32API DrawCreateSurface4(THIS, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE4  *, IUnknown  *);
     203HRESULT WIN32API DrawDuplicateSurface4(THIS, LPDIRECTDRAWSURFACE4, LPDIRECTDRAWSURFACE4  * );
     204HRESULT WIN32API DrawEnumDisplayModes4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMMODESCALLBACK2 );
     205HRESULT WIN32API DrawEnumSurfaces4(THIS, DWORD, LPDDSURFACEDESC2, LPVOID,LPDDENUMSURFACESCALLBACK2 );
     206HRESULT WIN32API DrawGetDisplayMode4(THIS, LPDDSURFACEDESC2);
     207HRESULT WIN32API DrawGetGDISurface4(THIS, LPDIRECTDRAWSURFACE4  *);
     208HRESULT WIN32API DrawGetAvailableVidMem4(THIS, LPDDSCAPS2, LPDWORD, LPDWORD);
    209209
    210210/*** IDirect3D methods ***/
    211 HRESULT __stdcall D3DQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
    212 ULONG   __stdcall D3DAddRef(THIS);
    213 ULONG   __stdcall D3DRelease(THIS);
    214 HRESULT __stdcall D3DInitialize(THIS, REFIID);
    215 HRESULT __stdcall D3DEnumDevices(THIS, LPD3DENUMDEVICESCALLBACK, LPVOID);
    216 HRESULT __stdcall D3DCreateLight(THIS, LPDIRECT3DLIGHT*, IUnknown*);
    217 HRESULT __stdcall D3DCreateMaterial(THIS, LPDIRECT3DMATERIAL*, IUnknown*);
    218 HRESULT __stdcall D3DCreateViewport(THIS, LPDIRECT3DVIEWPORT*, IUnknown*);
    219 HRESULT __stdcall D3DFindDevice(THIS, LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT);
     211HRESULT WIN32API D3DQueryInterface(THIS, REFIID riid, LPVOID  * ppvObj);
     212ULONG   WIN32API D3DAddRef(THIS);
     213ULONG   WIN32API D3DRelease(THIS);
     214HRESULT WIN32API D3DInitialize(THIS, REFIID);
     215HRESULT WIN32API D3DEnumDevices(THIS, LPD3DENUMDEVICESCALLBACK, LPVOID);
     216HRESULT WIN32API D3DCreateLight(THIS, LPDIRECT3DLIGHT*, IUnknown*);
     217HRESULT WIN32API D3DCreateMaterial(THIS, LPDIRECT3DMATERIAL*, IUnknown*);
     218HRESULT WIN32API D3DCreateViewport(THIS, LPDIRECT3DVIEWPORT*, IUnknown*);
     219HRESULT WIN32API D3DFindDevice(THIS, LPD3DFINDDEVICESEARCH, LPD3DFINDDEVICERESULT);
    220220
    221221#define FOURCC_YUY2  mmioFOURCC( 'Y', 'U', 'Y', '2' )
Note: See TracChangeset for help on using the changeset viewer.