Changeset 4133 for trunk/include/win/ddraw.h

Timestamp:

Aug 31, 2000, 2:46:05 PM (25 years ago)

Author:

sandervl

Message:

header updates

File:

• trunk/include/win/ddraw.h (modified) (5 diffs)

trunk/include/win/ddraw.h

@@ -1 @@
-/* $Id: ddraw.h,v 1.4 1999-08-19 18:05:57 phaller Exp $ */
+/* $Id: ddraw.h,v 1.5 2000-08-31 12:46:04 sandervl Exp $ */
 
 #ifndef __WINE_DDRAW_H
@@ -6 +6 @@
   #include "winnt.h" /* LARGE_INTEGER ... */
   #include "wingdi.h" /* PALETTE stuff ... */
+#ifndef __WINE_OBJBASE_H
   #include "wine/dd_obj_base.h"
+#endif
 
   #ifndef DIRECTDRAW_VERSION
@@ -217 +219 @@
 /* DDSCAPS.dwCaps */
 /* reserved1, was 3d capable */
+#define DDSCAPS_3D                      0x00000001
 #define DDSCAPS_RESERVED1               0x00000001
 /* surface contains alpha information */
@@ -890 +893 @@
 } DDCOLORCONTROL,*LPDDCOLORCONTROL;
 
-typedef DWORD  (CALLBACK *LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER , HWND , DWORD , LPVOID );
+typedef DWORD  (* CALLBACK LPCLIPPERCALLBACK)(LPDIRECTDRAWCLIPPER , HWND , DWORD , LPVOID );
 #ifdef STREAMING
-  typedef DWORD  (CALLBACK *LPSURFACESTREAMINGCALLBACK)(DWORD);
+  typedef DWORD  (* CALLBACK LPSURFACESTREAMINGCALLBACK)(DWORD);
 #endif
 
 
-typedef BOOL (CALLBACK * LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
-typedef BOOL (CALLBACK * LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
+typedef BOOL (* CALLBACK  LPDDENUMCALLBACKA)(GUID *, LPSTR, LPSTR, LPVOID);
+typedef BOOL (* CALLBACK  LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK)
 
-typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
-typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
-typedef HRESULT (CALLBACK * LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
-typedef HRESULT (CALLBACK * LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
-
-typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
-typedef BOOL (CALLBACK * LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
+typedef HRESULT (* CALLBACK  LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID);
+typedef HRESULT (* CALLBACK  LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID);
+typedef HRESULT (* CALLBACK  LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID);
+typedef HRESULT (* CALLBACK  LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID);
+
+typedef BOOL (* CALLBACK  LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
+typedef BOOL (* CALLBACK  LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
 
 DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACKEX)
@@ -912 +915 @@
 HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
 HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
+#define DirectDrawEnumerateEx WINELIB_NAME_AW(DirectDrawEnumerateEx)
+
 #ifndef SM_CMONITORS
   #define HMONITOR    HANDLE