Index: include/wine/wined3d_types.h
===================================================================
RCS file: /home/wine/wine/include/wine/wined3d_types.h,v
retrieving revision 1.36
diff -u -r1.36 wined3d_types.h
--- include/wine/wined3d_types.h	7 Apr 2006 10:05:51 -0000	1.36
+++ include/wine/wined3d_types.h	7 Apr 2006 11:42:25 -0000
@@ -129,6 +129,10 @@
     WINED3DDEGREE_FORCE_DWORD   = 0x7fffffff
 } WINED3DDEGREETYPE;
 
+#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3)  \
+       ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) |  \
+       ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
+
 typedef enum _WINED3DFORMAT {
     WINED3DFMT_UNKNOWN              =   0,
 
@@ -166,16 +170,16 @@
     WINED3DFMT_W11V11U10            =  65,
     WINED3DFMT_A2W10V10U10          =  67,
 
-    WINED3DFMT_UYVY                 =  MAKEFOURCC('U', 'Y', 'V', 'Y'),
-    WINED3DFMT_YUY2                 =  MAKEFOURCC('Y', 'U', 'Y', '2'),
-    WINED3DFMT_DXT1                 =  MAKEFOURCC('D', 'X', 'T', '1'),
-    WINED3DFMT_DXT2                 =  MAKEFOURCC('D', 'X', 'T', '2'),
-    WINED3DFMT_DXT3                 =  MAKEFOURCC('D', 'X', 'T', '3'),
-    WINED3DFMT_DXT4                 =  MAKEFOURCC('D', 'X', 'T', '4'),
-    WINED3DFMT_DXT5                 =  MAKEFOURCC('D', 'X', 'T', '5'),
-    WINED3DFMT_MULTI2_ARGB          =  MAKEFOURCC('M', 'E', 'T', '1'),
-    WINED3DFMT_G8R8_G8B8            =  MAKEFOURCC('G', 'R', 'G', 'B'),
-    WINED3DFMT_R8G8_B8G8            =  MAKEFOURCC('R', 'G', 'B', 'G'),
+    WINED3DFMT_UYVY                 =  WINEMAKEFOURCC('U', 'Y', 'V', 'Y'),
+    WINED3DFMT_YUY2                 =  WINEMAKEFOURCC('Y', 'U', 'Y', '2'),
+    WINED3DFMT_DXT1                 =  WINEMAKEFOURCC('D', 'X', 'T', '1'),
+    WINED3DFMT_DXT2                 =  WINEMAKEFOURCC('D', 'X', 'T', '2'),
+    WINED3DFMT_DXT3                 =  WINEMAKEFOURCC('D', 'X', 'T', '3'),
+    WINED3DFMT_DXT4                 =  WINEMAKEFOURCC('D', 'X', 'T', '4'),
+    WINED3DFMT_DXT5                 =  WINEMAKEFOURCC('D', 'X', 'T', '5'),
+    WINED3DFMT_MULTI2_ARGB          =  WINEMAKEFOURCC('M', 'E', 'T', '1'),
+    WINED3DFMT_G8R8_G8B8            =  WINEMAKEFOURCC('G', 'R', 'G', 'B'),
+    WINED3DFMT_R8G8_B8G8            =  WINEMAKEFOURCC('R', 'G', 'B', 'G'),
 
     WINED3DFMT_D16_LOCKABLE         =  70,
     WINED3DFMT_D32                  =  71,
Index: dlls/wined3d/query.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/query.c,v
retrieving revision 1.5
diff -u -r1.5 query.c
--- dlls/wined3d/query.c	10 Mar 2006 20:52:40 -0000	1.5
+++ dlls/wined3d/query.c	7 Apr 2006 11:42:25 -0000
@@ -103,7 +103,7 @@
     {
 
         WINED3DDEVINFO_VCACHE *data = (WINED3DDEVINFO_VCACHE *)pData;
-        data->Pattern     = MAKEFOURCC('C','A','C','H');
+        data->Pattern     = WINEMAKEFOURCC('C','A','C','H');
         data->OptMethod   = 0; /*0 get longest strips, 1 optimize vertex cache*/
         data->CacheSize   = 0; /*cache size, only required if OptMethod == 1*/
         data->MagicNumber = 0; /*only required if OptMethod == 1 (used internally)*/