* Sync up to trunk head (r64377).

[reactos.git] / include / psdk / d3d8types.h

diff --git a/include/psdk/d3d8types.h b/include/psdk/d3d8types.h
index 609cd9c..65ea0f8 100644 (file)
--- a/include/psdk/d3d8types.h
+++ b/include/psdk/d3d8types.h
@@ -154,7 +154,7 @@
     ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
 #endif
 
-/****************************
+/**************************** 
  * Vertex Shaders Declaration
  */
 
@@ -170,7 +170,7 @@ typedef enum _D3DVSD_TOKENTYPE {
   D3DVSD_FORCE_DWORD       = 0x7FFFFFFF
 } D3DVSD_TOKENTYPE;
 
-/** input registers for vertes shaders functions */
+/** input registers for vertex shaders functions */
 /*
 #define D3DVSDE_POSITION      0
 #define D3DVSDE_BLENDWEIGHT   1
@@ -683,7 +683,7 @@ typedef enum _D3DMULTISAMPLE_TYPE {
     D3DMULTISAMPLE_15_SAMPLES      = 15,
     D3DMULTISAMPLE_16_SAMPLES      = 16,
 
-    D3DMULTISAMPLE_FORCE_DWORD     = 0xffffffff
+    D3DMULTISAMPLE_FORCE_DWORD     = 0x7fffffff
 } D3DMULTISAMPLE_TYPE;
 
 typedef enum _D3DORDERTYPE {
@@ -1053,11 +1053,14 @@ typedef struct _D3DINDEXBUFFER_DESC {
     UINT                Size;
 } D3DINDEXBUFFER_DESC;
 
+#ifndef D3DVECTOR_DEFINED
 typedef struct _D3DVECTOR {
     float x;
     float y;
     float z;
 } D3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
 
 typedef struct _D3DLIGHT8 {
     D3DLIGHTTYPE    Type;
@@ -1131,6 +1134,8 @@ typedef struct _D3DPRESENT_PARAMETERS_ {
 
 } D3DPRESENT_PARAMETERS;
 
+#define D3DPRESENTFLAG_LOCKABLE_BACKBUFFER  0x00000001
+
 typedef struct _D3DRANGE {
     UINT                Offset;
     UINT                Size;