Changeset 9560 for trunk/src/ddraw/palette.cpp

Timestamp:

Dec 29, 2002, 3:11:03 PM (23 years ago)

Author:

sandervl

Message:

Cleanup

File:

• trunk/src/ddraw/palette.cpp (modified) (11 diffs)

trunk/src/ddraw/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.1 2002-12-04 10:35:01 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.2 2002-12-29 14:11:02 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #define THIS IDirectDrawPalette*
 
+extern IDirectDrawPaletteVtbl DDrawPaletteTable;
+
 //******************************************************************************
 //******************************************************************************
@@ -43 +45 @@
 
 {
-  lpVtbl              = &Vtbl;
-  Vtbl.AddRef         = PalAddRef;
-  Vtbl.Release        = PalRelease;
-  Vtbl.QueryInterface = PalQueryInterface;
-  Vtbl.GetCaps        = PalGetCaps;
-  Vtbl.GetEntries     = PalGetEntries;
-  Vtbl.Initialize     = PalInitialize;
-  Vtbl.SetEntries     = PalSetEntries;
-
-  lpDraw                        = lpDirectDraw;
+  Vtbl    = DDrawPaletteTable;
+  lpVtbl  = &Vtbl;
+
+  lpDraw  = lpDirectDraw;
   ((OS2IDirectDraw*)lpDraw)->Vtbl.AddRef(lpDraw);
-  hDive                         = ((OS2IDirectDraw*)lpDirectDraw)->GetDiveInstance();
-  dwCaps                        = dwPalFlags;
-  hDiveCC                       = ((OS2IDirectDraw*)lpDirectDraw)->GetCCDiveInstance();
+  hDive   = ((OS2IDirectDraw*)lpDirectDraw)->GetDiveInstance();
+  dwCaps  = dwPalFlags;
+  hDiveCC = ((OS2IDirectDraw*)lpDirectDraw)->GetCCDiveInstance();
 
   dwSize = palsize;
@@ -93 +89 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall PalQueryInterface(THIS This, REFIID riid, LPVOID FAR * ppvObj)
+HRESULT WIN32API PalQueryInterface(THIS This, REFIID riid, LPVOID FAR * ppvObj)
 {
   dprintf(("DDRAW: OS2IDirectDrawPalette::PalQueryInterface"));
@@ -110 +106 @@
 //******************************************************************************
 //******************************************************************************
-ULONG __stdcall PalAddRef(THIS This)
+ULONG WIN32API PalAddRef(THIS This)
 {
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
@@ -120 +116 @@
 //******************************************************************************
 //******************************************************************************
-ULONG __stdcall PalRelease(THIS This)
+ULONG WIN32API PalRelease(THIS This)
 {
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
@@ -142 +138 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall PalGetCaps(THIS This, LPDWORD lpdwCaps)
+HRESULT WIN32API PalGetCaps(THIS This, LPDWORD lpdwCaps)
 {
   OS2IDirectDrawPalette *me = (OS2IDirectDrawPalette *)This;
@@ -161 +157 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall PalGetEntries(THIS This, DWORD dwFlags,
+HRESULT WIN32API PalGetEntries(THIS This, DWORD dwFlags,
                                       DWORD dwBase,
                                       DWORD dwNumEntries,
@@ -183 +179 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall PalInitialize(THIS, LPDIRECTDRAW, DWORD, LPPALETTEENTRY)
+HRESULT WIN32API PalInitialize(THIS, LPDIRECTDRAW, DWORD, LPPALETTEENTRY)
 {
   dprintf(("DDRAW: OS2IDirectDrawPalette::PalInitialize"));
@@ -190 +186 @@
 //******************************************************************************
 //******************************************************************************
-HRESULT __stdcall PalSetEntries(THIS This, DWORD dwFlags,
+HRESULT WIN32API PalSetEntries(THIS This, DWORD dwFlags,
                                       DWORD dwBase,
                                       DWORD dwNumEntries,
@@ -274 +270 @@
 //******************************************************************************
 //******************************************************************************
-
+IDirectDrawPaletteVtbl DDrawPaletteTable = 
+{
+  PalQueryInterface,
+  PalAddRef,
+  PalRelease,
+  PalGetCaps,
+  PalGetEntries,
+  PalInitialize,
+  PalSetEntries
+};
+//******************************************************************************
+//******************************************************************************